From 6473e38bacc1620ee1cb7c8d4a4a6b33fcfcce80 Mon Sep 17 00:00:00 2001
From: admin <admin>
Date: Thu, 24 May 2018 10:31:59 +0200
Subject: [PATCH] Update the ssl feature

 - the target host and port are now configurable through the config.xml file
 - add some instructions for the installation of sslyze
 - add feature to allow configuration of the maxDepth for zap
 - Add '-' to the regex to match inpu of this type : <input class="form-control" id="password" name="password" type="password">
---
 config.xml                                       | 14 +++++++++++---
 src/test/java/net/continuumsecurity/Config.java  | 16 ++++++++++++++++
 .../steps/AppScanningSteps.java                  |  3 ++-
 .../net/continuumsecurity/steps/SSLyzeSteps.java |  8 ++++++--
 .../steps/WebApplicationSteps.java               |  2 +-
 src/test/resources/features/ssl.feature          |  2 +-
 6 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/config.xml b/config.xml
index 67015c4e..3bce582b 100644
--- a/config.xml
+++ b/config.xml
@@ -15,9 +15,16 @@
     <!-- A Java class to hold the Selenium steps to test the application in depth. Optionally required for in-depth authn/z and session management testing. -->
     <class>net.continuumsecurity.examples.ropeytasks.RopeyTasksApplication</class>
 
+    <!-- In order to install sslyze on a Linux system, these steps must be followed
+	apt-get update
+	apt-get install python-pip
+	pip install sslyze
+    -->
     <sslyze>
-        <path>/opt/sslyze/sslyze_cli.py</path>
-        <option>--regular</option>
+        <path>sslyze</path>
+	<option>--regular</option>
+        <targetHost>www.continuumsecurity.net</targetHost>
+        <targetPort>443</targetPort>
     </sslyze>
 
     <!-- Optional names of the session ID cookies for session management testing. -->
@@ -31,7 +38,8 @@
 
     <scanner>
         <ignoreUrl>.*logout.*</ignoreUrl>
-        <spiderUrl>baseUrl</spiderUrl>
+	<spiderUrl>baseUrl</spiderUrl>
+	<maxDepth>5</maxDepth>
     </scanner>
 
     <!-- An upstream proxy through which all HTTP traffic must pass before hitting the target
diff --git a/src/test/java/net/continuumsecurity/Config.java b/src/test/java/net/continuumsecurity/Config.java
index 78dc9a10..21b53d6f 100644
--- a/src/test/java/net/continuumsecurity/Config.java
+++ b/src/test/java/net/continuumsecurity/Config.java
@@ -92,6 +92,12 @@ public List<String> getSpiderUrls() {
         return spiderUrls;
     }
 
+    public int getMaxDepth() {
+        String portAsString = validateAndGetString("scanner.maxDepth");
+        if (portAsString != null && portAsString.length() > 0) return Integer.parseInt(portAsString);
+        return 10;
+    }
+
     public String getClassName() {
         return validateAndGetString("class");
     }
@@ -211,6 +217,16 @@ public int getUpstreamProxyPort() {
         return 80;
     }
 
+    public String getSslHost(){
+        return validateAndGetString("sslyze.targetHost");
+    }
+
+    public int getSslPort(){
+        String portAsString =  validateAndGetString("sslyze.targetPort");
+        if (portAsString != null && portAsString.length() > 0) return Integer.parseInt(portAsString);
+        return 443;
+    }
+
     public List<String> getSessionIDs() {
         List<String> ids = new ArrayList<String>();
         for (Object o : getXml().getList("sessionIds.name")) {
diff --git a/src/test/java/net/continuumsecurity/steps/AppScanningSteps.java b/src/test/java/net/continuumsecurity/steps/AppScanningSteps.java
index 8212d200..214a4247 100755
--- a/src/test/java/net/continuumsecurity/steps/AppScanningSteps.java
+++ b/src/test/java/net/continuumsecurity/steps/AppScanningSteps.java
@@ -365,7 +365,8 @@ public void theApplicationIsSpidered() {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            getSpider().setMaxDepth(10);
+	    int maxDepth = Config.getInstance().getMaxDepth();
+            getSpider().setMaxDepth(maxDepth);
             getSpider().setThreadCount(10);
             for (String url : Config.getInstance().getSpiderUrls()) {
                 if (url.equalsIgnoreCase("baseurl")) url = Config.getInstance().getBaseUrl();
diff --git a/src/test/java/net/continuumsecurity/steps/SSLyzeSteps.java b/src/test/java/net/continuumsecurity/steps/SSLyzeSteps.java
index 36d0d7aa..d15ef55e 100755
--- a/src/test/java/net/continuumsecurity/steps/SSLyzeSteps.java
+++ b/src/test/java/net/continuumsecurity/steps/SSLyzeSteps.java
@@ -17,10 +17,14 @@
  */
 public class SSLyzeSteps {
     final static String OUTFILENAME = "sslyze.output";
+    static String host=null;
+    static int port=443;
 
-    @When("^the SSLyze command is run against the host (.*) on port (\\d+)$")
-    public void runSSLTestsOnSecureBaseUrl(String host, int port) throws IOException {
+    @When("the SSLyze command is run against the application")
+    public void runSSLTestsOnSecureBaseUrl() throws IOException {
         if (!World.getInstance().isSslRunCompleted()) {
+            port = Config.getInstance().getSslPort();
+            host= Config.getInstance().getSslHost();
             JSSLyze jSSLLyze = new JSSLyze(Config.getInstance().getSSLyzePath(), OUTFILENAME);
             jSSLLyze.execute(Config.getInstance().getSSLyzeOption(),host,port);
             World.getInstance().setjSSLyze(jSSLLyze);
diff --git a/src/test/java/net/continuumsecurity/steps/WebApplicationSteps.java b/src/test/java/net/continuumsecurity/steps/WebApplicationSteps.java
index 6d1e9505..1683c1b2 100644
--- a/src/test/java/net/continuumsecurity/steps/WebApplicationSteps.java
+++ b/src/test/java/net/continuumsecurity/steps/WebApplicationSteps.java
@@ -245,7 +245,7 @@ public void verifyProtocolHttps() {
 
     @Given("the HTTP request-response containing the login form")
     public void findResponseWithLoginform() throws UnsupportedEncodingException {
-        String regex = "(?i)input[\\s\\w=:'\"]*type\\s*=\\s*['\"]password['\"]";
+        String regex = "(?i)input[\\s\\w=:'-\"]*type\\s*=\\s*['\"]password['\"]";
         List<HarEntry> responses = getProxy().getHistory();
         responses = getProxy().findInResponseHistory(regex);
         if (responses == null || responses.size() == 0)
diff --git a/src/test/resources/features/ssl.feature b/src/test/resources/features/ssl.feature
index ba3efc12..ba4ea213 100644
--- a/src/test/resources/features/ssl.feature
+++ b/src/test/resources/features/ssl.feature
@@ -3,7 +3,7 @@ Feature: SSL
   Ensure that the SSL configuration of the service is robust
 
   Background: Run the SSLyze command only once for all features
-    When the SSLyze command is run against the host www.continuumsecurity.net on port 443
+    When the SSLyze command is run against the application
 
   @iriusrisk-ssl_crime
   Scenario: Disable SSL deflate compression in order to mitigate the risk of the CRIME attack