--- loncom/Attic/lcuseradd 2001/11/15 19:08:00 1.16 +++ loncom/Attic/lcuseradd 2002/09/16 13:27:40 1.22 @@ -9,8 +9,16 @@ # 10/27,10/29,10/30 Scott Harrison # YEAR=2001 # 10/21,11/13,11/15 Scott Harrison +# YEAR=2002 +# May 19, 2002 Ron Fox +# - Removed creation of the pulic_html directory. This directory +# can now be added in two ways: +# o The user can add it themselves if they want some local web +# space which may or may not contain construction items. +# o LonCapa will add it if/when the user is granted an Author +# role. # -# $Id: lcuseradd,v 1.16 2001/11/15 19:08:00 harris41 Exp $ +# $Id: lcuseradd,v 1.22 2002/09/16 13:27:40 foxr Exp $ ### ############################################################################### @@ -40,8 +48,7 @@ use strict; # ------------------------------------------------------- Description of script # # This script is a setuid script that should -# be run by user 'www'. It creates a /home/USERNAME directory -# as well as a /home/USERNAME/public_html directory. +# be run by user 'www'. It creates a /home/USERNAME directory. # It adds a user to the unix system. # Passwords are set with lcpasswd. # www becomes a member of this user group. @@ -151,21 +158,25 @@ else { unlink('/tmp/lock_lcpasswd'); exit 3; } - map {chomp} @input; + foreach (@input) {chomp;} } my ($username,$password1,$password2)=@input; +print "Username = ".$username unless $noprint; $username=~/^(\w+)$/; +print "Username after substitution - ".$username unless $noprint; my $safeusername=$1; +print "Safe username = $safeusername" unless $noprint; + if (($username ne $safeusername) or ($safeusername!~/^[A-Za-z]/)) { - print "Error. The user name specified has invalid characters.\n" + print "Error. The user name specified $username $safeusername has invalid characters.\n" unless $noprint; unlink('/tmp/lock_lcpasswd'); exit 9; } my $pbad=0; -map {if ((ord($_)<32)||(ord($_)>126)){$pbad=1;}} (split(//,$password1)); -map {if ((ord($_)<32)||(ord($_)>126)){$pbad=1;}} (split(//,$password2)); +foreach (split(//,$password1)) {if ((ord($_)<32)||(ord($_)>126)){$pbad=1;}} +foreach (split(//,$password2)) {if ((ord($_)<32)||(ord($_)>126)){$pbad=1;}} if ($pbad) { print "Error. A password entry had an invalid character.\n"; unlink('/tmp/lock_lcpasswd'); @@ -199,7 +210,12 @@ if (system('/usr/sbin/useradd','-c','LON } # Make www a member of that user group. -if (system('/usr/sbin/usermod','-G',$safeusername,'www')) { +my $groups=`/usr/bin/groups www` or exit(6); +chomp $groups; $groups=~s/^\S+\s+\:\s+//; +my @grouplist=split(/\s+/,$groups); +my @ugrouplist=grep {!/www|$safeusername/} @grouplist; +my $gl=join(',',(@ugrouplist,$safeusername)); +if (system('/usr/sbin/usermod','-G',$gl,'www')) { print "Error. Could not make www a member of the group ". "\"$safeusername\".\n" unless $noprint; unlink('/tmp/lock_lcpasswd'); @@ -220,18 +236,22 @@ print OUT "\n"; print OUT $password1; print OUT "\n"; close OUT; -($>,$<)=($wwwid,0); if ($?) { exit 8; } +($>,$<)=($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. + # ------------------------------ Make final modifications to the user directory # -- Add a public_html file with a stand-in index.html file -# system('/bin/chmod','-R','0660',"/home/$safeusername"); + system('/bin/chmod','-R','0660',"/home/$safeusername"); system('/bin/chmod','0710',"/home/$safeusername"); -mkdir "/home/$safeusername/public_html",2760; +mkdir "/home/$safeusername/public_html",0755; +system('/bin/chmod','02770',"/home/$safeusername/public_html"); open OUT,">/home/$safeusername/public_html/index.html"; print OUT< @@ -250,11 +270,12 @@ This area provides for:
  • resource construction
  • resource publication
  • record-keeping
    • - - - + + + END close OUT; + system('/bin/chown','-R',"$safeusername:$safeusername","/home/$safeusername"); # -------------------------------------------------------- Exit script