[BACK]Return to lcuseradd CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/Attic/lcuseradd between versions 1.27 and 1.43

version 1.27, 2004/08/05 20:47:27 version 1.43, 2013/08/10 01:15:13
Line 32 Line 32
 ###############################################################################  ###############################################################################
   
 use strict;  use strict;
   use File::Find;
   
   
 # ------------------------------------------------------- Description of script  # ------------------------------------------------------- Description of script
 #  #
Line 47  use strict; Line 49  use strict;
 #  #
 # Standard input (STDIN) usage  # Standard input (STDIN) usage
 # First line is USERNAME  # First line is USERNAME
 # Second line is PASSWORD  # Second line is DOMAIN
 # Third line is PASSWORD  # Third line is PASSWORD
 # Fouth line is the name of a file to which an error code will be written.  # Fourth line is PASSWORD
   # Fifth line is the name of a file to which an error code will be written.
 #            If the fourth line is omitted, no error file will be written.  #            If the fourth line is omitted, no error file will be written.
 #            In either case, the program Exits with the code as its Exit status.  #            In either case, the program Exits with the code as its Exit status.
 #            The error file will just be a single line containing an  #            The error file will just be a single line containing an
Line 57  use strict; Line 60  use strict;
 #              #            
 #    #  
 #  #
 # Command-line arguments [USERNAME] [PASSWORD] [PASSWORD]  # Command-line arguments [USERNAME] [DOMAIN] [PASSWORD] [PASSWORD]
 # Yes, but be very careful here (don't pass shell commands)  # Yes, but be very careful here (don't pass shell commands)
 # and this is only supported to allow perl-system calls.  # and this is only supported to allow perl-system calls.
 #  #
Line 80  use strict; Line 83  use strict;
 # Usage within code  # Usage within code
 #  #
 # $Exitcode=  # $Exitcode=
 #      system("/home/httpd/perl/lcuseradd","NAME","PASSWORD1","PASSWORD2")/256;  #      system("/home/httpd/perl/lcuseradd","NAME","DOMAIN","PASSWORD1","PASSWORD2")/256;
 # print "uh-oh" if $Exitcode;  # print "uh-oh" if $Exitcode;
   
 # ---------------------------------------------------- Description of functions  # ---------------------------------------------------- Description of functions
Line 107  use strict; Line 110  use strict;
 # (12,"Error. Something went wrong with the addition of user ".  # (12,"Error. Something went wrong with the addition of user ".
 #     "\"$safeusername\"."),  #     "\"$safeusername\"."),
 # (13,"Error. Password mismatch."),  # (13,"Error. Password mismatch."),
 # (14, "Error filename is invalid")  # (14, "Error filename is invalid"),
   # (15, "Error. Could not add home directory.")
   
 # ------------------------------------------------------------- Initializations  # ------------------------------------------------------------- Initializations
 # Security  # Security
Line 118  delete @ENV{qw(IFS CDPATH ENV BASH_ENV)} Line 122  delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}
 # Do not print error messages.  # Do not print error messages.
 my $noprint=1;  my $noprint=1;
   
 #  Error file:  
   
 my $error_file; # This is either the error file name or undef.  
   
 print "In lcuseradd\n" unless $noprint;  print "In lcuseradd\n" unless $noprint;
   
 # ----------------------------- Make sure this process is running from user=www  # ----------------------------- Make sure this process is running from user=www
