[LON-CAPA-cvs] cvs: loncom / lchtmldir

[albertel]

albertel		Wed Aug 22 15:03:09 2007 EDT

  Modified files:              
    /loncom	lchtmldir 
  Log:
  - switch to using $match_username
  
  
Index: loncom/lchtmldir
diff -u loncom/lchtmldir:1.18 loncom/lchtmldir:1.19
--- loncom/lchtmldir:1.18	Tue Apr 10 16:32:13 2007
+++ loncom/lchtmldir	Wed Aug 22 15:03:04 2007
@@ -156,32 +156,30 @@
 #untaint the base directory require that the dir contain only 
 # alphas, / numbers or underscores, and end in /$safeuser
 
-$dir =~ /(^([\w\/\.\-]+))/;
 
-my $dirtry1 = $1;
 
-$dir =~ /$\/$safeuser/;
-my $dirtry2 = $1;
+my ($allowed_dir) = ($dir =~ m{(^([/]|$match_username)+)});
 
-if(($dirtry1 ne $dir) or ($dirtry2 ne $dir)) {
+my $has_correct_end = ($dir =~ m{/\Q$safeuser\E$});
+
+if(($allowed_dir ne $dir) or (!$has_correct_end)) {
     if ($DEBUG) {
 	print("Directory $dir is not a valid home for $safeuser\n");
     }
     exit 5;
 }
 
-
 # As root, create the directory.
 
-my $homedir = $dirtry1;
+my $homedir = $allowed_dir;
 my $fulldir = $homedir."/public_html";
 
 if($DEBUG) {
     print("Full directory path is: $fulldir \n");
 }
-if(!( -e $dirtry1)) {
+if(!( -e $homedir)) {
     if($DEBUG) {
-	print("User's home directory $dirtry1 does not exist\n");
+	print("User's home directory $homedir does not exist\n");
     }
     if ($authentication eq "unix:") {
         exit 6;