Merge branch 'master' into feature/install-cloud-mode

wttech · May 17, 2022 · bdbb5c8 · bdbb5c8
2 parents cb92831 + db02474
commit bdbb5c8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 69 deletions.
diff --git a/app/aem/core/build.gradle.kts b/app/aem/core/build.gradle.kts
@@ -32,7 +32,6 @@ aem {
                                 "com.cognifide.apm.core.services",
                                 "com.cognifide.apm.core.history"
                         ).joinToString(","))
-                attribute("Bundle-Activator", "com.cognifide.apm.core.activator.Activator")
                 attribute("Sling-Nodetypes", "CQ-INF/nodetypes/apm_nodetypes.cnd")
                 attribute("APM-Actions", "com.cognifide.apm.foundation.actions")
                 excludePackage("org.antlr.stringtemplate", "org.antlr.v4.gui")

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/activator/Activator.java b/app/aem/core/src/main/java/com/cognifide/apm/core/activator/Activator.java
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/StartupScriptLauncher.java b/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/StartupScriptLauncher.java
@@ -35,6 +35,7 @@
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.settings.SlingSettingsService;
+import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
@@ -63,19 +64,16 @@ public class StartupScriptLauncher extends AbstractLauncher {
   @Reference
   private ResourceResolverProvider resolverProvider;
 
-  public void process() {
-    SlingHelper.operateTraced(resolverProvider, this::process);
+  @Activate
+  public void activate() {
+    SlingHelper.operateTraced(resolverProvider, this::executeScripts);
   }
 
-  private void process(ResourceResolver resolver) throws PersistenceException {
+  private void executeScripts(ResourceResolver resolver) throws PersistenceException {
     LaunchEnvironment environment = LaunchEnvironment.of(slingSettings);
-    executeScripts(environment, resolver);
-  }
-
-  private void executeScripts(LaunchEnvironment currentEnvironment, ResourceResolver resolver) throws PersistenceException {
     List<Script> scripts = new ArrayList<>();
-    scripts.addAll(scriptFinder.findAll(onStartup(currentEnvironment, slingSettings), resolver));
-    scripts.addAll(modifiedScriptFinder.findAll(onStartupIfModified(currentEnvironment, slingSettings), resolver));
+    scripts.addAll(scriptFinder.findAll(onStartup(environment, slingSettings), resolver));
+    scripts.addAll(modifiedScriptFinder.findAll(onStartupIfModified(environment, slingSettings), resolver));
     processScripts(scripts, resolver);
   }
 

diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/crypto/DecryptionService.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/crypto/DecryptionService.kt
@@ -54,7 +54,7 @@ class DecryptionService {
         return try {
             cryptoSupport.unprotect(text)
         } catch (e: CryptoException) {
-            text
+            throw IllegalArgumentException(String.format("Unable to decrypt '%s', wrong hmac or master key", text), e)
         }
     }