perform any necessary action when the configuration is read from a file (#1616)

fixes #1609

Author: tulinkry

src/org/opensolaris/opengrok/configuration/RuntimeEnvironment.java

@@ -132,9 +132,9 @@ public final class RuntimeEnvironment {
     private Statistics statistics = new Statistics();
 
     /**
-     * Instance of authorization framework. Allowing every request by default.
+     * Instance of authorization framework.
      */
-    private AuthorizationFramework authFramework = new AuthorizationFramework(null);
+    private AuthorizationFramework authFramework;
 
     /* Get thread pool used for top-level repository history generation. */
     public static synchronized ExecutorService getHistoryExecutor() {
@@ -1552,15 +1552,18 @@ public void loadStatistics(InputStream in) throws IOException, ParseException {
      * @see AuthorizationFramework#getPluginVersion()
      */
     public int getPluginVersion() {
-        return authFramework.getPluginVersion();
+        return getAuthorizationFramework().getPluginVersion();
     }
 
     /**
      * Return the authorization framework used in this environment.
      *
      * @return the framework
      */
-    public AuthorizationFramework getAuthorizationFramework() {
+    synchronized public AuthorizationFramework getAuthorizationFramework() {
+        if (authFramework == null) {
+            authFramework = new AuthorizationFramework(threadConfig.get().getPluginDirectory());
+        }
         return authFramework;
     }
 
@@ -1570,7 +1573,7 @@ public AuthorizationFramework getAuthorizationFramework() {
      *
      * @param fw the new framework
      */
-    public void setAuthorizationFramework(AuthorizationFramework fw) {
+    synchronized public void setAuthorizationFramework(AuthorizationFramework fw) {
         if (this.authFramework != null) {
             this.authFramework.removeAll(this.authFramework.getStack());
         }
@@ -1637,8 +1640,8 @@ public void applyConfig(Configuration config, boolean reindex) {
             config.refreshDateForLastIndexRun();
         }
 
-        authFramework.setPluginDirectory(config.getPluginDirectory());
-        authFramework.reload();
+        getAuthorizationFramework().setPluginDirectory(config.getPluginDirectory());
+        getAuthorizationFramework().reload();
     }
 
     /**
@@ -1805,7 +1808,7 @@ public FileVisitResult postVisitDirectory(Path d, IOException exc) throws IOExce
                         }
                         if (reload) {
                             Thread.sleep(THREAD_SLEEP_TIME); // experimental wait if file is being written right now
-                            authFramework.reload();
+                            getAuthorizationFramework().reload();
                         }
                         if (!key.reset()) {
                             break;

src/org/opensolaris/opengrok/web/WebappListener.java

@@ -37,6 +37,7 @@
 import javax.servlet.ServletRequestEvent;
 import javax.servlet.ServletRequestListener;
 import org.json.simple.parser.ParseException;
+import org.opensolaris.opengrok.authorization.AuthorizationFramework;
 import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
 import org.opensolaris.opengrok.logger.LoggerFactory;
 
@@ -74,6 +75,13 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) {
             }
         }
 
+        /**
+         * Create a new instance of authorization framework. If the code above
+         * (reading the configuration) failed then the plugin directory is
+         * possibly {@code null} causing the framework to allow every request.
+         */
+        env.setAuthorizationFramework(new AuthorizationFramework(env.getPluginDirectory()));
+
         String address = context.getInitParameter("ConfigAddress");
         if (address != null && address.length() > 0) {
             LOGGER.log(Level.CONFIG, "Will listen for configuration on [{0}]", address);