Improve packaging (esp. security)

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.jackrabbit / src / main / java / org / argeo / server / jackrabbit / JackrabbitContainer.java

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
index 0c72e8d45343afc6da2672e79a3ada3fc2fd3c9c..87738a5cdc5dbb2b589652b502f6988136561488 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
@@ -16,8 +16,15 @@
 
 package org.argeo.server.jackrabbit;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 
 import javax.jcr.Credentials;
 import javax.jcr.LoginException;
@@ -25,30 +32,60 @@ import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.Value;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.jackrabbit.commons.NamespaceHelper;
+import org.apache.jackrabbit.commons.cnd.CndImporter;
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.TransientRepository;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
+import org.apache.jackrabbit.core.config.RepositoryConfigurationParser;
+import org.argeo.ArgeoException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.xml.sax.InputSource;
 
+/**
+ * Wrapper around a Jackrabbit repository which allows to configure it in Spring
+ * and expose it as a {@link Repository}.
+ */
 public class JackrabbitContainer implements InitializingBean, DisposableBean,
-               Repository {
+               Repository, ResourceLoaderAware {
        private Log log = LogFactory.getLog(JackrabbitContainer.class);
 
        private Resource configuration;
        private File homeDirectory;
+       private Resource variables;
 
        private Boolean inMemory = false;
 
        private Repository repository;
 
+       private ResourceLoader resourceLoader;
+
+       /** Node type definitions in CND format */
+       private List<byte[]> cnds = new ArrayList<byte[]>();
+       private List<String> cndFiles = new ArrayList<String>();
+
+       /** Namespaces to register: key is prefix, value namespace */
+       private Map<String, String> namespaces = new HashMap<String, String>();
+
        public void afterPropertiesSet() throws Exception {
+               // Load cnds as resources
+               for (String resUrl : cndFiles) {
+
+                       Resource res = resourceLoader.getResource(resUrl);
+                       byte[] arr = IOUtils.toByteArray(res.getInputStream());
+                       cnds.add(arr);
+               }
+
                if (inMemory && homeDirectory.exists()) {
                        FileUtils.deleteDirectory(homeDirectory);
                        log.warn("Deleted Jackrabbit home directory " + homeDirectory);
@@ -56,13 +93,23 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 
                RepositoryConfig config;
                InputStream in = configuration.getInputStream();
+               InputStream propsIn = null;
                try {
-                       config = RepositoryConfig.create(in, homeDirectory
-                                       .getCanonicalPath());
+                       Properties vars = new Properties();
+                       if (variables != null) {
+                               propsIn = variables.getInputStream();
+                               vars.load(propsIn);
+                       }
+                       // override with system properties
+                       vars.putAll(System.getProperties());
+                       vars.put(RepositoryConfigurationParser.REPOSITORY_HOME_VARIABLE,
+                                       homeDirectory.getCanonicalPath());
+                       config = RepositoryConfig.create(new InputSource(in), vars);
                } catch (Exception e) {
                        throw new RuntimeException("Cannot read configuration", e);
                } finally {
                        IOUtils.closeQuietly(in);
+                       IOUtils.closeQuietly(propsIn);
                }
 
                if (inMemory)
@@ -103,23 +150,64 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
        }
 
        public Session login() throws LoginException, RepositoryException {
-               return repository.login();
+               Session session = repository.login();
+               processNewSession(session);
+               return session;
        }
 
        public Session login(Credentials credentials, String workspaceName)
                        throws LoginException, NoSuchWorkspaceException,
                        RepositoryException {
-               return repository.login(credentials, workspaceName);
+               Session session = repository.login(credentials, workspaceName);
+               processNewSession(session);
+               return session;
        }
 
        public Session login(Credentials credentials) throws LoginException,
                        RepositoryException {
-               return repository.login(credentials);
+               Session session = repository.login(credentials);
+               processNewSession(session);
+               return session;
        }
 
        public Session login(String workspaceName) throws LoginException,
                        NoSuchWorkspaceException, RepositoryException {
-               return repository.login(workspaceName);
+               Session session = repository.login(workspaceName);
+               processNewSession(session);
+               return session;
+       }
+
+       protected synchronized void processNewSession(Session session) {
+               try {
+                       NamespaceHelper namespaceHelper = new NamespaceHelper(session);
+                       namespaceHelper.registerNamespaces(namespaces);
+
+                       for (byte[] arr : cnds)
+                               CndImporter.registerNodeTypes(new InputStreamReader(
+                                               new ByteArrayInputStream(arr)), session, true);
+               } catch (Exception e) {
+                       throw new ArgeoException("Cannot process new session", e);
+               }
+       }
+
+       public void setResourceLoader(ResourceLoader resourceLoader) {
+               this.resourceLoader = resourceLoader;
+       }
+
+       public boolean isStandardDescriptor(String key) {
+               return repository.isStandardDescriptor(key);
+       }
+
+       public boolean isSingleValueDescriptor(String key) {
+               return repository.isSingleValueDescriptor(key);
+       }
+
+       public Value getDescriptorValue(String key) {
+               return repository.getDescriptorValue(key);
+       }
+
+       public Value[] getDescriptorValues(String key) {
+               return repository.getDescriptorValues(key);
        }
 
        // BEANS METHODS
@@ -135,4 +223,16 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
                this.inMemory = inMemory;
        }
 
+       public void setNamespaces(Map<String, String> namespaces) {
+               this.namespaces = namespaces;
+       }
+
+       public void setCndFiles(List<String> cndFiles) {
+               this.cndFiles = cndFiles;
+       }
+
+       public void setVariables(Resource variables) {
+               this.variables = variables;
+       }
+
 }