Merge pull request #14 from FreeClimbAPI/VCSWP-14050-fix

Handle any Exception thrown within verifyRequest

Author: kohearn-vail

CHANGELOG.md

@@ -7,6 +7,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## [Unreleased]
 None
 
+<a name="4.0.1"></a>
+## [4.0.1] - 2021-05-03
+### Fixed
+- Fix exception handling within verifyRequest
+
 <a name="4.0.0"></a>
 ## [4.0.0] - 2021-05-03
 ### Added

build.gradle

@@ -9,7 +9,7 @@ group = 'com.github.FreeClimbAPI'
 
 sourceCompatibility = 1.7 // java 7
 targetCompatibility = 1.7
-version = '4.0.0'
+version = '4.0.1'
 
 repositories {
 	mavenCentral()

src/main/java/com/vailsys/freeclimb/Utils.java

@@ -14,19 +14,19 @@
 import org.apache.commons.codec.binary.Hex;
 
 public class Utils {
-	/**
-	 * Verify a request's signature
-	 *
-	 * @param requestBody         The request's body
-	 * @param signatureHeader     The request's `freeclimb-signature` header
-     * @param signingSecret       A signing secret from the FreeClimb account
-     * @param tolerance           Acceptable duration threshold represented in 
+    /**
+     * Verify a request's signature
+     *
+     * @param requestBody        The request's body
+     * @param signatureHeader   The request's `freeclimb-signature` header
+     * @param signingSecret     A signing secret from the FreeClimb account
+     * @param tolerance            Acceptable duration threshold represented in 
      *                            milliseconds, defaulting to 5 minutes when not
      *                            provided
      * @throws FreeClimbException upon failed verification
-	 */
-	public static void verifyRequest(String requestBody, String signatureHeader, String signingSecret, int tolerance) throws FreeClimbException {
-		String[] values = signatureHeader.split(",");
+     */
+    public static void verifyRequest(String requestBody, String signatureHeader, String signingSecret, int tolerance) throws FreeClimbException {
+        String[] values = signatureHeader.split(",");
 
         long time = 0;
         List<String> v1 = new ArrayList<String>();
@@ -45,7 +45,7 @@ public static void verifyRequest(String requestBody, String signatureHeader, Str
                 if (key.equals("v1")) {
                     v1.add(value);
                 }
-            } catch (UnsupportedEncodingException e) {
+            } catch (Exception e) {
                 throw new FreeClimbException(e);
             }
         }
@@ -68,17 +68,17 @@ public static void verifyRequest(String requestBody, String signatureHeader, Str
         } catch (Exception e) {
             throw new FreeClimbException("Failed to calculate hmac using ", e);
         }
-	}
+    }
 
     /**
-	 * Verify a request's signature
-	 *
-	 * @param requestBody         The request's body
-	 * @param signatureHeader     The request's `freeclimb-signature` header
+     * Verify a request's signature
+     *
+     * @param requestBody         The request's body
+     * @param signatureHeader     The request's `freeclimb-signature` header
      * @param signingSecret       A signing secret from the FreeClimb account
      * @throws FreeClimbException upon failed verification
-	 */
+     */
     public static void verifyRequest(String requestBody, String signatureHeader, String signingSecret) throws FreeClimbException {
-		Utils.verifyRequest(requestBody, signatureHeader, signingSecret, 5*60*1000);
-	}
+        Utils.verifyRequest(requestBody, signatureHeader, signingSecret, 5*60*1000);
+    }
 }