Changeset 5506

Timestamp:

07/31/14 12:36:37 (10 years ago)

Author:

Twan Goosen

Message:

Moved loading of "admin database" into a separate service that can also be used outside the context of the wicket web app
Refs #589

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry

Files:

• AdminUsersService.java (added)
• AdminUsersServiceImpl.java (added)
• gui/Application.java (modified) (5 diffs)
• gui/pages/BasePage.java (modified) (3 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/Application.java

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui;
 
+import eu.clarin.cmdi.virtualcollectionregistry.AdminUsersService;
 import eu.clarin.cmdi.virtualcollectionregistry.DataStore;
 import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistry;
@@ -10 +11 @@
 import eu.clarin.cmdi.virtualcollectionregistry.gui.pages.LoginPage;
 import eu.clarin.cmdi.virtualcollectionregistry.gui.pages.VirtualCollectionDetailsPage;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.HashSet;
-import java.util.Set;
 import org.apache.wicket.Page;
 import org.apache.wicket.authentication.AuthenticatedWebApplication;
@@ -39 +34 @@
     @Autowired
     private DataStore dataStore;
-
-    private static final String CONFIG_PARAM_ADMINDB = "eu.clarin.cmdi.virtualcollectionregistry.admindb";
-    private final Set<String> adminUsers = new HashSet<>();
+    @Autowired
+    private AdminUsersService adminUsersService;
 
     @Override
     protected void init() {
         super.init();
+        logger.info("Initialising VCR web application");
         addComponentInstantiationListener(new SpringComponentInjector(this));
 
-        String s = getServletContext().getInitParameter(CONFIG_PARAM_ADMINDB);
-        if (s != null) {
-            try {
-                loadAdminDatabase(s);
-            } catch (IOException e) {
-                throw new RuntimeException("Could not load admin user database", e);
-            }
-        }
-        if (adminUsers.isEmpty()) {
-            logger.warn("No admin users have been defined");
-        } else {
-            logger.debug("Admin users: {}", adminUsers);
-        }
         getMarkupSettings().setDefaultMarkupEncoding("utf-8");
         getRequestCycleSettings().setResponseRequestEncoding("utf-8");
@@ -67 +49 @@
                 new LeastRecentlyAccessedEvictionStrategy(3));
         if (!DEPLOYMENT.equals(getConfigurationType())) {
+            logger.warn("Web application configured for development");
             getMarkupSettings().setStripWicketTags(true);
             getMarkupSettings().setStripComments(true);
@@ -116 +99 @@
         return false;
     }
-
-    public boolean isAdmin(String user) {
-        return adminUsers.contains(user);
+    
+    boolean isAdmin(String user) {
+        return adminUsersService.isAdmin(user);
     }
-
-    private void loadAdminDatabase(String filename) throws IOException {
-        adminUsers.clear();
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(
-                new FileInputStream(filename)))) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                line = line.trim();
-                if (line.isEmpty() || line.startsWith("#")) {
-                    continue;
-                }
-                adminUsers.add(line);
-            } // while
-        }
-    }
-
+    
     public VirtualCollectionRegistry getRegistry() {
         return registry;

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.java

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui.pages;
 
-import eu.clarin.cmdi.virtualcollectionregistry.gui.Application;
+import eu.clarin.cmdi.virtualcollectionregistry.AdminUsersService;
 import eu.clarin.cmdi.virtualcollectionregistry.gui.ApplicationSession;
 import java.security.Principal;
@@ -11 +11 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.spring.injection.annot.SpringBean;
 
 public class BasePage extends WebPage {
+    
+    @SpringBean
+    private AdminUsersService adminUsersService;
 
     protected BasePage(IModel<?> model) {
@@ -86 +90 @@
     protected boolean isUserAdmin() {
         final String userName = getUser().getName();
-        return userName != null && ((Application)getApplication()).isAdmin(userName);
+        return userName != null && adminUsersService.isAdmin(userName);
     }