--- loncom/Attic/lcuseradd	2005/06/21 10:58:38	1.37
+++ loncom/Attic/lcuseradd	2011/10/24 21:30:09	1.42
@@ -6,7 +6,7 @@
 #             with adding a user with filesystem privileges (e.g. author)
 #
 #
-# $Id: lcuseradd,v 1.37 2005/06/21 10:58:38 foxr Exp $
+# $Id: lcuseradd,v 1.42 2011/10/24 21:30:09 www Exp $
 ###
 
 ###############################################################################
@@ -49,9 +49,10 @@ use File::Find;
 #
 # Standard input (STDIN) usage
 # First line is USERNAME
-# Second line is PASSWORD
+# Second line is DOMAIN
 # 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.
 #            In either case, the program Exits with the code as its Exit status.
 #            The error file will just be a single line containing an
@@ -59,7 +60,7 @@ use File::Find;
 #            
 #  
 #
-# Command-line arguments [USERNAME] [PASSWORD] [PASSWORD]
+# Command-line arguments [USERNAME] [DOMAIN] [PASSWORD] [PASSWORD]
 # Yes, but be very careful here (don't pass shell commands)
 # and this is only supported to allow perl-system calls.
 #
@@ -82,7 +83,7 @@ use File::Find;
 # Usage within code
 #
 # $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;
 
 # ---------------------------------------------------- Description of functions
@@ -109,7 +110,8 @@ use File::Find;
 # (12,"Error. Something went wrong with the addition of user ".
 #     "\"$safeusername\"."),
 # (13,"Error. Password mismatch."),
-# (14, "Error filename is invalid")
+# (14, "Error filename is invalid"),
+# (15, "Error. Could not add home directory.")
 
 # ------------------------------------------------------------- Initializations
 # Security
@@ -120,10 +122,6 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}
 # Do not print error messages.
 my $noprint=1;
 
-#  Error file:
-
-my $error_file;			# This is either the error file name or undef.
-
 print "In lcuseradd\n" unless $noprint;
 
 # ----------------------------- Make sure this process is running from user=www
@@ -165,13 +163,15 @@ if (@ARGV>=3) {
     foreach (@input) {chomp;}
 }
 
-my ($username,$password1,$password2, $error_file)=@input;
+my ($username,$domain,$password1,$password2, $error_file)=@input;
 print "Username = ".$username."\n" unless $noprint;
 $username=~/^(\w+)$/;
 print "Username after substitution - ".$username unless $noprint;
 my $safeusername=$1;
 print "Safe username = $safeusername \n" unless $noprint;
 
+print "Domain = ".$domain."\n" unless $noprint;
+
 if (($username ne $safeusername) or ($safeusername!~/^[A-Za-z]/)) {
     print "Error. The user name specified $username $safeusername  has invalid characters.\n"
 	unless $noprint;
@@ -241,43 +241,32 @@ print "enabling root\n" unless $noprint;
 # ---------------------------------- Start running script with root permissions
 &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
 
 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) {
     print "Error.  Something went wrong with the addition of user ".
 	  "\"$safeusername\".\n" unless $noprint;
+    system("/usr/sbin/groupdel $safeusername");
     print "Final status of useradd = $status\n";
     unlink('/tmp/lock_lcpasswd');
     &Exit(12);
 }
-my ($dmy1, $dmy2, $uid, $gid) = getpwnam($safeusername);
-my ($group) = getgrgid($gid);
-if (! $group) {
-    print "Error. The primary group of user \"$safeusername\" could not be".
-          "determined.\n" unless $noprint;
-    system("/usr/sbin/userdel -r $safeusername");
-    unlink('/tmp/lock_lcpasswd');
-    &Exit(12);
-}
-if ($group != $safeusername) {
-   $status = system("/usr/sbin/groupadd -g $uid $safeusername");
-   if (! $status) {
-      $status = system("/usr/sbin/usermod -g $uid $safeusername");
-      if ($status) {
-         system("/usr/sbin/groupdel $safeusername");
-      }
-   }
-   if ($status) {
-      print "Error.  Something went wrong with the addition of user ".
-            "\"$safeusername\".\n" unless $noprint;
-      system("/usr/sbin/userdel -r $safeusername");
-      unlink('/tmp/lock_lcpasswd');
-      &Exit(12);
-   }
-}
 
 print "Done adding user\n" unless $noprint;
 # Make www a member of that user group.
