--- loncom/LONCAPA.pm	2006/05/30 19:26:34	1.4
+++ loncom/LONCAPA.pm	2006/11/22 19:58:29	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Base routines
 #
-# $Id: LONCAPA.pm,v 1.4 2006/05/30 19:26:34 albertel Exp $
+# $Id: LONCAPA.pm,v 1.14 2006/11/22 19:58:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,11 +38,26 @@ use POSIX;
 
 my $loncapa_max_wait_time = 13;
 
+
+use vars qw($match_domain   $match_not_domain
+	    $match_username $match_not_username
+	    $match_handle   $match_not_handle);
+
 require Exporter;
 our @ISA = qw (Exporter);
-our @EXPORT = qw(&add_get_param &escape &unescape &tie_domain_hash &untie_domain_hash &tie_user_hash &untie_user_hash &propath);
+our @EXPORT = qw(&add_get_param    &escape            &unescape       
+		 &tie_domain_hash  &untie_domain_hash &tie_user_hash
+		 &untie_user_hash  &propath);
+our @EXPORT_OK = qw($match_domain   $match_not_domain
+		    $match_username $match_not_username
+		    $match_handle   $match_not_handle);
+our %EXPORT_TAGS = ( 'match' =>[qw($match_domain   $match_not_domain
+				   $match_username $match_not_username
+				   $match_handle   $match_not_handle)],);
 my %perlvar;
 
+
+
 # Inputs are a url, and a hash ref of
 # form name => value pairs
 # takes care of properly adding the form name elements and values to the 
@@ -81,12 +96,43 @@ sub unescape {
     return $str;
 }
 
