Issue2 (#3)

martinspielmann · web-flow · commit 6869e86e9645 · 2018-03-17T22:20:01.000+01:00
* #2 fix Thread.sleep() issue and add tests
diff --git a/src/main/java/de/martinspielmann/wicket/pwnedpasswordsvalidator/PwnedPasswordsValidator.java b/src/main/java/de/martinspielmann/wicket/pwnedpasswordsvalidator/PwnedPasswordsValidator.java
@@ -26,7 +26,9 @@
  */
 public class PwnedPasswordsValidator implements IValidator<String> {
 
-    private static final Logger LOG = LoggerFactory.getLogger(PwnedPasswordsValidator.class);
+	private static final long serialVersionUID = 1L;
+
+	private static final Logger LOG = LoggerFactory.getLogger(PwnedPasswordsValidator.class);
 
     private static final String API_URL = "https://api.pwnedpasswords.com/pwnedpassword/%s";
 
@@ -109,6 +111,7 @@ protected void handleToManyRequests(IValidatable<String> validatable) {
                     Thread.sleep(2000);
                 } catch (InterruptedException e) {
                     LOG.error("Error waiting to request pwned passwords", e);
+                    Thread.currentThread().interrupt();
                 }
                 validate(validatable);
                 break;
diff --git a/src/test/java/de/martinspielmann/wicket/pwnedpasswordsvalidator/PwnedPasswordsValidatorTest.java b/src/test/java/de/martinspielmann/wicket/pwnedpasswordsvalidator/PwnedPasswordsValidatorTest.java
@@ -1,6 +1,5 @@
 package de.martinspielmann.wicket.pwnedpasswordsvalidator;
 
-import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.util.tester.FormTester;
 import org.apache.wicket.util.tester.WicketTester;
 import org.apache.wicket.validation.Validatable;
@@ -10,6 +9,7 @@
 import java.net.*;
 import java.security.NoSuchAlgorithmException;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class PwnedPasswordsValidatorTest {
 
@@ -96,7 +96,51 @@ protected Status getResponseStatus(String pw) {
         v.validate(validatable);
         Assert.assertEquals(0, validatable.getErrors().size());
     }
-
+    
+    @Test
+    public void validatePwTooManyRequestsIgnore() {
+        PwnedPasswordsValidator v = new PwnedPasswordsValidator(true, RateLimitExceededBehavior.IGNORE) {
+            @Override
+            protected Status getResponseStatus(String pw) {
+                return Status.TOO_MANY_REQUESTS;
+            }
+        };
+        Validatable<String> validatable = new Validatable<>();
+        v.validate(validatable);
+        Assert.assertEquals(0, validatable.getErrors().size());
+    }
+    
+    @Test
+    public void validatePwTooManyRequestsFail() {
+        PwnedPasswordsValidator v = new PwnedPasswordsValidator(true, RateLimitExceededBehavior.FAIL) {
+            @Override
+            protected Status getResponseStatus(String pw) {
+                return Status.TOO_MANY_REQUESTS;
+            }
+        };
+        Validatable<String> validatable = new Validatable<>();
+        v.validate(validatable);
+        Assert.assertEquals(1, validatable.getErrors().size());
+    }
+    
+    @Test
+    public void validatePwTooManyRequestsRetry() {
+    	final AtomicInteger i = new AtomicInteger(0);
+    	PwnedPasswordsValidator v = new PwnedPasswordsValidator(true, RateLimitExceededBehavior.RETRY) {
+            @Override
+            protected Status getResponseStatus(String pw) {
+            	if(i.getAndIncrement() == 0) {
+            		return Status.TOO_MANY_REQUESTS;
+            	}else {
+            		return Status.PASSWORD_OK;
+            	}
+            }
+        };
+        Validatable<String> validatable = new Validatable<>();
+        v.validate(validatable);
+        Assert.assertEquals(0, validatable.getErrors().size());
+        Assert.assertEquals(2, i.get());
+    }
 
     @Test
     public void getResponseStatusPwned() throws InterruptedException {
