--- doc/loncapafiles/sanitycheck.piml	2002/03/03 04:29:10	1.1
+++ doc/loncapafiles/sanitycheck.piml	2002/11/26 15:05:19	1.9
@@ -1,7 +1,9 @@
+<!DOCTYPE piml PUBLIC "-//TUX/DTD piml 1.0 Final//EN" 
+	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- sanitycheck.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: sanitycheck.piml,v 1.1 2002/03/03 04:29:10 harris41 Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.9 2002/11/26 15:05:19 matthew Exp $ -->
 
 <!--
 
@@ -31,21 +33,58 @@ http://www.lon-capa.org/
 <targetroot>/</targetroot>
 <files>
 <file>
-<target dist='default'>/etc/httpd/conf/loncapa.conf</target>
+<target dist='default'>/var/lib/mysql/mysql.sock</target>
+<target dist='redhat7'>/tmp/mysql.sock</target>
 <perlscript mode='fg'>
-my $diff=`diff ../../loncom/loncapa.conf <TARGET />`;
-if ($diff) {
-  print "**** ERROR **** There are unexpected differences for <TARGET />\n";
-}
+unless
+    (-e '<TARGET />') # Does file exist?
+  {
+    print("**** ERROR **** Missing <TARGET />\n");
+  }
+else # It exists, so look at the file metadata more closely.
+  {
+    my @s = stat('<TARGET />');
+    my $uid = $s[4];
+    my $mode = $s[2];
+    my $web_uid = getpwnam('www');
+    my $smode = sprintf("%04o",$mode & 07777);
+
+    if ($uid ne $web_uid) # If file owned by someone else other than www.
+      {
+	print('**** ERROR **** <TARGET /> should be owned by'.
+	      ' www.'."\n".'Try these commands to make things right:'."\n".
+	      'chown www:www <TARGET />'."\n".
+	      'chmod a-rwx,u+rwx <TARGET />'."\n");
+      }
+    else # Check permissions on the file to make sure it is private to www.
+      {
+	$smode =~ /^.(.)..$/;
+	my $wflag = $1;
+	if ($wflag != 7) # Can www use this socket?  (Hope so!)
+	  {
+	    print('**** ERROR **** '.
+	      '<TARGET /> should be user "rwx" (by'.
+	      ' www).'."\n".'Try these commands to make things right:'."\n".
+	      'chown www:www <TARGET />'."\n".
+	      'chmod a-rwx,u+rwx <TARGET />'."\n");
+	  }
+	$smode=~/^..(..)$/;
+	$wflag=$1;
+	if ($wflag ne "00") # Can others use this socket?  (Hope not!)
+	  {
+	    print('**** ERROR **** '.
+	      '<TARGET /> should not be group or everybody accessible'.
+	      '.'."\n".'Try these commands to make things right:'."\n".
+	      'chown www:www <TARGET />'."\n".
+	      'chmod a-rwx,u+rwx <TARGET />'."\n");
+	  }
+      }
+  }
 </perlscript>
 </file>
 <file>
-<target dist='default'>/etc/httpd/conf/access.conf</target>
+<target dist='default'>/etc/httpd/conf/loncapa.conf</target>
 <perlscript mode='fg'>
-my $diff=`diff -y --suppress-common-lines ../access.conf <TARGET /> | grep -v PerlSetVar | grep -v 'Include conf/loncapa.conf'`;
-if ($diff) {
-  print "**** ERROR **** There are unexpected differences for <TARGET />\n";
-}
 open IN, "&lt;<TARGET />";
 my $hbug=-1;
 my $dbug=-1;
@@ -61,6 +100,11 @@ while (&lt;IN&gt;) {
   $dbug=0;
   $dbug=1 if $v=~/\W/;
   $dbug=1 if $v=~/\_/;
+  # Avoid namespace conflicts under the web server's DocumentRoot.
+  my @badnames=('raw','userfiles','priv','adm','uploaded');
+  foreach my $bad (@badnames) {
+   $dbug=1 if $v eq $bad;
+  }
  }
 }
 if ($hbug) {
@@ -86,8 +130,14 @@ while (&lt;IN&gt;) {
   $dbug=1 if $a[0]=~/\_/;
   $dbug=1 if $a[1]=~/\_/;
   $dbug=1 if $a[1]=~/\W/;
-  $fbug=1 if @a!=5;
-  $sbug=1 if /\s.+$/;
+  $fbug=1 if (@a<5 || @a>6);
+  my $expr='\s.+$';
+  $sbug=1 if ($a[0] =~ /$expr/ ||
+	      $a[1] =~ /$expr/ ||
+	      $a[2] =~ /$expr/ ||
+	      $a[3] =~ /$expr/ ||
+	      $a[4] =~ /$expr/ )
+;
  }
 }
 close IN;
@@ -98,7 +148,7 @@ if ($dbug) {
   print "**** ERROR **** <TARGET /> has invalid host id or domain id\n";
 }
 if ($fbug) {
-  print "**** ERROR **** <TARGET /> is lacking 5 columns for every row\n";
+  print "**** ERROR **** <TARGET /> is lacking 5 or 6 columns for every row\n";
 }
 if ($sbug) {
   print "**** ERROR **** <TARGET /> has illegal whitespace character\n";