Fix #39 - key files with line break at end

Vonage · Feb 20, 2017 · ee926c3 · ee926c3
1 parent d19bd92
commit ee926c3
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 9 deletions.
diff --git a/src/main/java/com/nexmo/client/auth/JWTAuthMethod.java b/src/main/java/com/nexmo/client/auth/JWTAuthMethod.java
@@ -44,7 +44,9 @@
 import java.util.regex.Pattern;
 
 public class JWTAuthMethod extends AbstractAuthMethod {
-    private static final Pattern pemPattern = Pattern.compile("-----BEGIN PRIVATE KEY-----\\n(.*\\n)-----END PRIVATE KEY-----", Pattern.MULTILINE | Pattern.DOTALL);
+    private static final Pattern pemPattern = Pattern.compile("-----BEGIN PRIVATE KEY-----" +
+            "(.*\\n)" +
+            "-----END PRIVATE KEY-----\\n?", Pattern.MULTILINE | Pattern.DOTALL);
     public final int SORT_KEY = 10;
     private String applicationId;
     private JWTSigner signer;
@@ -114,4 +116,4 @@ protected String constructToken(long iat, String jti) {
     public int getSortKey() {
         return this.SORT_KEY;
     }
-}
+}
diff --git a/src/test/java/com/nexmo/client/auth/JWTAuthMethodTest.java b/src/test/java/com/nexmo/client/auth/JWTAuthMethodTest.java
@@ -23,13 +23,11 @@
 
 
 import com.auth0.jwt.JWTVerifier;
-import com.auth0.jwt.JWTVerifyException;
 import com.nexmo.client.TestUtils;
 import org.apache.http.client.methods.RequestBuilder;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.security.*;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
@@ -43,17 +41,20 @@ public class JWTAuthMethodTest {
     private JWTAuthMethod auth;
 
     @Before
-    public void setUp() throws NoSuchAlgorithmException, InvalidKeySpecException, InvalidKeyException, IOException {
+    public void setUp() throws Exception {
         this.testUtils = new TestUtils();
 
         byte[] keyBytes = testUtils.loadKey("test/keys/application_key");
         auth = new JWTAuthMethod("application-id", keyBytes);
     }
 
+    @Test public void testSavedKey() throws Exception {
+        byte[] keyBytes = testUtils.loadKey("test/keys/application_key2");
+        auth = new JWTAuthMethod("application-id", keyBytes);
+    }
+
     @Test
-    public void testConstructToken()
-            throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException, IOException,
-            SignatureException, JWTVerifyException {
+    public void testConstructToken() throws Exception {
         String constructedToken = auth.constructToken(1234, "1111111");
 
         byte[] keyBytes = testUtils.loadKey("test/keys/application_public_key.der");
@@ -97,4 +98,4 @@ public void testApply() throws Exception {
         assertEquals(1, req.getHeaders("Authorization").length);
         assertEquals("Bearer ", req.getFirstHeader("Authorization").getValue().substring(0, 7));
     }
-}
+}
diff --git a/src/test/resources/com/nexmo/client/test/keys/application_key2 b/src/test/resources/com/nexmo/client/test/keys/application_key2
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDqSe/genQY2KUz
+xc1iqj2pgeH1k2SKHpIK8L8JLwfEEskhG92Ch9euivu30roKHTVMI4lXRrOL0OyM
+uX0EZQGSuDvB8cZpOL+044oV3XInx/LwkEgHIsB7anv6rJ/fyxHTGvlc1c3DmQhl
+J5ToFtu2DL8dY/nmYvdpeo74+0iOyTODiGCNrB8Kqc7zrx/KQM732BBrLeRs6TwY
++7lQYIebFQN5C9JvGWAlStw9IJO+dlJojMru9bz//B+rWe350m5WiVSFHnSP5K6o
+t1SBuraoJRsdORwVb9dp0gU3UDkGApYgmBFTt0MJoCZWNA3QNkJ8clpjh8JJtIcF
+dWFL2mvxAgMBAAECggEAZZd9/rbalNOMfzCsaLYtWs1JL/WjyQiMh1XxYIgWM/15
+XXP5z1ocOkFl+UXVCgG0VLmsGj48KMqFaFgeT8OEtRxSPT0brhC/gC6Sd/y4PWvE
+em/167I0CNAZxo8IHECwD/xIWOsU+FXpgANz3FfdGcnZLWNmv3H2mrRcPrantdHQ
+oMiS2wCF+6Zyo0TTVdddHjvQAutznMEoQLdTvl3MtGY5WWchDzFAmwqDv/+ne9H7
+aerpq3tv1Ng0uOfzw39UuUTqrYXrqYDGYtK2D5yoEzN6ktK2uYIV0MIf9Eh5FRp9
+YoYYI7t/3SHXwidViOE8wXVhZ0DUbyIbYv97elebyQKBgQD7KrXFmMBYcxVJsEx0
+QQFRUu9iRkqMrfsINc/O79y81oD8ewc2snizyubdrRv0CCz3wFVlCBRwCURiczpC
+il+EsrbIhdVyQZVRGCUNDDwMP7T/r7mBFqVyQfSgIFGKkexkCUnxW7pxZjkpBiWA
+HnAvKrzTor5AEE/Wn3t7VRWAjwKBgQDuzBVApH/0Y52wQPU/t8drJQSDkFzhA3ov
+CsIUvLXsS5ZfK2p4jBZzWG9IpJABkNWjsqnFqEeo9GlHtDeNyORl7pz7yYSPy+/X
+eD0o+MIkJf8EnaVIVRn/zcy0d8uFBM0UTNsLwWZrMHnhjId8FxMwwJU7i6K4sGzT
+9BWfLX6LfwKBgEY7vTSR8EdLdwpyCA8CFnI9NL9QVIxeIjI7ie6d2CXd/Zecd3nu
+Eh6EgGZAf+6PUrO8zqQ/zCdAECVPf10YAHnE16Pe+L7IZA6XJ9UsNKZgMibFZqQY
+Rw9aLiOQpfyPrYCTsF+TfOE06or0MwxOdqRZ2Q99FKIpbYngctEcC7U1AoGBAIn2
+IGUrZL1l/AmDTe2VGMJfLZ9w/SgG4UViWsSuThCJjwPGyomArcvQEOMQKB6vda5Q
+n2MRmO0U3+pMRThGEyaM1+dkApEtSpDa58LPDSLjTNV22rHScOXoGVc+Sre8EVuk
+F31QLALLi+7ySKg5kJ2+9bjkMIuxaf5+ayt+ljizAoGAc67guCr7ORjvPggGfn2U
+xeYuo+nUvoXtsNkkIFzLx10FGuKI9kqi3+QFB25v4VC4eVTQNDDh7/wSSgGckWWI
+YCxTjcvkq64pLstLref++RMBE6zK/gPsWJvuYg7xKLMsgyzm4kjk6ewDwzQkl2Be
+uABeedOm0bI4QRVo4jDKs3c=
+-----END PRIVATE KEY-----