Refactor of configurable execution in SecureContext

Author: simonholzapfel

repository/src/main/java/org/orderofthebee/addons/support/tools/repo/jsconsole/ExecuteWebscript.java

@@ -119,7 +119,7 @@ public void setDumpService(final DumpService dumpService)
 
     private String postRollScriptClasspath;
 
-    private boolean secureContext;
+    private boolean allowUnrestrictedScripts;
 
     /**
      *
@@ -161,7 +161,7 @@ public void execute(final WebScriptRequest request, final WebScriptResponse resp
             // Note: Need to use import here so the user-supplied script may also import scripts
             final String script = "<import resource=\"classpath:" + this.preRollScriptClasspath + "\">\n" + jsreq.script;
 
-            final ScriptContent scriptContent = new StringScriptContent(script + this.postRollScript, this.secureContext);
+            final ScriptContent scriptContent = new StringScriptContent(script + this.postRollScript, this.allowUnrestrictedScripts);
 
             final int providedScriptLength = this.countScriptLines(jsreq.script, false);
             final int resolvedScriptLength = this.countScriptLines(script, true);
@@ -613,9 +613,9 @@ public final void setPostRollScriptClasspath(final String postRollScriptClasspat
         this.postRollScriptClasspath = postRollScriptClasspath;
     }
 
-    public void setSecureContext(boolean secureContext) 
+    public final void setAllowUnrestrictedScripts(boolean allowUnrestrictedScripts)
     {
-      this.secureContext = secureContext;
+      this.allowUnrestrictedScripts = allowUnrestrictedScripts;
     }
 
     private static class StringScriptContent implements ScriptContent
@@ -625,7 +625,7 @@ private static class StringScriptContent implements ScriptContent
 
         private final boolean secure;
 
-        public StringScriptContent(final String content, boolean secure)
+        public StringScriptContent(final String content, final boolean secure)
         {
             this.content = content;
             this.secure = secure;

repository/src/main/resources/alfresco/module/ootbee-support-tools-repo/alfresco-global.properties

@@ -10,7 +10,7 @@ ootbee-support-tools.propertyBackedBeanPersister.processLegacyJmxKeysOnRemovePro
 ootbee-support-tools.js-console.serverInfo.nodeCountsViaSOLR=true
 
 # true if the scripts in the context are considered secure and may access java.* libs directly otherwise false
-ootbee-support-tools.js-console.scriptContext.secure=true
+ootbee-support-tools.js-console.allowUnrestrictedScripts=true
 
 # it would be unexpected if there ever were so many property backed beans that this limit would not suffice
 cache.propertyBackedBeansPersisterSharedCache.tx.maxItems=1000

repository/src/main/resources/alfresco/module/ootbee-support-tools-repo/module-context.xml

@@ -105,7 +105,7 @@
         </property>
         <property name="preRollScriptClasspath" value="alfresco/module/ootbee-${project.artifactId}/scripts/jsconsole-pre-roll-script.js" />
         <property name="postRollScriptClasspath" value="alfresco/module/ootbee-${project.artifactId}/scripts/jsconsole-post-roll-script.js" />
-        <property name="secureContext" value="${ootbee-support-tools.js-console.scriptContext.secure}"/>
+        <property name="allowUnrestrictedScripts" value="${ootbee-support-tools.js-console.allowUnrestrictedScripts}"/>
     </bean>
 
     <bean id="webscript.org.orderofthebee.support-tools.jsconsole.executionResult.get" class="org.orderofthebee.addons.support.tools.repo.jsconsole.ExecutionResultGet" parent="webscript">