Merge branch 'release/2.1.1'

Netcentric · Jul 26, 2018 · aade8f8 · aade8f8
2 parents 1568ceb + 117ccf0
commit aade8f8
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 15 deletions.
diff --git a/accesscontroltool-bundle/pom.xml b/accesscontroltool-bundle/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
         <artifactId>accesscontroltool</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
 
     <!-- ====================================================================== -->

diff --git a/...tcentric/cq/tools/actool/authorizableinstaller/impl/AuthorizableInstallerServiceImpl.java b/...tcentric/cq/tools/actool/authorizableinstaller/impl/AuthorizableInstallerServiceImpl.java
@@ -152,18 +152,30 @@ private void installAuthorizableConfigurationBean(final Session session,
     }
 
     void setUserPassword(final AuthorizableConfigBean authorizableConfigBean,
-                             final User authorizableToInstall) throws RepositoryException, CryptoException {
-        String password = authorizableConfigBean.getPassword();
-        if (password.matches("\\{.+}")) {
-            if (cryptoSupport == null) {
-                throw new CryptoException("CryptoSupport missing to unprotect password.");
-            }
-            password = cryptoSupport.unprotect(password);
-        }
+                             final User authorizableToInstall) throws RepositoryException, AuthorizableCreatorException {
+        String password = getPassword(authorizableConfigBean);
         authorizableToInstall.changePassword(password);
     }
 
 
+	private String getPassword(final AuthorizableConfigBean authorizableConfigBean)
+			throws AuthorizableCreatorException {
+		try {
+			String password = authorizableConfigBean.getPassword();
+			if (password.matches("\\{.+}")) {
+				if (cryptoSupport == null) {
+					throw new CryptoException("CryptoSupport missing to unprotect password.");
+				}
+				password = cryptoSupport.unprotect(password);
+			}
+			return password;
+		} catch (CryptoException e) {
+			throw new AuthorizableCreatorException(
+					"Could not decrypt password for user " + authorizableConfigBean.getAuthorizableId() + ": " + e);
+		}
+	}
+
+
     /** This is only relevant for members that point to groups/users not contained in configuration.
      * {@link biz.netcentric.cq.tools.actool.configreader.YamlConfigurationMerger#ensureIsMemberOfIsUsedWherePossible()} ensures that
      * regular relationships between groups contained in config are kept in isMemberOf */
@@ -709,7 +721,7 @@ private Authorizable createNewUser(
             throws AuthorizableExistsException, RepositoryException,
             AuthorizableCreatorException {
         String authorizableId = principalConfigBean.getAuthorizableId();
-        String password = principalConfigBean.getPassword();
+        String password = getPassword(principalConfigBean);
         boolean isSystemUser = principalConfigBean.isSystemUser();
         String intermediatePath = principalConfigBean.getPath();
 

diff --git a/...tric/cq/tools/actool/authorizableinstaller/impl/AuthorizableInstallerServiceImplTest.java b/...tric/cq/tools/actool/authorizableinstaller/impl/AuthorizableInstallerServiceImplTest.java
@@ -55,6 +55,7 @@
 import com.adobe.granite.crypto.CryptoException;
 import com.adobe.granite.crypto.CryptoSupport;
 
+import biz.netcentric.cq.tools.actool.authorizableinstaller.AuthorizableCreatorException;
 import biz.netcentric.cq.tools.actool.configmodel.AcConfiguration;
 import biz.netcentric.cq.tools.actool.configmodel.AuthorizableConfigBean;
 import biz.netcentric.cq.tools.actool.configmodel.GlobalConfiguration;
@@ -340,7 +341,7 @@ public void setUp() throws CryptoException {
         }
 
         @Test
-        public void test() throws RepositoryException, CryptoException {
+        public void test() throws RepositoryException, AuthorizableCreatorException {
             final AuthorizableConfigBean bean = new AuthorizableConfigBean();
             bean.setPassword(password);
 

diff --git a/accesscontroltool-exampleconfig-package/pom.xml b/accesscontroltool-exampleconfig-package/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
         <artifactId>accesscontroltool</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
 
     <!-- ====================================================================== -->

diff --git a/accesscontroltool-oakindex-package/pom.xml b/accesscontroltool-oakindex-package/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
         <artifactId>accesscontroltool</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
 
     <!-- ====================================================================== -->

diff --git a/accesscontroltool-package/pom.xml b/accesscontroltool-package/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
         <artifactId>accesscontroltool</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
 
     <!-- ====================================================================== -->

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
     <artifactId>accesscontroltool</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <packaging>pom</packaging>
 
     <name>Access Control Tool - Reactor Project</name>