Changeset 861 for LATMOS-Accounts/lib/LATMOS/Accounts/Utils.pm

Timestamp:

12/02/11 11:42:17 (13 years ago)

Author:

nanardon

Message:

• reimport missing files from previous svn

File:

• LATMOS-Accounts/lib/LATMOS/Accounts/Utils.pm (modified) (8 diffs)

LATMOS-Accounts/lib/LATMOS/Accounts/Utils.pm

@@ -12 +12 @@
 
 @ISA = qw(Exporter);
-@EXPORT = qw(to_ascii exec_command);
-@EXPORT_OK = qw(to_ascii exec_command);
+@EXPORT = qw(to_ascii exec_command switch_user run_via_sudo);
+@EXPORT_OK = qw(to_ascii exec_command switch_user run_via_sudo);
 
 sub to_ascii {
@@ -21 +21 @@
     $text =~ s/œ/oe/g;
     $text =~ s/Ê/ae/g;
-    $text =~ tr {uà âÀÂÄÀçéÚêëÉÈÊËïîÏÎÞöÎÖÔÌûÛÜ}
-                {uaaaAAAceeeeEEEEiiIIoooOOuuUU};
+    $text =~ tr {uà âÀÂÄÀçéÚêëÉÈÊËïîÏÎÞöÎÖÔÌûÛÜć}
+                {uaaaAAAceeeeEEEEiiIIoooOOuuUUc};
     $text =~ s/([^[:ascii:]])/_/g;
     $text
@@ -29 +29 @@
 sub exec_command {
     my ($command, $env) = @_;
+    my $rout = undef;
+    $rout = \$_[2] if(@_ > 2);
 
     my @exec = ref $command
@@ -35 +37 @@
     la_log(LA_DEBUG, 'running command `%s\'', join(' ', @exec));
 
+    pipe(my $rh, my $wh);
     my $pid = fork;
     if (!defined($pid)) {
@@ -40 +43 @@
     } elsif ($pid) {
         # Father
+        close($wh);
+        my $header;
+        while (<$rh>) {
+            if ($rout) {
+                $$rout .= $_;
+            } else {
+                chomp;
+                if (!$header) {
+                    $header = 1;
+                    la_log(LA_NOTICE, "exec `%s'", join(' ', @exec));
+                }
+                la_log(LA_NOTICE, "output: %s", $_);
+            }
+        }
         waitpid($pid, 0);
         if (my $exitstatus = $?) {
@@ -50 +67 @@
     } else {
         # Child
+        close($rh);
+        ( $ENV{LA_MODULE} ) = caller();
         foreach (keys %{ $env || {} }) {
             $ENV{"LA_$_"} = $env->{$_};
         }
+        open(STDOUT, ">&=" . fileno($wh));
+        open(STDERR, ">&=" . fileno($wh));
         exec(@exec);
         exit($!);
@@ -78 +99 @@
             }
         } else {
-            $attributes{$attr} = $value || undef;
-            $attr eq 'exported' && !defined $attributes{$attr} and $attributes{$attr} = 1;
+            $attributes{$attr} = $value eq '' ? undef : $value;
+            # Don't remember why this is here
+            #$attr eq 'exported' && !defined $attributes{$attr} and $attributes{$attr} = 1;
         }
     }
@@ -129 +151 @@
         if ($name !~ /^[a-z]/);
     return "must contain only a-z,0-9"
-        if ($name !~ /^[a-z,0-9]+$/);
+        if ($name !~ /^[a-z,0-9,_,-]+$/);
 
     return check_oid_validity($name);
 }
 
+sub switch_user {
+    my ($runas) = @_;
+
+    if ($< == 0 || $> == 0) {
+        my @info = getpwnam($runas) or do {
+            warn "Can find user $runas";
+            return;
+        };
+        $> = $info[3];
+        return;
+    } else {
+        warn "we are not root";
+    }
+}
+
+sub run_via_sudo {
+    my ($runas) = @_;
+
+    my @info = getpwnam($runas) or do {
+        warn "Can find user $runas";
+        return;
+    }; 
+    if ($< != $info[3]) {
+        exec('sudo', '-u', $runas, $0, @ARGV) or "Can run $!";
+    }
+}
+
 1;