sonar fix

wttech · Sep 22, 2016 · f55fbb6 · f55fbb6
1 parent 7932fcc
commit f55fbb6
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 96 deletions.
diff --git a/src/main/aem/jcr_root/apps/cognifide/secureaem/components/slingJsHandler/dialog.xml b/src/main/aem/jcr_root/apps/cognifide/secureaem/components/slingJsHandler/dialog.xml
diff --git a/src/main/aem/jcr_root/apps/cognifide/secureaem/components/slingJspScriptHandler/dialog.xml b/src/main/aem/jcr_root/apps/cognifide/secureaem/components/slingJspScriptHandler/dialog.xml
diff --git a/src/main/aem/jcr_root/etc/secureaem/crx-development-bundles/.content.xml b/src/main/aem/jcr_root/etc/secureaem/crx-development-bundles/.content.xml
@@ -13,7 +13,6 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="cognifide/secureaem/components/crxDevelopmentBundles"
             enabled="true"
-            users="[admin:admin]"
             bundles="[Adobe CRXDE Support,Adobe Granite CRX Explorer,Adobe Granite CRXDE Lite]"/>
     </jcr:content>
 </jcr:root>
diff --git a/src/main/aem/jcr_root/etc/secureaem/replication-transport-users/.content.xml b/src/main/aem/jcr_root/etc/secureaem/replication-transport-users/.content.xml
@@ -12,7 +12,6 @@
         <testComponent
             jcr:primaryType="nt:unstructured"
             sling:resourceType="cognifide/secureaem/components/replicationTransportUsers"
-            enabled="true"
-            users="[admin:admin]"/>
+            enabled="true"/>
     </jcr:content>
 </jcr:root>
diff --git a/src/main/aem/jcr_root/etc/secureaem/sling-development-bundle/.content.xml b/src/main/aem/jcr_root/etc/secureaem/sling-development-bundle/.content.xml
@@ -13,7 +13,6 @@
             jcr:primaryType="nt:unstructured"
             sling:resourceType="cognifide/secureaem/components/slingDevelopmentBundle"
             enabled="true"
-            users="[admin:admin]"
             bundles="[Apache Sling Tooling]"/>
     </jcr:content>
 </jcr:root>
diff --git a/src/main/aem/jcr_root/etc/secureaem/sling-js-handler/.content.xml b/src/main/aem/jcr_root/etc/secureaem/sling-js-handler/.content.xml
@@ -12,8 +12,6 @@
         <testComponent
             jcr:primaryType="nt:unstructured"
             sling:resourceType="cognifide/secureaem/components/slingJsHandler"
-            enabled="true"
-            authorUser="admin:admin"
-            publishUser="admin:admin"/>
+            enabled="true"/>
     </jcr:content>
 </jcr:root>
diff --git a/src/main/aem/jcr_root/etc/secureaem/sling-jsp-script-handler/.content.xml b/src/main/aem/jcr_root/etc/secureaem/sling-jsp-script-handler/.content.xml
@@ -11,9 +11,7 @@
         urlDesc="Official AEM Security Checklist">
         <testComponent
             jcr:primaryType="nt:unstructured"
-            sling:resourceType="cognifide/secureaem/components/slingJsHandler"
-            enabled="true"
-            authorUser="admin:admin"
-            publishUser="admin:admin"/>
+            sling:resourceType="cognifide/secureaem/components/slingJspScriptHandler"
+            enabled="true"/>
     </jcr:content>
 </jcr:root>
diff --git a/src/main/aem/jcr_root/etc/secureaem/sling-referrer-filter/.content.xml b/src/main/aem/jcr_root/etc/secureaem/sling-referrer-filter/.content.xml
@@ -12,7 +12,6 @@
         <testComponent
             jcr:primaryType="nt:unstructured"
             sling:resourceType="cognifide/secureaem/components/slingReferrerFilter"
-            enabled="true"
-            users="[admin:admin]"/>
+            enabled="true"/>
     </jcr:content>
 </jcr:root>
diff --git a/src/main/java/com/cognifide/secureaem/cli/Main.java b/src/main/java/com/cognifide/secureaem/cli/Main.java
@@ -8,8 +8,8 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.BufferedReader;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -58,7 +58,9 @@ private static List<TestLoader> createTestLoaders(CommandLine cmdLine) throws IO
 	private static BufferedReader getBufferedReader(CommandLine cmdLine) throws FileNotFoundException {
 		BufferedReader reader;
 		if (cmdLine.hasOption("suite")) {
-			reader = new BufferedReader(new FileReader(cmdLine.getOptionValue("suite")));
+			reader = new BufferedReader(
+					new InputStreamReader(new FileInputStream(cmdLine.getOptionValue("suite")),
+							StandardCharsets.UTF_8));
 		} else {
 			InputStream is = Main.class.getClass().getResourceAsStream(DEFAULT_TEST_SUITE_PATH);
 			reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));

diff --git a/src/main/java/com/cognifide/secureaem/tests/SlingJspScriptHandlerTest.java b/src/main/java/com/cognifide/secureaem/tests/SlingJspScriptHandlerTest.java
@@ -2,7 +2,6 @@
 
 import com.cognifide.secureaem.AbstractTest;
 import com.cognifide.secureaem.Configuration;
-import com.cognifide.secureaem.UserHelper;
 import com.cognifide.secureaem.markers.AuthorTest;
 import com.cognifide.secureaem.markers.PublishTest;
 
@@ -14,11 +13,8 @@ public SlingJspScriptHandlerTest(Configuration config) {
 	}
 
 	@Override public boolean doTest(String url, String instanceName) throws Exception {
-		String[] user = AuthorTest.ENVIRONMENT_NAME.equals(instanceName) ?
-				UserHelper.splitUser(config.getStringValue("authorUser", "admin:admin")) :
-				UserHelper.splitUser(config.getStringValue("publishUser", "admin:admin"));
 		String configurationEndpoint = url
-				+ "/system/console/configMgr/com.adobe.granite.ui.clientlibs.impl.HtmlLibraryManagerImpl.json";
+				+ "/system/console/configMgr/org.apache.sling.scripting.jsp.JspScriptEngineFactory.json";
 		String body = getJsonBodyOfOsgiConfiguration(configurationEndpoint, getUsernamePasswordCredentials(instanceName), instanceName);
 		checkBooleanValue(getBooleanValueFromJson("jasper.classdebuginfo", body), false,
 				"Generate Debug Info", instanceName);