Merge branch 'master' of https://github.com/secdec/attack-surface-detector-cli

Author: tylercamp

src/com/denimgroup/threadfix/cli/endpoints/EndpointMain.java

@@ -80,6 +80,8 @@ enum Logging {
     static int totalDetectedParameters = 0;
     static int totalDistinctParameters = 0;
 
+    static int numProjectsWithDuplicates = 0;
+
     static String testUrlPath = null;
     static Credentials testCredentials = null;
 
@@ -244,18 +246,15 @@ public static void main(String[] args) {
                     } catch (IOException e) {
                         throw new RuntimeException(e);
                     }
-                } else {
-                    int i = 0;
-//                    for (Endpoint endpoint : allEndpoints) {
-//                        //println(endpoint.getCSVLine(printFormat));
-//                        i += printEndpointWithVariants(i, 0, endpoint);
-//                    }
                 }
             }
 
 
 
             println("-- DONE --");
+
+            println(numProjectsWithDuplicates + " projects had duplicate endpoints");
+
             println("Generated " + totalDistinctEndpoints + " distinct endpoints");
             println("Generated " + totalDetectedEndpoints + " total endpoints");
             println("Generated " + totalDistinctParameters + " distinct parameters");
@@ -487,6 +486,10 @@ private static List<Endpoint> listEndpoints(File rootFile, Collection<FrameworkT
             println("Failed to validate serialization for at least one of these endpoints");
         }
 
+        if (!EndpointValidation.validateDuplicates(endpoints)) {
+        	numProjectsWithDuplicates++;
+        }
+
         //  Run endpoint testing against a given server
         if (testUrlPath != null) {
             EndpointTester tester = new EndpointTester(testUrlPath);

src/com/denimgroup/threadfix/cli/endpoints/EndpointTester.java

@@ -86,7 +86,7 @@ public int authorize(Credentials credentials, Endpoint endpoint) throws IOExcept
             e.printStackTrace();
         }
 
-        return -1;
+        return 0xffff;
     }
 
     private boolean saveCredentialsResponse(HttpURLConnection conn, Credentials creds) {

src/com/denimgroup/threadfix/cli/endpoints/EndpointValidation.java

@@ -24,14 +24,6 @@ public class EndpointValidation {
     public static boolean validateSerialization(File sourceCodeFolder, List<Endpoint> endpoints) {
         List<Endpoint> allEndpoints = EndpointUtil.flattenWithVariants(endpoints);
 
-        List<List<Endpoint>> duplicateEndpoints = detectDuplicates(endpoints);
-        if (!duplicateEndpoints.isEmpty()) {
-            logger.warn("Found " + duplicateEndpoints.size() + " duplicated endpoints:");
-            for (List<Endpoint> duplicateSet : duplicateEndpoints) {
-                logger.warn("- " + duplicateSet.size() + ": " + duplicateSet.get(0).toString());
-            }
-        }
-
         try {
             String serializedCollection = EndpointSerialization.serializeAll(allEndpoints);
             Endpoint[] deserializedCollection = EndpointSerialization.deserializeAll(serializedCollection);
@@ -168,6 +160,19 @@ else if (!endpoint.getFilePath().contains("(lib)")) {
         return true;
     }
 
+    public static boolean validateDuplicates(Collection<Endpoint> endpoints) {
+    	boolean validated = true;
+	    List<List<Endpoint>> duplicateEndpoints = detectDuplicates(endpoints);
+	    if (!duplicateEndpoints.isEmpty()) {
+		    logger.warn("Found " + duplicateEndpoints.size() + " duplicated endpoints:");
+		    for (List<Endpoint> duplicateSet : duplicateEndpoints) {
+			    logger.warn("- " + duplicateSet.size() + ": " + duplicateSet.get(0).toString());
+			    validated = false;
+		    }
+	    }
+	    return validated;
+    }
+
     private static List<List<Endpoint>> detectDuplicates(Collection<Endpoint> endpoints) {
         List<List<Endpoint>> duplicates = new ArrayList<>();