Added validation url to exception

Author: malaqueueit

QueueIT.Security/src/queueit/security/KnownUserException.java

@@ -5,15 +5,24 @@
 public abstract class KnownUserException extends SecurityException
 {
     private URI originalUrl;
+    private URI validationUrl;
 
     public URI getOriginalUrl() {
         return this.originalUrl;
     }
-    
+
+    public URI getValidationUrl() {
+        return this.validationUrl;
+    }
+
     void setOriginalUrl(URI originalUrl) {
         this.originalUrl = originalUrl;
     }   
 
+    void setValidationUrl(URI validationUrl) {
+        this.validationUrl = validationUrl;
+    }   
+
     public KnownUserException(String message, Throwable cause)
     {
          super(message, cause);

QueueIT.Security/src/queueit/security/KnownUserFactory.java

@@ -115,10 +115,10 @@ public static IKnownUser verifyMd5Hash(String secretKey, IKnownUserUrlProvider u
             querystringPrefix = "";
         }
 
+        URI url = urlProvider.getUrl();
         URI originalUrl = urlProvider.getOriginalUrl(querystringPrefix);
 
         try {
-            URI url = urlProvider.getUrl();
             UUID queueId = parseQueueId(urlProvider.getQueueId(querystringPrefix));
             String placeInQueueObfuscated = urlProvider.getPlaceInQueue(querystringPrefix);
             Integer placeInQueue = null; 
@@ -150,11 +150,9 @@ public static IKnownUser verifyMd5Hash(String secretKey, IKnownUserUrlProvider u
             validateHash(url, secretKey, expectedHash);
 
             return new Md5KnownUser(queueId, placeInQueue, timeStamp, customerId, eventId, redirectType, originalUrl);
-        } catch (InvalidKnownUserHashException ex) {
-            ex.setOriginalUrl(originalUrl);
-            throw ex;
-        } catch (InvalidKnownUserUrlException ex) {
+        } catch (KnownUserException ex) {
             ex.setOriginalUrl(originalUrl);
+            ex.setValidationUrl(url);
             throw ex;
         }
     }

QueueIT.Security/test/queueit/security/KnownUserFactoryTest.java

@@ -185,6 +185,54 @@ public void KnownUserFactory_VerifyMd5HashTest_InvalidHash_Test() {
         VerifyMd5Hash_Test("becb0723-fee7-4a82-87d0-622475c7cf36", 1349168841, 7810, "88401038-0306-4831-b7c0-e115da0bdc46", "d4e47d0b1a732c5dbf3e10d92881ed93", "mpro");
     }
 
+    @Test()
+    public void KnownUserFactory_VerifyMd5HashTest_KnownUserException_Test() {
+        //Arrange
+        Date expectedTimeStamp = null;
+        String querystringPrefix = "mpro";
+        int unixTimestamp = 1349168841;
+        String expectedQueueId = "becb0723-fee7-4a82-87d0-622475c7cf36";
+        String placeInQueueEncrypted = "88401038-0306-4831-b7c0-e115da0bdc46";
+        String hash = "d4e47d0b1a732c5dbf3e10d92881ed93";
+
+        try {
+            if (unixTimestamp > 0) {
+                expectedTimeStamp = Calendar.getInstance().getTime();
+                expectedTimeStamp.setTime(unixTimestamp * 1000);
+            }
+        } catch (Exception e) {
+            //Ignore
+        }
+        RedirectType expectedRedirectType = RedirectType.Queue;
+        String expectedCustomerId = "somecust";
+        String expectedEventId = "someevent";
+        String expectedOriginalUrl = "http://www.ticketanina.com/shop.aspx?x=sdfsdf";
+        String urlWithHash = expectedOriginalUrl
+                + "&" + querystringPrefix + "q=" + expectedQueueId
+                + "&" + querystringPrefix + "p=" + placeInQueueEncrypted
+                + "&" + querystringPrefix + "ts=" + unixTimestamp
+                + "&" + querystringPrefix + "c=" + expectedCustomerId
+                + "&" + querystringPrefix + "e=" + expectedEventId
+                + "&" + querystringPrefix + "h=" + hash;
+
+        MockUrlProvider urlProvider = null; 
+        try {
+            urlProvider = new MockUrlProvider(new URI(urlWithHash), expectedQueueId, placeInQueueEncrypted, String.valueOf(unixTimestamp), expectedEventId, expectedCustomerId, new URI(expectedOriginalUrl), expectedRedirectType.toString());
+        } catch (Exception ex) {
+            //ignore
+        }
+                    
+        //Act
+        try
+        {
+            IKnownUser knownUser = KnownUserFactory.verifyMd5Hash(SharedSecreteEventKey, urlProvider, querystringPrefix);
+        } catch (KnownUserException ex) {
+            //Assert
+            assertEquals(expectedOriginalUrl, ex.getOriginalUrl().toString());
+            assertEquals(urlWithHash, ex.getValidationUrl().toString());
+        }     
+    }
+        
     @Test(expected = InvalidKnownUserUrlException.class)
     public void KnownUserFactory_VerifyMd5HashTest_NoParameters_Test() {
         // "d4e47d0b1a732c5dbf3e10d92881ed92" is valid hash