--- loncom/Attic/lchtmldir	2005/01/26 12:13:58	1.15
+++ loncom/Attic/lchtmldir	2007/04/10 20:32:13	1.18
@@ -41,7 +41,7 @@
 #    NSCL
 #    Michigan State University8
 #    East Lansing, MI 48824-1321
-
+#
 #   General flow of control:
 #   1. Validate process state (must be run as www).
 #   2. Validate parameters:  Need two parameters:
@@ -61,7 +61,7 @@
 #       - internal - www:www/2775
 #       - local    - www:www/2775
 #
-
+#
 #
 #   Take a few precautions to be sure that we're not vulnerable to trojan
 #   horses and other fine issues:
@@ -70,6 +70,8 @@ use strict;
 use Fcntl qw(:mode);
 use DirHandle;
 use POSIX;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA qw(:match);
 
 $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/sbin:/home/httpd/perl';
 delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
@@ -132,7 +134,7 @@ if( $authentication ne "unix:"     &&
 
 # Untaint the username.
 
-my $match = $username =~ /^(\w+)$/;
+my $match = $username =~ /^($match_username)$/;
 my $patt  = $1;
  
 if($DEBUG) {
@@ -144,7 +146,7 @@ my $safeuser = $patt;
 if($DEBUG) {
     print("Save username = $safeuser \n");
 }
-if(($username ne $safeuser) or ($safeuser!~/^[A-za-z]/)) {
+if($username ne $safeuser) {
     if($DEBUG) {
 	print("User name $username had illegal characters\n");
     }
@@ -154,7 +156,7 @@ if(($username ne $safeuser) or ($safeuse
 #untaint the base directory require that the dir contain only 
 # alphas, / numbers or underscores, and end in /$safeuser
 
-$dir =~ /(^([\w\/]+))/;
+$dir =~ /(^([\w\/\.\-]+))/;
 
 my $dirtry1 = $1;
 
@@ -185,8 +187,28 @@ if(!( -e $dirtry1)) {
         exit 6;
     }
 }
+if ($authentication eq "unix:") {
+    # check whether group $safeuser exists.
+    my $usergroups = `id -nG $safeuser`;
+    if (! grep /^$safeuser$/, split(/\s+/,$usergroups)) { 
+        if($DEBUG) {
+            print("Group \"$safeuser\" does not exist or $safeuser is not a member of that group.\n");
+        }
+        exit 7;
+    }
+}
+
+
+
 &EnableRoot;
 
+#  If authentication is internal and the top level directory exists
+#  give it the right permissions (in case this is a modification.
+
+if ($authentication eq "internal:") {
+    chmod(0711, $homedir);	# so www can enter ~/public_html.
+}
+
 &System("/bin/mkdir -p $fulldir")   unless (-e $fulldir);
     unless(-e $fulldir."/index.html") {
 	open OUT,">".$fulldir."/index.html";