wttech#31:Preserved compatibility with AEM 6.1-6.4

bartoszWesolowski · Mar 6, 2019 · 0da7a2c · 0da7a2c
1 parent 377f2a1
commit 0da7a2c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -213,7 +213,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.osgi</artifactId>
-            <version>2.4.0</version>
+            <version>2.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -278,7 +278,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.servlets.post</artifactId>
-            <version>2.3.24</version>
+            <version>2.3.6</version>
             <scope>provided</scope>
         </dependency><!-- https://mvnrepository.com/artifact/com.adobe.granite/com.adobe.granite.crypto -->
         <dependency>

diff --git a/src/main/java/com/cognifide/secureaem/sling/SecureAemGlobalConfiguration.java b/src/main/java/com/cognifide/secureaem/sling/SecureAemGlobalConfiguration.java
@@ -3,6 +3,7 @@
 import com.adobe.granite.crypto.CryptoException;
 import com.adobe.granite.crypto.CryptoSupport;
 import com.cognifide.secureaem.GlobalConfiguration;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -95,7 +96,7 @@ public String getAuthorLogin() {
 
 	@Override
 	public String getAuthorPassword() {
-		return authorPassowrd;
+		return getPassword(authorPassowrd);
 	}
 
 	@Override
@@ -110,7 +111,19 @@ public String getPublishLogin() {
 
 	@Override
 	public String getPublishPassword() {
-		return publishPassword;
+		return getPassword(publishPassword);
 	}
 
+
+	private String getPassword(String passwordToDecrypt) {
+		String password = StringUtils.defaultString(passwordToDecrypt);
+		if (cryptoSupport.isProtected(password)) {
+			try {
+				password = cryptoSupport.unprotect(password);
+			} catch (CryptoException e) {
+				LOGGER.error("Failed to decrypt password", e);
+			}
+		}
+		return password;
+	}
 }