Merge pull request #1592 from tulinkry/auth-reload

adding a tag to the config message to reload all authorization plugins

Author: tulinkry

README.txt

@@ -134,10 +134,14 @@ Currently supported message types:
                     and returns the empty statistics
         - "get"     the application returns current statistics
 4) ConfigMessage (config)
-    This message retrieves or sends a configuration to the webapp,
-    depending on tag. "setconf" tag sends config to webapp and requires
-    file as argument. "set" tag sets particular configuration option in the webapp.
-5) RefreshMessage (refresh)
+    This message performs some configuration communication with the webapp,
+    depending on tag.
+        - "setconf" tag sends config to webapp and requires a file as an argument.
+        - "getconf" tag retrieves the configuration from the webapp.
+        - "set" tag sets particular configuration option in the webapp.
+        - "auth" tag requires "reload" text and
+                 reloads all authorization plugins.
+5) RefreshMesssage (refresh)
     Sent at the end of partial reindex to trigger refresh of SearcherManagers.
 
 4. OpenGrok install

src/org/opensolaris/opengrok/configuration/messages/ConfigMessage.java

@@ -29,6 +29,7 @@
 import java.lang.reflect.Method;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.opensolaris.opengrok.authorization.AuthorizationFramework;
 import org.opensolaris.opengrok.configuration.Configuration;
 import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
 
@@ -53,6 +54,8 @@ public class ConfigMessage extends Message {
     protected byte[] applyMessage(RuntimeEnvironment env) throws IOException {
         if (hasTag("getconf")) {
             return env.getConfiguration().getXMLRepresentationAsString().getBytes();
+        } else if (hasTag("auth") && "reload".equalsIgnoreCase(getText())) {
+            AuthorizationFramework.getInstance().reload();
         } else if (hasTag("set")) {
             Matcher matcher = VARIABLE_PATTERN.matcher(getText());
             if (matcher.find()) {
@@ -248,8 +251,9 @@ protected int toInteger(boolean b) {
     public void validate() throws Exception {
         if (toInteger(hasTag("setconf"))
                 + toInteger(hasTag("getconf"))
+                + toInteger(hasTag("auth"))
                 + toInteger(hasTag("set")) > 1) {
-            throw new Exception("The message tag must be either setconf, getconf or set");
+            throw new Exception("The message tag must be either setconf, getconf, auth or set");
         }
 
         if (hasTag("setconf")) {
@@ -270,8 +274,15 @@ public void validate() throws Exception {
             if (getTags().size() != 1) {
                 throw new Exception("The set message should be the only tag.");
             }
+        } else if (hasTag("auth")) {
+            if (!"reload".equalsIgnoreCase(getText())) {
+                throw new Exception("The auth message can only accept a text \"reload\".");
+            }
+            if (getTags().size() != 1) {
+                throw new Exception("The auth message should be the only tag.");
+            }
         } else {
-            throw new Exception("The message tag must be either setconf, getconf or set");
+            throw new Exception("The message tag must be either setconf, getconf, auth or set");
         }
 
         super.validate();