From 0e2e2c3dd0fbf80d62a274c0c955ec50bd5509b5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 26 Jan 2020 09:11:12 +0100 Subject: [PATCH] Make Argeo data model extensions and keyring optional. --- .../org/argeo/cms/e4/jcr/JcrBrowserView.java | 2 + .../e4/jcr/handlers/AddRemoteRepository.java | 2 + org.argeo.cms/bnd.bnd | 5 +- .../org/argeo/cms/tabular/JcrTabularTest.java | 5 +- org.argeo.cms/src/org/argeo/cms/argeo.cnd | 34 ++++++++++ org.argeo.cms/src/org/argeo/cms/cms.cnd | 34 ---------- org.argeo.cms/src/org/argeo/cms/dn.cnd | 10 +++ .../cms/internal/auth/CmsSessionImpl.java | 1 - .../cms/internal/kernel/CmsDeployment.java | 66 +++++++++++++------ .../src/org/argeo/node/node.cnd | 12 ---- 10 files changed, 102 insertions(+), 69 deletions(-) create mode 100644 org.argeo.cms/src/org/argeo/cms/argeo.cnd create mode 100644 org.argeo.cms/src/org/argeo/cms/dn.cnd diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java index 7639df459..f18f7fc87 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java @@ -46,6 +46,7 @@ import org.argeo.eclipse.ui.jcr.utils.NodeViewerComparer; import org.argeo.node.security.CryptoKeyring; import org.argeo.node.security.Keyring; import org.eclipse.e4.core.contexts.IEclipseContext; +import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.services.EMenuService; import org.eclipse.e4.ui.workbench.modeling.EPartService; import org.eclipse.e4.ui.workbench.modeling.ESelectionService; @@ -78,6 +79,7 @@ public class JcrBrowserView { /* DEPENDENCY INJECTION */ @Inject + @Optional private Keyring keyring; @Inject private RepositoryFactory repositoryFactory; diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java index e51c104ef..12dee13b9 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java @@ -36,6 +36,7 @@ import org.argeo.node.NodeConstants; import org.argeo.node.NodeUtils; import org.argeo.node.security.Keyring; import org.eclipse.e4.core.di.annotations.Execute; +import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.model.application.ui.basic.MPart; import org.eclipse.e4.ui.services.IServiceConstants; import org.eclipse.jface.dialogs.Dialog; @@ -67,6 +68,7 @@ public class AddRemoteRepository implements ArgeoNames { @Inject private Repository nodeRepository; @Inject + @Optional private Keyring keyring; @Execute diff --git a/org.argeo.cms/bnd.bnd b/org.argeo.cms/bnd.bnd index 50041e682..f32e1fafc 100644 --- a/org.argeo.cms/bnd.bnd +++ b/org.argeo.cms/bnd.bnd @@ -9,4 +9,7 @@ org.apache.commons.httpclient.cookie;resolution:=optional,\ !com.sun.security.jgss,\ org.osgi.*;version=0.0.0,\ * -Provide-Capability: cms.datamodel;name=cms;cnd=/org/argeo/cms/cms.cnd;abstract=true \ No newline at end of file + +Provide-Capability: cms.datamodel;name=argeo;cnd=/org/argeo/cms/argeo.cnd;abstract=true,\ +cms.datamodel;name=cms;cnd=/org/argeo/cms/cms.cnd;abstract=true,\ +cms.datamodel;name=dn;cnd=/org/argeo/cms/dn.cnd;abstract=true \ No newline at end of file diff --git a/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java b/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java index c1ca4c4b8..9201a14fc 100644 --- a/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java +++ b/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java @@ -40,9 +40,12 @@ public class JcrTabularTest extends AbstractJackrabbitTestCase { InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream("/org/argeo/node/node.cnd")); CndImporter.registerNodeTypes(reader, session()); reader.close(); - reader = new InputStreamReader(getClass().getResourceAsStream("/org/argeo/cms/cms.cnd")); + reader = new InputStreamReader(getClass().getResourceAsStream("/org/argeo/cms/argeo.cnd")); CndImporter.registerNodeTypes(reader, session()); reader.close(); +// reader = new InputStreamReader(getClass().getResourceAsStream("/org/argeo/cms/cms.cnd")); +// CndImporter.registerNodeTypes(reader, session()); +// reader.close(); // write Integer columnCount = 15; diff --git a/org.argeo.cms/src/org/argeo/cms/argeo.cnd b/org.argeo.cms/src/org/argeo/cms/argeo.cnd new file mode 100644 index 000000000..c9e6ee7e2 --- /dev/null +++ b/org.argeo.cms/src/org/argeo/cms/argeo.cnd @@ -0,0 +1,34 @@ + + +// GENERIC TYPES +[argeo:remoteRepository] > nt:unstructured +- argeo:uri (STRING) +- argeo:userID (STRING) ++ argeo:password (argeo:encrypted) + +// TABULAR CONTENT +[argeo:table] > nt:file ++ * (argeo:column) * + +[argeo:column] > mix:title +- jcr:requiredType (STRING) = 'STRING' + +[argeo:csv] > nt:resource + +// CRYPTO +[argeo:encrypted] +mixin +// initialization vector used by some algorithms +- argeo:iv (BINARY) + +[argeo:pbeKeySpec] +mixin +- argeo:secretKeyFactory (STRING) +- argeo:salt (BINARY) +- argeo:iterationCount (LONG) +- argeo:keyLength (LONG) +- argeo:secretKeyEncryption (STRING) + +[argeo:pbeSpec] > argeo:pbeKeySpec +mixin +- argeo:cipher (STRING) diff --git a/org.argeo.cms/src/org/argeo/cms/cms.cnd b/org.argeo.cms/src/org/argeo/cms/cms.cnd index 955a4a3ac..0e420f516 100644 --- a/org.argeo.cms/src/org/argeo/cms/cms.cnd +++ b/org.argeo.cms/src/org/argeo/cms/cms.cnd @@ -1,39 +1,5 @@ - -// GENERIC TYPES -[argeo:remoteRepository] > nt:unstructured -- argeo:uri (STRING) -- argeo:userID (STRING) -+ argeo:password (argeo:encrypted) - -// TABULAR CONTENT -[argeo:table] > nt:file -+ * (argeo:column) * - -[argeo:column] > mix:title -- jcr:requiredType (STRING) = 'STRING' - -[argeo:csv] > nt:resource - -// CRYPTO -[argeo:encrypted] > nt:base -mixin -// initialization vector used by some algorithms -- argeo:iv (BINARY) - -[argeo:pbeKeySpec] > nt:base -mixin -- argeo:secretKeyFactory (STRING) -- argeo:salt (BINARY) -- argeo:iterationCount (LONG) -- argeo:keyLength (LONG) -- argeo:secretKeyEncryption (STRING) - -[argeo:pbeSpec] > argeo:pbeKeySpec -mixin -- argeo:cipher (STRING) - // TEXT [cms:styled] mixin diff --git a/org.argeo.cms/src/org/argeo/cms/dn.cnd b/org.argeo.cms/src/org/argeo/cms/dn.cnd new file mode 100644 index 000000000..80849be95 --- /dev/null +++ b/org.argeo.cms/src/org/argeo/cms/dn.cnd @@ -0,0 +1,10 @@ +// DN (see https://tools.ietf.org/html/rfc4514) + + + + + + + + + diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java index 82a6972cb..010000f61 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java @@ -17,7 +17,6 @@ import java.util.UUID; import javax.crypto.SecretKey; import javax.jcr.Repository; -import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java index 20418ec4d..59d8c910f 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java @@ -8,6 +8,7 @@ import java.io.Reader; import java.lang.management.ManagementFactory; import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.Hashtable; import java.util.List; @@ -15,6 +16,7 @@ import java.util.Map; import java.util.Set; import javax.jcr.Repository; +import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.security.auth.callback.CallbackHandler; import javax.transaction.UserTransaction; @@ -24,6 +26,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.commons.cnd.CndImporter; import org.apache.jackrabbit.core.RepositoryContext; import org.apache.jackrabbit.core.RepositoryImpl; +import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.jcr.JcrUtils; import org.argeo.node.DataModelNamespace; @@ -68,6 +71,8 @@ public class CmsDeployment implements NodeDeployment { private NodeHttp nodeHttp; + private boolean argeoDataModelExtensionsAvailable = false; + // Readiness private boolean nodeAvailable = false; private boolean userAdminAvailable = false; @@ -255,10 +260,22 @@ public class CmsDeployment implements NodeDeployment { } // home - prepareDataModel(NodeConstants.NODE, KernelUtils.openAdminSession(deployedNodeRepository)); + prepareDataModel(NodeConstants.NODE, deployedNodeRepository); } private void prepareHomeRepository(RepositoryImpl deployedRepository) { + Session adminSession = KernelUtils.openAdminSession(deployedRepository); + try { + argeoDataModelExtensionsAvailable = Arrays + .asList(adminSession.getWorkspace().getNamespaceRegistry().getURIs()) + .contains(ArgeoNames.ARGEO_NAMESPACE); + } catch (RepositoryException e) { + log.warn("Cannot check whether Argeo namespace is registered assuming it isn't.", e); + argeoDataModelExtensionsAvailable = false; + } finally { + JcrUtils.logoutQuietly(adminSession); + } + Hashtable regProps = new Hashtable(); regProps.put(NodeConstants.CN, NodeConstants.HOME); // regProps.put(LEGACY_JCR_REPOSITORY_ALIAS, NodeConstants.HOME); @@ -266,23 +283,27 @@ public class CmsDeployment implements NodeDeployment { // register bc.registerService(Repository.class, homeRepository, regProps); - new ServiceTracker(bc, CallbackHandler.class, null) { - - @Override - public CallbackHandler addingService(ServiceReference reference) { - NodeKeyRing nodeKeyring = new NodeKeyRing(homeRepository); - CallbackHandler callbackHandler = bc.getService(reference); - nodeKeyring.setDefaultCallbackHandler(callbackHandler); - bc.registerService(LangUtils.names(Keyring.class, CryptoKeyring.class, ManagedService.class), - nodeKeyring, LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_KEYRING_PID)); - return callbackHandler; - } + // Keyring only if Argeo extensions are available + if (argeoDataModelExtensionsAvailable) { + new ServiceTracker(bc, CallbackHandler.class, null) { + + @Override + public CallbackHandler addingService(ServiceReference reference) { + NodeKeyRing nodeKeyring = new NodeKeyRing(homeRepository); + CallbackHandler callbackHandler = bc.getService(reference); + nodeKeyring.setDefaultCallbackHandler(callbackHandler); + bc.registerService(LangUtils.names(Keyring.class, CryptoKeyring.class, ManagedService.class), + nodeKeyring, LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_KEYRING_PID)); + return callbackHandler; + } - }.open(); + }.open(); + } } /** Session is logged out. */ - private void prepareDataModel(String cn, Session adminSession) { + private void prepareDataModel(String cn, Repository repository) { + Session adminSession = KernelUtils.openAdminSession(repository); try { Set processed = new HashSet(); bundles: for (Bundle bundle : bc.getBundles()) { @@ -290,13 +311,13 @@ public class CmsDeployment implements NodeDeployment { if (wiring == null) continue bundles; if (NodeConstants.NODE.equals(cn))// process all data models - processWiring(cn, adminSession, wiring, processed); + processWiring(cn, adminSession, wiring, processed, false); else { List capabilities = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE); for (BundleCapability capability : capabilities) { String dataModelName = (String) capability.getAttributes().get(DataModelNamespace.NAME); if (dataModelName.equals(cn))// process only own data model - processWiring(cn, adminSession, wiring, processed); + processWiring(cn, adminSession, wiring, processed, false); } } } @@ -305,16 +326,21 @@ public class CmsDeployment implements NodeDeployment { } } - private void processWiring(String cn, Session adminSession, BundleWiring wiring, Set processed) { + private void processWiring(String cn, Session adminSession, BundleWiring wiring, Set processed, + boolean importListedAbstractModels) { // recursively process requirements first List requiredWires = wiring.getRequiredWires(CMS_DATA_MODEL_NAMESPACE); for (BundleWire wire : requiredWires) { - processWiring(cn, adminSession, wire.getProviderWiring(), processed); + processWiring(cn, adminSession, wire.getProviderWiring(), processed, true); } List publishAsLocalRepo = new ArrayList<>(); List capabilities = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE); - for (BundleCapability capability : capabilities) { + capabilities: for (BundleCapability capability : capabilities) { + if (!importListedAbstractModels + && KernelUtils.asBoolean((String) capability.getAttributes().get(DataModelNamespace.ABSTRACT))) { + continue capabilities; + } boolean publish = registerDataModelCapability(cn, adminSession, capability, processed); if (publish) publishAsLocalRepo.add((String) capability.getAttributes().get(DataModelNamespace.NAME)); @@ -409,7 +435,7 @@ public class CmsDeployment implements NodeDeployment { nodeAvailable = true; checkReadiness(); } else { - prepareDataModel(cn, KernelUtils.openAdminSession(repoContext.getRepository())); + prepareDataModel(cn, repoContext.getRepository()); } } return repoContext; diff --git a/org.argeo.node.api/src/org/argeo/node/node.cnd b/org.argeo.node.api/src/org/argeo/node/node.cnd index f3d0619ef..1a6dec5ef 100644 --- a/org.argeo.node.api/src/org/argeo/node/node.cnd +++ b/org.argeo.node.api/src/org/argeo/node/node.cnd @@ -1,18 +1,6 @@ -// DN (see https://tools.ietf.org/html/rfc4514) - - - - - - - - - - - [node:userHome] mixin - ldap:uid (STRING) m -- 2.30.2