+$match_domain     = $LONCAPA::domain_re     = qr{[\w\-.]+};
+$match_not_domain = $LONCAPA::not_domain_re = qr{[^\w\-.]+};
+sub clean_domain {
+    my ($domain) = @_;
+    $domain =~ s/$match_not_domain//g;
+    return $domain;
+}
+
+sub split_courseid {
+    my ($courseid) = @_;
+    my  ($domain,$coursenum) = 
+	($courseid=~m{^/($match_domain)/($match_username)});
+    return ($domain,$coursenum);
+}
+
+$match_username     = $LONCAPA::username_re     = qr{[\w\-.]+};
+$match_not_username = $LONCAPA::not_username_re = qr{[^\w\-.]+};
+sub clean_username {
+    my ($username) = @_;
+    $username =~ s/$match_not_username//g;
+    return $username;
+}
+
+$match_handle     = $LONCAPA::handle_re     = qr{[\w\-.]+};
+$match_not_handle = $LONCAPA::not_handle_re = qr{[^\w\-.]+};
+sub clean_handle {
+    my ($handle) = @_;
+    $handle =~ s/$match_not_handle//g;
+    return $handle;
+}
+
 # -------------------------------------------- Return path to profile directory
 
 sub propath {
     my ($udom,$uname)=@_;
-    $udom=~s/\W//g;
-    $uname=~s/\W//g;
+    $udom = &clean_domain($udom);
+    $uname= &clean_username($uname);
     my $subdir=$uname.'__';
     $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
     my $proname="$perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
@@ -120,7 +166,7 @@ sub tie_domain_hash {
     
     # Filter out any whitespace in the domain name:
     
-    $domain =~ s/\W//g;
+    $domain = &clean_domain($domain);
     
     # We have enough to go on to tie the hash:
     
@@ -167,6 +213,27 @@ sub untie_user_hash {
     return &_locking_hash_untie(@_);
 }
 
+# routines if you just have a filename
+# return tied hashref or undef
+
+sub locking_hash_tie {
+    my ($filename,$how)=@_;
+    my ($file_prefix,$namespace)=&db_filename_parts($filename);
+    if ($namespace eq '') { return undef; }
+    return &_locking_hash_tie($file_prefix,$namespace,$how);
+}
+
+sub locking_hash_untie {
+    return &_locking_hash_untie(@_);
+}
+
+sub db_filename_parts {
+    my ($filename)=@_;
+    my ($file_path,$namespace)=($filename=~/^(.*)\/([^\/]+)\.db$/);
+    if ($namespace eq '') { return undef; }
+    return ($file_path.'/'.$namespace,$namespace);
+}
+
 # internal routines that handle the actual tieing and untieing process
 
 sub _do_hash_tie {
@@ -176,11 +243,10 @@ sub _do_hash_tie {
 	# If this is a namespace for which a history is kept,
 	# make the history log entry:    
 	if (($namespace !~/^nohist\_/) && (defined($loghead))) {
-	    my $args = scalar @_;
 	    my $hfh = IO::File->new(">>$file_prefix.hist"); 
 	    if($hfh) {
-		my $now = time;
-		print $hfh "$loghead:$now:$what\n";
+		my $now = time();
+		print $hfh ("$loghead:$now:$what\n");
 	    }
 	    $hfh->close;
 	}
@@ -198,9 +264,32 @@ sub _do_hash_untie {
 
 {
     my $sym;
+    my @pushed_syms;
+
+    sub clean_sym {
+	undef($sym);
+    }
+    sub push_locking_hash_tie {
+	if (!defined($sym)) {
+	    die("Invalid used of push_locking_hash_tie, should only be called after a lock has occurred and before and unlock.");
+	}
+	push(@pushed_syms,$sym);
+	undef($sym);
+    }
+
+    sub pop_locking_hash_tie {
+	if (defined($sym)) {
+	    die("Invalid nested used of pop_locking_hash_tie, should only be called after a unlock has occurred.");
+	}
+	$sym = pop(@pushed_syms);
+    }
 
     sub _locking_hash_tie {
 	my ($file_prefix,$namespace,$how,$loghead,$what) = @_;
+	if (defined($sym)) {
+	    die('Nested locking attempted without proper use of push_locking_hash_tie, this is unsupported');
+	}
+
         my $lock_type=LOCK_SH;
 # Are we reading or writing?
         if ($how eq &GDBM_READER()) {
@@ -212,25 +301,34 @@ sub _do_hash_untie {
                if ((! -e "$file_prefix.db") && (! -e "$file_prefix.db.gz")) {
 # No such file. Forget it.                
                    $! = 2;
+		   &clean_sym();
                    return undef;
                }
 # Apparently just no lock file yet. Make one
                open($sym,">>$file_prefix.db.lock");
            }
 # Do a shared lock
-           if (!&flock_sym(LOCK_SH)) { return undef; } 
+           if (!&flock_sym(LOCK_SH)) { 
+	       &clean_sym();
+	       return undef; 
+	   } 
 # If this is compressed, we will actually need an exclusive lock
 	   if (-e "$file_prefix.db.gz") {
-	       if (!&flock_sym(LOCK_EX)) { return undef; }
+	       if (!&flock_sym(LOCK_EX)) {
+		   &clean_sym();
+		   return undef;
+	       }
 	   }
         } elsif ($how eq &GDBM_WRCREAT()) {
 # We are writing
            open($sym,">>$file_prefix.db.lock");
 # Writing needs exclusive lock
-           if (!&flock_sym(LOCK_EX)) { return undef; }
+           if (!&flock_sym(LOCK_EX)) {
+	       &clean_sym();
+	       return undef;
+	   }
         } else {
-           &logthis("Unknown method $how for $file_prefix");
-           die();
+           die("Unknown method $how for $file_prefix");
         }
 # The file is ours!
 # If it is archived, un-archive it now
@@ -243,7 +341,12 @@ sub _do_hash_untie {
 # Change access mode to non-blocking
        $how=$how|&GDBM_NOLOCK();
 # Go ahead and tie the hash
-       return &_do_hash_tie($file_prefix,$namespace,$how,$loghead,$what);
+      	my $result = 
+	    &_do_hash_tie($file_prefix,$namespace,$how,$loghead,$what);
+	if (!$result) {
+	    &clean_sym();
+	}
+	return $result;
     }
 
     sub flock_sym {
@@ -272,7 +375,7 @@ sub _do_hash_untie {
 	my $result = untie(%$hashref);
 	flock($sym,LOCK_UN);
 	close($sym);
-	undef($sym);
+	&clean_sym();
 	return $result;
     }
 }
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>