Extend CredentialProvider so that it can dynamically generate credent…

…ials based on NetworkService

PiperOrigin-RevId: 433544503
Change-Id: I51274fb9ab8b7cb5e48b4a06fa5a308dfa97ec36

google/detectors/credentials/ncrack/src/main/java/com/google/tsunami/plugins/detectors/credentials/ncrack/composer/WeakCredentialComposer.java

@@ -65,7 +65,7 @@ public ImmutableList<TestCredential> run(NetworkService networkService) {
     }
 
     Iterator<List<TestCredential>> credentialPartitions =
-        Iterators.partition(provider.generateTestCredentials(), this.batchSize);
+        Iterators.partition(provider.generateTestCredentials(networkService), this.batchSize);
 
     return Streams.stream(credentialPartitions)
         .map(batchCredentials -> tester.testValidCredentials(networkService, batchCredentials))

google/detectors/credentials/ncrack/src/main/java/com/google/tsunami/plugins/detectors/credentials/ncrack/provider/CredentialProvider.java

@@ -15,6 +15,7 @@
  */
 package com.google.tsunami.plugins.detectors.credentials.ncrack.provider;
 
+import com.google.tsunami.proto.NetworkService;
 import java.util.Iterator;
 
 /**
@@ -30,5 +31,5 @@ public abstract class CredentialProvider {
 
   public abstract String description();
 
-  public abstract Iterator<TestCredential> generateTestCredentials();
+  public abstract Iterator<TestCredential> generateTestCredentials(NetworkService networkService);
 }

google/detectors/credentials/ncrack/src/main/java/com/google/tsunami/plugins/detectors/credentials/ncrack/provider/Top100Passwords.java

@@ -20,6 +20,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import com.google.tsunami.proto.NetworkService;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
@@ -185,7 +186,7 @@ public String description() {
   }
 
   @Override
-  public Iterator<TestCredential> generateTestCredentials() {
+  public Iterator<TestCredential> generateTestCredentials(NetworkService unused) {
     return credentials.iterator();
   }
 }

google/detectors/credentials/ncrack/src/test/java/com/google/tsunami/plugins/detectors/credentials/ncrack/NcrackWeakCredentialDetectorTest.java

@@ -84,7 +84,8 @@ public void setupPlugin() {
 
     // thenReturn method will always return the same instance of iterator, which will be exhausted
     // by previous testers, hence we are using thenAnswer method.
-    when(provider.generateTestCredentials()).thenAnswer(invocation -> TEST_CREDENTIALS.iterator());
+    when(provider.generateTestCredentials(any()))
+        .thenAnswer(invocation -> TEST_CREDENTIALS.iterator());
     when(tester1.canAccept(any())).thenReturn(true);
     when(tester2.canAccept(any())).thenReturn(true);
     when(tester3.canAccept(any())).thenReturn(true);

google/detectors/credentials/ncrack/src/test/java/com/google/tsunami/plugins/detectors/credentials/ncrack/composer/WeakCredentialsComposerTest.java

@@ -54,7 +54,7 @@ public final class WeakCredentialsComposerTest {
   public void setupComposer() {
     provider = mock(CredentialProvider.class);
     tester = mock(CredentialTester.class);
-    when(provider.generateTestCredentials()).thenReturn(TEST_CREDENTIALS.iterator());
+    when(provider.generateTestCredentials(any())).thenReturn(TEST_CREDENTIALS.iterator());
     when(tester.testValidCredentials(any(), any()))
         .thenReturn(ImmutableList.of(TestCredential.create("username1", Optional.of("password1"))))
         .thenReturn(ImmutableList.of());
@@ -73,7 +73,7 @@ public void setupComposer() {
             .build());
 
     verify(tester, never()).testValidCredentials(any(), any());
-    verify(provider, never()).generateTestCredentials();
+    verify(provider, never()).generateTestCredentials(NetworkService.getDefaultInstance());
   }
 
   @Test

google/detectors/credentials/ncrack/src/test/java/com/google/tsunami/plugins/detectors/credentials/ncrack/provider/Top100PasswordsTest.java

@@ -18,6 +18,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.collect.ImmutableList;
+import com.google.tsunami.proto.NetworkService;
 import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
@@ -57,7 +58,7 @@ public void getDescription_always_doNotReturnEmptyOrNull() {
   @Test
   public void genereateTestCredentials_withinExpectedValues_returnsExpectedCredentials() {
     ImmutableList<TestCredential> generatedCredentials =
-        ImmutableList.copyOf(provider.generateTestCredentials());
+        ImmutableList.copyOf(provider.generateTestCredentials(NetworkService.getDefaultInstance()));
 
     assertThat(generatedCredentials)
         .containsExactly(