--- loncom/Attic/lchtmldir 2002/11/25 18:45:55 1.4
+++ loncom/Attic/lchtmldir 2004/10/18 10:56:50 1.9
@@ -167,7 +167,9 @@ if(($dirtry1 ne $dir) or ($dirtry2 ne $d
# As root, create the directory.
-my $fulldir = $dirtry1."/public_html";
+my $homedir = $dirtry1;
+my $fulldir = $homedir."/public_html";
+
if($DEBUG) {
print("Full directory path is: $fulldir \n");
}
@@ -189,24 +191,25 @@ if(!( -e $dirtry1)) {
$safeuser
-
- $safeuser
+
+ $safeuser Construction Space
+
+ The LearningOnline Network with Computer-Assisted Personalized Approach
+
- Learning Online Network
+This is your construction space within LON-CAPA, where you would construct resources which are meant to be
+used across courses and institutions.
- This area provides for:
+Material within this area can only be seen and edited by $safeuser and designated co-authors. To make
+it available to students and other instructors, the material needs to be published.
-
- - resource construction
- - resource publication
- - record-keeping
-
END
close OUT;
}
+
&System("/bin/chmod 02775 $fulldir");
&System("/bin/chmod 0775 $fulldir"."/index.html");
@@ -214,12 +217,19 @@ END
# Based on the authentiation mode, set the ownership of the directory.
if($authentication eq "unix:") { # Unix mode authentication...
- &System("/bin/chown -R $username".":".$username." ".$fulldir);
- &JoinGroup($username);
+ &System("/bin/chown -R $safeuser".":".$safeuser." ".$fulldir);
+ &JoinGroup($safeuser);
} else {
# Internal, Kerberos, and Local authentication are for users
# who do not have unix accounts on the system. Therefore we
# will give ownership of their public_html directories to www:www
+ # If the user is an internal auth user, the rest of the directory tree
+ # gets owned by root. This chown is needed in case what's really happening
+ # is that a file system user is being demoted to internal user...
+
+ if($authentication eq "internal:") {
+ &System("/bin/chown -R root:root ".$homedir);
+ }
&System("/bin/chown -R www:www ".$fulldir);
}
&DisableRoot;
@@ -238,7 +248,6 @@ exit 0;
sub EnableRoot {
if ($wwwid==$>) {
- print ("EnableRoot $< $>\n");
($<,$>)=($>,$<);
($(,$))=($),$();
}
@@ -268,6 +277,9 @@ sub JoinGroup {
my $usergroup = shift;
my $groups = `/usr/bin/groups www`;
+ # untaint
+ my ($safegroups)=($groups=~/:\s+([\s\w]+)/);
+ $groups=$safegroups;
chomp $groups; $groups=~s/^\S+\s+\:\s+//;
my @grouplist=split(/\s+/,$groups);
my @ugrouplist=grep {!/www|$usergroup/} @grouplist;
@@ -285,11 +297,11 @@ sub JoinGroup {
sub System {
- my $command = shift;
+ my ($command,@args) = @_;
if($DEBUG) {
- print("system: $command \n");
+ print("system: $command with args ".join(' ',@args)."\n");
}
- system($command);
+ system($command,@args);
}