tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r771008 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/users/ webapps/docs/
Date Sun, 03 May 2009 01:03:04 GMT
Author: markt
Date: Sun May  3 01:03:03 2009
New Revision: 771008

URL: http://svn.apache.org/viewvc?rev=771008&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46815
Make MemoryUserDatabase read-only be default

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May  3 01:03:03 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,763599,763681,763706,765662,768335
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,763599,763681,763706,765662,768335

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=771008&r1=771007&r2=771008&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May  3 01:03:03 2009
@@ -56,13 +56,6 @@
   http://svn.apache.org/viewvc?rev=757335&view=rev (to remove the Catalina dep)
   +1: markt, billbarker
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46815
-  http://svn.apache.org/viewvc?rev=751289&view=rev
-  http://svn.apache.org/viewvc?rev=753039&view=rev
-  Make MemoryUserDatabase read-only by default
-  +1: markt, rjung, pero
-  -1: 
-
 * Backport cleanup of semantics of thisAccessedTime and
   lastAccessedTime for sessions:
   - preparational whitespace changes

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties?rev=771008&r1=771007&r2=771008&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties Sun May  3
01:03:03 2009
@@ -18,3 +18,4 @@
 memoryUserDatabase.renameNew=Cannot rename new file to {0}
 memoryUserDatabase.writeException=IOException writing to {0}
 memoryUserDatabase.notPersistable=User database is not persistable - no write permissions
on directory
+memoryUserDatabase.readOnly=User database has been configured to be read only. Changes cannot
be saved

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=771008&r1=771007&r2=771008&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Sun May  3
01:03:03 2009
@@ -120,7 +120,7 @@
     /**
      * A flag, indicating if the user database is read only.
      */
-    protected boolean readonly = false;
+    protected boolean readonly = true;
 
     /**
      * The set of {@link Role}s defined in this database, keyed by
@@ -500,6 +500,7 @@
     public void save() throws Exception {
 
         if (getReadonly()) {
+            log.error(sm.getString("memoryUserDatabase.readOnly"));
             return;
         }
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java?rev=771008&r1=771007&r2=771008&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java Sun
May  3 01:03:03 2009
@@ -101,7 +101,9 @@
 
         // Return the configured database instance
         database.open();
-        database.save();
+        // Don't try something we know won't work
+        if (!database.getReadonly())
+            database.save();
         return (database);
 
     }

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=771008&r1=771007&r2=771008&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun May  3 01:03:03 2009
@@ -40,6 +40,10 @@
         the JNDIRealm. Patch provided by Brandon DuRette. (markt)
       </fix>
       <fix>
+        <bug>46815</bug>: Make the MemoryUserDatabase read-only by default.
+        (markt)
+      </fix>
+      <fix>
         <bug>46816</bug>: Align session manager mbean descriptor with
         implementation. (markt)
       </fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message