Changeset 1190 in ProjectBuilder

Timestamp:

Feb 15, 2011, 11:46:55 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix bugs in sudoers generation (syntax issue)
• Improve pb_get_sudocmds to remov duplicates, and take an additional list of commands to filter
• Change pb_date2v interface to just return the line we want.

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (2 diffs)
• pb/bin/pb (modified) (9 diffs)

devel/pb-modules/etc/pb.conf

@@ -203 +203 @@
 
 # Command to update the distribution to latest state
-osupd du = sudo apt-get update; export DEBIAN_FRONTEND="noninteractive"; apt-get --quiet -y --force-yes dist-upgrade
+osupd du = sudo /usr/bin/apt-get update; export DEBIAN_FRONTEND="noninteractive"; /usr/bin/apt-get --quiet -y --force-yes dist-upgrade
 osupd gen = sudo emerge --update --deep world; sudo revdep-rebuild
 osupd rpm = sudo /usr/bin/yum clean all; sudo /usr/bin/yum -y update
@@ -213 +213 @@
 # Chaining the commands allow to only test for what is able to be installed, 
 # not the update of the repo which may well be unaccessible if too old
-osins du = sudo apt-get update ; sudo apt-get -y install 
+osins du = sudo /usr/bin/apt-get update ; sudo /usr/bin/apt-get -y install 
 osins gen = sudo emerge 
 osins rpm = sudo /usr/bin/yum clean all; sudo /usr/bin/yum -y update ; sudo /usr/bin/yum -y install 

devel/pb/bin/pb

@@ -2405 +2405 @@
 my $upddate = strftime("%m%d%H%M%Y", @date);
 my $dateline = "sudo /bin/date $upddate";
-return($ntpline,$dateline);
+if (defined $ntpline) {
+    return($ntpline);
+} else {
+    return($dateline);
+}
 }
 
@@ -2469 +2473 @@
     }
 
-    my ($ntpline,$dateline) = pb_date2v($vtype,$v);
+    my $ntpline = pb_date2v($vtype,$v);
     print SCRIPT "# Time sync\n";
     print SCRIPT "echo 'setting up date with '";
-    if (defined $ntpline) {
-        print SCRIPT "echo $ntpline\n";
-        print SCRIPT "$ntpline\n";
-    } else {
-        print SCRIPT "echo $dateline\n";
-        print SCRIPT "$dateline\n";
-    }
+    print SCRIPT "echo $ntpline\n";
+    print SCRIPT "$ntpline\n";
     # Use potential local proxy declaration in case we need it to download repo, pkgs, ...
     if (defined $ENV{'http_proxy'}) {
@@ -2719 +2718 @@
 
     # Deal with date sync.
-    my ($ntpline,$dateline) = pb_date2v($vtype,$v);
+    my $ntpline = pb_date2v($vtype,$v);
 
     # Get distro context
@@ -2795 +2794 @@
     }
 
-if ($vtype =~ /(v|r)m/) {
+    if ($vtype =~ /(v|r)m/) {
         print SCRIPT << 'EOF';
 # Removes duplicate in .ssh/authorized_keys of our key if needed
@@ -2817 +2816 @@
 chmod 0600,\$file1;
 
-# Sync date
-EOF
-        if (defined $ntpline) {
-            print SCRIPT "pb_system(\"$ntpline\");\n";
-        } else {
-            print SCRIPT "pb_system(\"$dateline\");\n";
-        }
+EOF
     }
     print SCRIPT << 'EOF';
@@ -2943 +2936 @@
 while (<PBFILE>) {
 EOF
+    # Skip what will be generated
     print SCRIPT << "EOF";
-    next if (/^$pbac->{$ENV{'PBPROJ'}}   /);
+    next if (/^$pbac->{$ENV{'PBPROJ'}}\\s+/);
+    next if (/^Defaults:$pbac->{$ENV{'PBPROJ'}}\\s+/);
+    next if (/^Defaults:root \!requiretty/);
 EOF
     print SCRIPT << 'EOF';
@@ -2961 +2957 @@
     # Try to restrict security to what is really needed
     if ($vtype =~ /^vm/) {
-        my @sudocmds = pb_get_sudocmds($pbos);
         my $hpath = "/sbin";
+        # TODO: make that an external variable !
         # Solaris has halt elsewhere
         if ($pbos->{'type'} eq "pkg") {
             $hpath = "/usr/sbin";
         }
+        my @sudocmds = pb_get_sudocmds($pbos,$ntpline,"$hpath/halt");
         print SCRIPT << "EOF";
 # This is needed in order to be able on VM to halt the machine from the $pbac->{$ENV{'PBPROJ'}} account at least
 # Build account $pbac->{$ENV{'PBPROJ'}} in VM also needs to setup date and install deps.
 # Nothing else should be needed
-print PBOUT "$pbac->{$ENV{'PBPROJ'}}   localhost=NOPASSWD:$hpath/halt\n";
 EOF
         foreach my $c (@sudocmds) {
-            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   localhost=NOPASSWD:$c\n\";";
+            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   localhost = NOPASSWD: $c\n\";";
         }
     } elsif ($vtype =~ /^rm/) {
-        my @sudocmds = pb_get_sudocmds($pbos);
+        my @sudocmds = pb_get_sudocmds($pbos,$ntpline);
         print SCRIPT << "EOF";
 # Build account $pbac->{$ENV{'PBPROJ'}} in RM only needs to setup date and install deps if needed each time
 EOF
         foreach my $c (@sudocmds) {
-            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   localhost=NOPASSWD:$c\n\";";
+            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   localhost = NOPASSWD: $c\n\";";
         }
     } else {
@@ -2997 +2993 @@
 EOF
 
+    if ($vtype =~ /(v|r)m/) {
+        # Sync date
+        # do it after sudoers is setup
+        print SCRIPT "pb_system(\"$ntpline\");\n";
+    }
     # We may need a proxy configuration. Get it from the local env
 
@@ -3762 +3763 @@
         
 my $pbos = shift;
-my @sudocmds;
-
-foreach my $c (split(/;/,$pbos->{'update'}),split(/;/,$pbos->{'install'})) {
+my @lines = shift;
+my %sudocmds;
+
+foreach my $c (split(/;/,$pbos->{'update'}),split(/;/,$pbos->{'install'}),@lines) {
     next if ($c !~ /^sudo/);
-    $c =~ s/^sudo[ \t]+//;
-    push @sudocmds,$c;
-}
-pb_log(2,"pb_get_sudcomds returns ".Dumper(@sudocmds)."\n");
-return(@sudocmds);
+    $c =~ s/^sudo\s+//;
+    $c =~ s/^\s+//;
+    $c =~ s/\s+$//;
+    $sudocmds{$c} = "";
+}
+pb_log(2,"pb_get_sudcomds returns ".Dumper(%sudocmds)."\n");
+return(keys %sudocmds);
 }