From bcb7292db5b8c6572ef9b9438bd1d3bdf490767a Mon Sep 17 00:00:00 2001
From: Raul <raul@doyensec.com>
Date: Thu, 5 Sep 2024 15:50:41 +0200
Subject: [PATCH] Finished AJP plugin

---
 .../generic_weak_credential_detector/build.gradle  |  1 +
 .../tomcat/TomcatAjpCredentialTesterTest.java      | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/google/detectors/credentials/generic_weak_credential_detector/build.gradle b/google/detectors/credentials/generic_weak_credential_detector/build.gradle
index eebf5f892..7c2fa07d5 100644
--- a/google/detectors/credentials/generic_weak_credential_detector/build.gradle
+++ b/google/detectors/credentials/generic_weak_credential_detector/build.gradle
@@ -56,6 +56,7 @@ ext {
     ajpVersion = '1.0.0'
     okhttpVersion = '3.12.0'
     protobufVersion = '3.25.2'
+    ajp13Version = '1.0.0'
     tsunamiVersion = 'latest.release'
 
     junitVersion = '4.13'
diff --git a/google/detectors/credentials/generic_weak_credential_detector/src/test/java/com/google/tsunami/plugins/detectors/credentials/genericweakcredentialdetector/testers/tomcat/TomcatAjpCredentialTesterTest.java b/google/detectors/credentials/generic_weak_credential_detector/src/test/java/com/google/tsunami/plugins/detectors/credentials/genericweakcredentialdetector/testers/tomcat/TomcatAjpCredentialTesterTest.java
index 0ff6d2d88..c220d3ecf 100644
--- a/google/detectors/credentials/generic_weak_credential_detector/src/test/java/com/google/tsunami/plugins/detectors/credentials/genericweakcredentialdetector/testers/tomcat/TomcatAjpCredentialTesterTest.java
+++ b/google/detectors/credentials/generic_weak_credential_detector/src/test/java/com/google/tsunami/plugins/detectors/credentials/genericweakcredentialdetector/testers/tomcat/TomcatAjpCredentialTesterTest.java
@@ -37,7 +37,10 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+<<<<<<< HEAD
 import java.util.concurrent.ThreadLocalRandom;
+=======
+>>>>>>> 2014afe1 (Finished AJP plugin)
 import javax.inject.Inject;
 import org.junit.Before;
 import org.junit.Test;
@@ -157,14 +160,21 @@ private static byte[] createAjpUnauthorizedResponse() {
   private static class AjpTestServer {
     private ServerSocket serverSocket;
     private boolean running = false;
+<<<<<<< HEAD
     private int port;
+=======
+    private final int port = 8009;
+>>>>>>> 2014afe1 (Finished AJP plugin)
     private final String host = "localhost";
     private final Map<String, byte[]> credentialResponses = new HashMap<>();
 
     public void start() throws IOException {
+<<<<<<< HEAD
 
       this.port = ThreadLocalRandom.current().nextInt(8000, 10001);
 
+=======
+>>>>>>> 2014afe1 (Finished AJP plugin)
       serverSocket = new ServerSocket(port);
       running = true;
 
@@ -192,6 +202,10 @@ public void start() throws IOException {
                     os.flush();
 
                   } catch (IOException e) {
+<<<<<<< HEAD
+=======
+                    System.err.println("An error occurred in AjpTestServer.");
+>>>>>>> 2014afe1 (Finished AJP plugin)
                     e.printStackTrace();
                   }
                 }