@@ -289,7 +278,7 @@ chomp $groups; $groups=~s/^\S+\s+\:\s+//
 my @grouplist=split(/\s+/,$groups);
 my @ugrouplist=grep {!/www|$safeusername/} @grouplist;
 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')) {
     print "Error. Could not make www a member of the group ".
 	  "\"$safeusername\".\n" unless $noprint;
@@ -319,45 +308,43 @@ if ($?) {
 ($>,$<)=($wwwid,0);
 &enable_root_capability;
 
-# -- Don't add public_html... that can be added either by the user
-#    or by lchtmldir when the user is granted an authorship role.
+# Check if home directory exists for user
+# If not, create one.
+if (!-e "/home/$safeusername") {
+    if (!mkdir("/home/$safeusername",0710)) {
+        print "Error. Could not add home directory for ".
+          "\"$safeusername\".\n" unless $noprint;
+        unlink('/tmp/lock_lcpasswd');
+        &Exit(15);
+    }
+}
 
 # ------------------------------ Make final modifications to the user directory
-# -- Add a public_html file with a stand-in index.html file
+# -- Add a construction space
+        
+my $path="/home/httpd/html/priv/".$domain;
+unless (-e $path) {
+   mkdir($path);
+}
+unless (-e $path.'/'.$safeusername) {
+   mkdir($path.'/'.$safeusername);
+}
 
- system('/bin/chmod','-R','0660',"/home/$safeusername");
-system('/bin/chmod','0710',"/home/$safeusername");
-mkdir "/home/$safeusername/public_html",0755;
-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;
 
-#
-#   In order to allow the loncapa daemons appropriate access
-#   to public_html, Top level and public_html directories should
-#   be owned by safeusername:safeusername as should the smaple index.html..
-print "lcuseradd ownership\n" unless $noprint;
-system('/bin/chown','-R',"$safeusername:$safeusername","/home/$safeusername"); # First set std ownership on everything.
-&set_public_html_permissions("/home/$safeusername/public_html");
-#  system('/bin/chown',"$safeusername:www","/home/$safeusername");	# Now adust top level...
-#  system('/bin/chown','-R',"$safeusername:www","/home/$safeusername/public_html"); # And web dir.
 # ---------------------------------------------------- Gracefull Apache Restart
+my $pidfile;
 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;
-    open(PID,'/var/run/httpd.pid');
+    open(PID,"<$pidfile");
     my $pid=<PID>;
     close(PID);
-    my  $pid=~ /(\D+)/;
+    $pid=~ /(\D+)/;
     my $safepid = $1;
     if ($pid) {
 	system('kill','-USR1',"$safepid");
@@ -376,6 +363,11 @@ sub enable_root_capability {
     } else {
 	# root capability is already enabled
     }
+    if ($wwwid == $>) {
+	print("Failed to become root\n") unless $noprint;
+    } else {
+	print("Became root\n") unless $noprint;
+    }
     return $>;
 }
 
@@ -442,35 +434,6 @@ sub set_permission {
     print "\n" unless $noprint;
 
 }
-#
-#    Set up the correct permissions for all files in the 
-#    user's public htmldir. We just do a chmod -R 0660 ... for
-#    the ordinary files.  The we use File::Find
-#    to pop through the directory tree changing directories only
-#    to 02770:
-#
-sub set_public_html_permissions {
-    my ($topdir) = @_;
-
-    #   Set the top level dir permissions (I'm not sure if find 
-    #   will enumerate it specifically), correctly and all
-    #   files and dirs to the 'ordinary' file permissions:
-
-    system("chmod -R 0660 $topdir");
-    chmod(02770, $topdir);
-
-    #  Now use find to locate all directories under $topdir
-    #  and set their modes to 02770...
-    #
-    print "Find file\n " unless $noprint;
-    File::Find::find({"untaint"         => 1,
-		      "untaint_pattern" => qr(/^(.*)$/),
-		      "untaint_skip"    => 1,
-		      "no_chdir"         => 1,
-		      "wanted"          => \&set_permission }, "$topdir");
-
-
-}
 
 #-------------------------- Exit...
 #