--- loncom/Attic/lchtmldir 2002/11/25 18:45:55 1.4 +++ loncom/Attic/lchtmldir 2004/08/05 20:33:50 1.6 @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w # The Learning Online Network with CAPA # @@ -189,19 +189,19 @@ 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.

- END @@ -214,8 +214,8 @@ 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 @@ -268,6 +268,9 @@ sub JoinGroup { my $usergroup = shift; my $groups = `/usr/bin/groups www`; + # untaint + my ($safegroups)=($groups=~/([\s\w]+)/); + $groups=$safegroups; chomp $groups; $groups=~s/^\S+\s+\:\s+//; my @grouplist=split(/\s+/,$groups); my @ugrouplist=grep {!/www|$usergroup/} @grouplist; @@ -285,11 +288,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); }