Line 147  unless (&try_to_lock("/tmp/lock_lcpasswd Line 147  unless (&try_to_lock("/tmp/lock_lcpasswd
 my @input;  my @input;
 if (@ARGV>=3) {  if (@ARGV>=3) {
     @input=@ARGV;      @input=@ARGV;
 }  } elsif (@ARGV) {
 elsif (@ARGV) {  
     print("Error. This program needs at least 3 command-line arguments (username, ".      print("Error. This program needs at least 3 command-line arguments (username, ".
   "password 1, password 2 [errorfile]).\n") unless $noprint;    "password 1, password 2 [errorfile]).\n") unless $noprint;
     unlink('/tmp/lock_lcpasswd');      unlink('/tmp/lock_lcpasswd');
     &Exit(2);      &Exit(2);
 }  } else {
 else {  
     @input=<>;      @input=<>;
     if (@input < 3) {      if (@input < 3) {
  print("Error. At least three lines should be entered into standard input.\n")   print("Error. At least three lines should be entered into standard input.\n")
Line 165  else { Line 163  else {
     foreach (@input) {chomp;}      foreach (@input) {chomp;}
 }  }
   
 my ($username,$password1,$password2, $error_file)=@input;  my ($username,$domain,$password1,$password2, $error_file)=@input;
 print "Username = ".$username."\n" unless $noprint;  print "Username = ".$username."\n" unless $noprint;
 $username=~/^(\w+)$/;  $username=~/^(\w+)$/;
 print "Username after substitution - ".$username unless $noprint;  print "Username after substitution - ".$username unless $noprint;
 my $safeusername=$1;  my $safeusername=$1;
 print "Safe username = $safeusername \n" unless $noprint;  print "Safe username = $safeusername \n" unless $noprint;
   
   print "Domain = ".$domain."\n" unless $noprint;
   
 if (($username ne $safeusername) or ($safeusername!~/^[A-Za-z]/)) {  if (($username ne $safeusername) or ($safeusername!~/^[A-Za-z]/)) {
     print "Error. The user name specified $username $safeusername  has invalid characters.\n"      print "Error. The user name specified $username $safeusername  has invalid characters.\n"
  unless $noprint;   unless $noprint;
Line 208  if($error_file) { Line 208  if($error_file) {
     Exit(14);      Exit(14);
  }   }
   
     }       } else {
     else {  
  $error_file="";   $error_file="";
  print "Invalid error filename\n" unless $noprint;   print "Invalid error filename\n" unless $noprint;
  Exit(14);   Exit(14);
Line 217  if($error_file) { Line 216  if($error_file) {
 }  }
   
   
 # -- Only add user if we can create a brand new home directory (/home/username)  # -- Only add the user if they are >not< in /etc/passwd.
 if (-e "/home/$safeusername") {  #    Used to look for the ability to create a new directory for the
     print "Error. User already exists.\n" unless $noprint;  #    user, however that disallows authentication changes from i
   #    internal->fs.. so just check the passwd file instead.
   #
   my $not_found = system("cut -d: -f1 /etc/passwd | grep -q \"^$safeusername\$\" ");
   if (!$not_found) {
       print "Error user already exists\n" unless $noprint;
     unlink('/tmp/lock_lcpasswd');      unlink('/tmp/lock_lcpasswd');
     &Exit(11);      &Exit(11);
 }  }
   
   
   
 # -- Only add user if the two password arguments match.  # -- Only add user if the two password arguments match.
   
 if ($password1 ne $password2) {  if ($password1 ne $password2) {
Line 235  print "enabling root\n" unless $noprint; Line 241  print "enabling root\n" unless $noprint;
 # ---------------------------------- Start running script with root permissions  # ---------------------------------- Start running script with root permissions
 &enable_root_capability;  &enable_root_capability;
   
 # ------------------- Add user and make www a member of the user-specific group  # ------------------- Add group and user, and make www a member of the group
   # -- Add group
   
   print "adding group: $safeusername \n" unless $noprint;
   my $status = system('/usr/sbin/groupadd', $safeusername);
   if ($status) {
       print "Error.  Something went wrong with the addition of group ".
             "\"$safeusername\".\n" unless $noprint;
       print "Final status of groupadd = $status\n";
       unlink('/tmp/lock_lcpasswd');
       &Exit(12);
   }
   my $gid = getgrnam($safeusername);
                                                                                   
 # -- Add user  # -- Add user
   
 print "adding user: $safeusername \n" unless $noprint;  print "adding user: $safeusername \n" unless $noprint;
 my $status = system('/usr/sbin/useradd','-c','LON-CAPA user',$safeusername);  my $status = system('/usr/sbin/useradd','-c','LON-CAPA user','-g',$gid,$safeusername);
 if ($status) {  if ($status) {
     print "Error.  Something went wrong with the addition of user ".      print "Error.  Something went wrong with the addition of user ".
   "\"$safeusername\".\n" unless $noprint;    "\"$safeusername\".\n" unless $noprint;
     print "Final status of useradd = $status";      system("/usr/sbin/groupdel $safeusername");
       print "Final status of useradd = $status\n";
     unlink('/tmp/lock_lcpasswd');      unlink('/tmp/lock_lcpasswd');
     &Exit(12);      &Exit(12);
 }  }
   
 print "Done adding user\n" unless $noprint;  print "Done adding user\n" unless $noprint;
 # Make www a member of that user group.  # Make www a member of that user group.
 my $groups=`/usr/bin/groups www` or &Exit(6);  my $groups=`/usr/bin/groups www` or &Exit(6);
 # untaint  # untaint
 my ($safegroups)=($groups=~/([\s\w]+)/);  my ($safegroups)=($groups=~/:\s*([\s\w]+)/);
 $groups=$safegroups;  $groups=$safegroups;
 chomp $groups; $groups=~s/^\S+\s+\:\s+//;  chomp $groups; $groups=~s/^\S+\s+\:\s+//;
 my @grouplist=split(/\s+/,$groups);  my @grouplist=split(/\s+/,$groups);
 my @ugrouplist=grep {!/www|$safeusername/} @grouplist;  my @ugrouplist=grep {!/www|$safeusername/} @grouplist;
 my $gl=join(',',(@ugrouplist,$safeusername));  my $gl=join(',',(@ugrouplist,$safeusername));
 print "Putting user in its own group\n" unless $noprint;  print "Putting www in user's group\n" unless $noprint;
 if (system('/usr/sbin/usermod','-G',$gl,'www')) {  if (system('/usr/sbin/usermod','-G',$gl,'www')) {
     print "Error. Could not make www a member of the group ".      print "Error. Could not make www a member of the group ".
   "\"$safeusername\".\n" unless $noprint;    "\"$safeusername\".\n" unless $noprint;
Line 287  if ($?) { Line 308  if ($?) {
 ($>,$<)=($wwwid,0);  ($>,$<)=($wwwid,0);
 &enable_root_capability;  &enable_root_capability;
   
 # -- Don't add public_html... that can be added either by the user  # Check if home directory exists for user
 #    or by lchtmldir when the user is granted an authorship role.  # If not, create one.
   if (!-e "/home/$safeusername") {
 # ------------------------------ Make final modifications to the user directory      if (!mkdir("/home/$safeusername",0710)) {
 # -- Add a public_html file with a stand-in index.html file          print "Error. Could not add home directory for ".
             "\"$safeusername\".\n" unless $noprint;
  system('/bin/chmod','-R','0660',"/home/$safeusername");          unlink('/tmp/lock_lcpasswd');
 system('/bin/chmod','0710',"/home/$safeusername");          &Exit(15);
 mkdir "/home/$safeusername/public_html",0755;      }
 system('/bin/chmod','02770',"/home/$safeusername/public_html");  }
 open OUT,">/home/$safeusername/public_html/index.html";  
 print OUT<<END;  
 <html>  
 <head>  
 <title>$safeusername</title>  
 </head>  
 <body>  
 <h1>Construction Space</h1>  
 <h3>$safeusername</h3>  
 </body>  
 </html>  
 END  
 close OUT;  
   
 print "lcuseradd ownership\n" unless $noprint;  
 system('/bin/chown','-R',"$safeusername:$safeusername","/home/$safeusername");  
 # ---------------------------------------------------- Gracefull Apache Restart  # ---------------------------------------------------- Gracefull Apache Restart
   my $pidfile;
 if (-e '/var/run/httpd.pid') {  if (-e '/var/run/httpd.pid') {
       $pidfile = '/var/run/httpd.pid';
   } elsif (-e '/var/run/httpd2.pid') {   #Apache 2 on SuSE 10.1 and SLES10 
       $pidfile = '/var/run/httpd2.pid';
   } 
   
   if ($pidfile) {
     print "lcuseradd Apache restart\n" unless $noprint;      print "lcuseradd Apache restart\n" unless $noprint;
     open(PID,'/var/run/httpd.pid');      open(PID,"<$pidfile");
     my $pid=<PID>;      my $pid=<PID>;
     close(PID);      close(PID);
     my ($safepid)=($pid=~s/(\D+)//g);      $pid=~ /(\D+)/;
       my $safepid = $1;
     if ($pid) {      if ($pid) {
  system('kill','-USR1',"$safepid");   system('kill','-USR1',"$safepid");
     }      }
Line 334  sub enable_root_capability { Line 348  sub enable_root_capability {
     if ($wwwid==$>) {      if ($wwwid==$>) {
  ($<,$>)=($>,0);   ($<,$>)=($>,0);
  ($(,$))=($),0);   ($(,$))=($),0);
     }      } else {
     else {  
  # root capability is already enabled   # root capability is already enabled
     }      }
       if ($wwwid == $>) {
    print("Failed to become root\n") unless $noprint;
       } else {
    print("Became root\n") unless $noprint;
       }
     return $>;      return $>;
 }  }
   
Line 346  sub disable_root_capability { Line 364  sub disable_root_capability {
     if ($wwwid==$<) {      if ($wwwid==$<) {
  ($<,$>)=($>,$<);   ($<,$>)=($>,$<);
  ($(,$))=($),$();   ($(,$))=($),$();
     }      } else {
     else {  
  # root capability is already disabled   # root capability is already disabled
     }      }
 }  }
Line 376  sub try_to_lock { Line 393  sub try_to_lock {
     }      }
     sleep 3;      sleep 3;
     $lastpid=$currentpid;      $lastpid=$currentpid;
  }   } else {
  else {  
     last;      last;
  }   }
  if ($_==10) {   if ($_==10) {
Line 389  sub try_to_lock { Line 405  sub try_to_lock {
     close LOCK;      close LOCK;
     return 1;      return 1;
 }  }
   #    Called by File::Find::find for each file examined.
   #
   #     Untaint the file and, if it is a directory,
   #     chmod it to 02770
   #
   sub set_permission {
       $File::Find::name =~ /^(.*)$/;
       my $safe_name = $1; # Untainted filename...
       
       print "$safe_name" unless $noprint;
       if(-d $safe_name) {
    print " - directory" unless $noprint;
    chmod(02770, $safe_name);
       }
       print "\n" unless $noprint;
   
   }
   
 #-------------------------- Exit...  #-------------------------- Exit...
 #  #
 #   Write the file if the error_file is defined.  Regardless  #   Write the file if the error_file is defined.  Regardless
Line 397  sub try_to_lock { Line 431  sub try_to_lock {
 sub Exit {  sub Exit {
     my ($code) = @_; # Status code.      my ($code) = @_; # Status code.
   
       # TODO: Ensure the error file is owned/deletable by www:www:
   
       &disable_root_capability(); # We run unprivileged to write the error file.
   
     print "Exiting with status $code error file is $error_file\n" unless $noprint;      print "Exiting with status $code error file is $error_file\n" unless $noprint;
     if($error_file) {      if($error_file) {
  open(FH, ">$error_file");   open(FH, ">$error_file");
Removed from v.1.27  
changed lines
  Added in v.1.43

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>