Make UserDatabase read only by default and log an error if someone tries to save...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@751289 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/users/LocalStrings.properties b/java/org/apache/catalina/users/LocalStrings.properties
index 8e8cb23..117f165 100644 (file)
--- a/java/org/apache/catalina/users/LocalStrings.properties
+++ b/java/org/apache/catalina/users/LocalStrings.properties
@@ -18,3 +18,4 @@ memoryUserDatabase.renameOld=Cannot rename original file to {0}
 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

diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 8f441cd..b9199cb 100644 (file)
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -120,7 +120,7 @@ public class MemoryUserDatabase implements UserDatabase {
     /**
      * 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 class MemoryUserDatabase implements UserDatabase {
     public void save() throws Exception {
 
         if (getReadonly()) {
+            log.error(sm.getString("memoryUserDatabase.readOnly"));
             return;
         }