Changeset 13796 for trunk/core/lib/Foswiki/Users/ApacheHtpasswdUser.pm

Timestamp:

01/23/12 19:00:19 (4 months ago)

Author:

CrawfordCurrie

Message:

Item11458: simplify and streamline handling of password file; it now must exist for Foswiki to run, and will be created by =configure= if not. This lets us do enhanced checking in =configure= while reducing the runtime burden.

File:

• trunk/core/lib/Foswiki/Users/ApacheHtpasswdUser.pm (modified) (1 diff)

trunk/core/lib/Foswiki/Users/ApacheHtpasswdUser.pm

@@ -121 +121 @@
     my $path = $Foswiki::cfg{Htpasswd}{FileName};
 
-    #TODO: what if the data dir is also read only?
-    if ( ( !-e $path ) || ( -e $path && -r $path && !-d $path && -w $path ) ) {
-        $this->{session}->enterContext('passwords_modifyable');
-        return 0;
-    }
+    # We expect the path to exist and be writable.
+    return 0 if ( -e $path && -f $path && -w $path );
+
+    # Otherwise, log a problem.
+    $this->{session}->logger->log(
+        'warning',
+        'The password file does not exist or cannot be written.' .
+        'Run =configure= and check the setting of {Htpasswd}{FileName}.' .
+        ' New user registration has been disabled until this is corrected.');
+    # And disable registration (and password changes)
+    $Foswiki::cfg{Register}{EnableNewUserRegistration} = 0;
     return 1;
 }