From 5c3d0f1cacf453597969260f585d41a8ffcd1718 Mon Sep 17 00:00:00 2001 From: Tomas Celaya Date: Mon, 18 Dec 2017 12:14:37 -0800 Subject: [PATCH 01/28] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41b5961..eea1310 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [4.0.6] - ? +## [4.0.6] - 2017-12-18 ### Fixed - [Removed reflective mofification of PKCS#11 Security Provider's algorithms map](https://github.com/joyent/java-http-signature/issues/45) which was incorrectly serializing ECDSA keys. From a9078ce3fe34ca90655b8fb27279193b2a829295 Mon Sep 17 00:00:00 2001 From: Elijah Zupancic Date: Mon, 2 Apr 2018 17:45:23 -0700 Subject: [PATCH 02/28] Fixes #48. Dependencies upgraded. (#49) --- CHANGELOG.md | 7 ++++++ .../HttpSignatureAuthenticationStrategy.java | 7 +++--- .../httpclient/HttpSignatureAuthIT.java | 14 +++-------- common/pom.xml | 6 ++--- .../com/joyent/http/signature/Signer.java | 1 + .../signature/crypto/NativeRSAProvider.java | 1 + .../KeyFingerprinterIntegrationCycle.java | 9 +++---- jaxrs-client/pom.xml | 8 +++---- pom.xml | 24 +++++++++---------- 9 files changed, 38 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eea1310..3b1b577 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.0.7] - ? + +### Fixed + - [jaxrs-client-signature integration tests fail to work in Java 9](https://github.com/joyent/java-http-signature/issues/48) +### Changed + - Upgraded dependency versions. + ## [4.0.6] - 2017-12-18 ### Fixed diff --git a/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthenticationStrategy.java b/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthenticationStrategy.java index a62132f..ff40529 100644 --- a/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthenticationStrategy.java +++ b/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthenticationStrategy.java @@ -28,8 +28,8 @@ import org.apache.http.impl.client.BasicAuthCache; import org.apache.http.protocol.HttpContext; +import java.util.ArrayDeque; import java.util.Collections; -import java.util.LinkedList; import java.util.Map; import java.util.Objects; import java.util.Queue; @@ -140,11 +140,10 @@ public Map getChallenges(final HttpHost authhost, public Queue select(final Map challengeHeaders, final HttpHost authhost, final HttpResponse response, - final HttpContext context) - throws MalformedChallengeException { + final HttpContext context) { final HttpClientContext httpClientContext = HttpClientContext.adapt(context); final AuthState state = httpClientContext.getTargetAuthState(); - final Queue queue = new LinkedList<>(); + final Queue queue = new ArrayDeque<>(); if (state == null || !state.getState().equals(AuthProtocolState.CHALLENGED)) { queue.add(authOption); diff --git a/apache-http-client/src/test/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthIT.java b/apache-http-client/src/test/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthIT.java index 80434bb..8f2f6b5 100644 --- a/apache-http-client/src/test/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthIT.java +++ b/apache-http-client/src/test/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthIT.java @@ -36,6 +36,8 @@ public class HttpSignatureAuthIT { private static final String SDC_ACCOUNT_ENV_KEY = "SDC_ACCOUNT"; private static final String SDC_KEY_PATH_ENV_KEY = "SDC_KEY_PATH"; + private static final ThreadLocalSigner SIGNER = new ThreadLocalSigner(); + // @Test public void canAuthenticate() throws IOException { final KeyPair keyPair = createKeyPair(); @@ -60,15 +62,6 @@ public void canAuthenticate() throws IOException { HttpHead head = new HttpHead(uri); HttpClientContext context = new HttpClientContext(); - -// AuthCache authCache = new BasicAuthCache(); -// context.setAuthCache(authCache); -// AuthState authState = new AuthState(); -// authState.update(configurator.getAuthScheme(), credentials); -// -// context.setAttribute(HttpClientContext.TARGET_AUTH_STATE, -// authState); -// context.getTargetAuthState().setState(AuthProtocolState.UNCHALLENGED); HttpResponse response = conn.execute(head, context); assertEquals(response.getStatusLine().getStatusCode(), @@ -113,10 +106,9 @@ private KeyPair createKeyPair() { final KeyPair keyPair; final String keyPath = System.getenv(SDC_KEY_PATH_ENV_KEY); Objects.requireNonNull(keyPath, SDC_KEY_PATH_ENV_KEY + " must be set"); - final ThreadLocalSigner signer = new ThreadLocalSigner(); try { - keyPair = signer.get().getKeyPair(new File(keyPath).toPath()); + keyPair = SIGNER.get().getKeyPair(new File(keyPath).toPath()); } catch (IOException e) { String msg = String.format("Unable to read key files from path: %s", keyPath); diff --git a/common/pom.xml b/common/pom.xml index 1275208..e4f99f7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -20,9 +20,9 @@ - 1.58 - 2.0.0 - 1.10 + 1.59 + 2.1.0 + 1.11 diff --git a/common/src/main/java/com/joyent/http/signature/Signer.java b/common/src/main/java/com/joyent/http/signature/Signer.java index f8be884..3b0b09e 100644 --- a/common/src/main/java/com/joyent/http/signature/Signer.java +++ b/common/src/main/java/com/joyent/http/signature/Signer.java @@ -48,6 +48,7 @@ public class Signer { * defined in the standard library using modern classes. */ @Deprecated + @SuppressWarnings("DateFormatConstant") public static final DateFormat DATE_FORMAT = new SimpleDateFormat( "EEE MMM d HH:mm:ss yyyy zzz", Locale.ENGLISH); diff --git a/common/src/main/java/com/joyent/http/signature/crypto/NativeRSAProvider.java b/common/src/main/java/com/joyent/http/signature/crypto/NativeRSAProvider.java index df1430f..e03d839 100644 --- a/common/src/main/java/com/joyent/http/signature/crypto/NativeRSAProvider.java +++ b/common/src/main/java/com/joyent/http/signature/crypto/NativeRSAProvider.java @@ -21,6 +21,7 @@ public class NativeRSAProvider extends Provider { * Creates an instance of a JCE provider that supports native RSA via jnagmp. */ public NativeRSAProvider() { + // This constructor signature will need to be upgraded in the future super("native-rsa", 1.0, "SHA Digest with RSA Native implementation"); put("Signature.SHA1withNativeRSA", NativeRSAWithSHA.SHA1.class.getName()); put("Signature.SHA256withNativeRSA", NativeRSAWithSHA.SHA256.class.getName()); diff --git a/common/src/test/java/com/joyent/http/signature/KeyFingerprinterIntegrationCycle.java b/common/src/test/java/com/joyent/http/signature/KeyFingerprinterIntegrationCycle.java index 3cd4081..838a90b 100644 --- a/common/src/test/java/com/joyent/http/signature/KeyFingerprinterIntegrationCycle.java +++ b/common/src/test/java/com/joyent/http/signature/KeyFingerprinterIntegrationCycle.java @@ -13,10 +13,12 @@ import java.io.File; import java.io.IOException; import java.io.InputStreamReader; +import java.io.UncheckedIOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.stream.Stream; /** * Utility stress test class for comparing generated fingerprints to @@ -87,13 +89,12 @@ public void run() { throw new RuntimeException(e); } } - try { - Files.walk(tmpDir) - .map(Path::toFile) + try (Stream paths = Files.walk(tmpDir)){ + paths.map(Path::toFile) .sorted((o1, o2) -> -o1.compareTo(o2)) .forEach(File::delete); } catch (IOException e) { - throw new RuntimeException(e); + throw new UncheckedIOException(e); } } diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 881c21e..899279a 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -20,14 +20,14 @@ - 1.1.13.Final - 1.0.1 + 1.4.0.Final + 1.0.2 4.0.6-SNAPSHOT 8.0 2.1 2.26 - 4.1.2.173.0.1 - 1.1.13.Final + 5.181 + 1.4.0.Final diff --git a/pom.xml b/pom.xml index aaeb607..6a5c7bb 100644 --- a/pom.xml +++ b/pom.xml @@ -89,36 +89,36 @@ 1 true - 8.2 - 4.5.3 - 6.11 + 8.8 + 4.5.5 + 6.14.2 1.7.25 1.2.3 - 2.17 + 3.0.0 3.0.0 3.7.0 3.0.2 2.8.2 1.4.1 - 2.20.1 + 2.21.0 1.6 2.5.2 3.0.2 1.4 - 2.10.4 + 3.0.0 2.5 2.5.3 3.0.2 2.4.2 3.0.1 - 2.20.1 - 0.7.9 + 2.21.0 + 0.8.1 2.9 - 2.8.2 - 2.1.1 + 2.8.3 + 2.2.0 @@ -233,9 +233,7 @@ ${maven-failsafe-plugin.version} ${surefire.forkCount} - - exampleSystemPropertyValue - + false ${surefire.useSystemClassLoader} false From 30fad8d7924cbb2cb19d2ae6f03bbb75a50e9702 Mon Sep 17 00:00:00 2001 From: Elijah Zupancic Date: Mon, 2 Apr 2018 17:47:27 -0700 Subject: [PATCH 03/28] Updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b1b577..2c02f3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [4.0.7] - ? +## [4.0.7] - 2018-04-02 ### Fixed - [jaxrs-client-signature integration tests fail to work in Java 9](https://github.com/joyent/java-http-signature/issues/48) From 564ea6601ca5da940a3303b780a8d54ab0ee392f Mon Sep 17 00:00:00 2001 From: Elijah Zupancic Date: Tue, 3 Apr 2018 02:08:49 +0000 Subject: [PATCH 04/28] [maven-release-plugin] prepare release java-http-signature-4.0.7 --- apache-http-client/pom.xml | 4 ++-- common/pom.xml | 2 +- google-http-client/pom.xml | 4 ++-- jaxrs-client/pom.xml | 4 ++-- microbench/pom.xml | 4 ++-- pom.xml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apache-http-client/pom.xml b/apache-http-client/pom.xml index b6ea724..fdc9add 100644 --- a/apache-http-client/pom.xml +++ b/apache-http-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.6-SNAPSHOT + 4.0.7 apache-http-client-signature @@ -20,7 +20,7 @@ - 4.0.6-SNAPSHOT + 4.0.7 diff --git a/common/pom.xml b/common/pom.xml index e4f99f7..9ec9666 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.6-SNAPSHOT + 4.0.7 http-signature-common diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 701a58b..d504c60 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -9,7 +9,7 @@ java-http-signature com.joyent.http-signature - 4.0.6-SNAPSHOT + 4.0.7 4.0.0 @@ -19,7 +19,7 @@ - 4.0.6-SNAPSHOT + 4.0.7 1.23.0 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 899279a..816b5a2 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.6-SNAPSHOT + 4.0.7 jaxrs-client-signature @@ -22,7 +22,7 @@ 1.4.0.Final 1.0.2 - 4.0.6-SNAPSHOT + 4.0.7 8.0 2.1 2.26 diff --git a/microbench/pom.xml b/microbench/pom.xml index 5fc71bb..045f224 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -12,7 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. java-http-signature com.joyent.http-signature - 4.0.6-SNAPSHOT + 4.0.7 microbench @@ -20,7 +20,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - 4.0.6-SNAPSHOT + 4.0.7 1.19 benchmarks diff --git a/pom.xml b/pom.xml index 6a5c7bb..b983ec6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.joyent.http-signature java-http-signature - 4.0.6-SNAPSHOT + 4.0.7 pom java-http-signature @@ -61,7 +61,7 @@ scm:git:git://github.com/joyent/java-http-signature.git scm:git:git://github.com/joyent/java-http-signature.git git@github.com:joyent/java-http-signature.git - HEAD + java-http-signature-4.0.7 github.com From 3a996e0ece51bf0ac64de7476030a4fcab9f2197 Mon Sep 17 00:00:00 2001 From: Elijah Zupancic Date: Tue, 3 Apr 2018 02:08:49 +0000 Subject: [PATCH 05/28] [maven-release-plugin] prepare for next development iteration --- apache-http-client/pom.xml | 4 ++-- common/pom.xml | 2 +- google-http-client/pom.xml | 4 ++-- jaxrs-client/pom.xml | 4 ++-- microbench/pom.xml | 4 ++-- pom.xml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apache-http-client/pom.xml b/apache-http-client/pom.xml index fdc9add..3946a23 100644 --- a/apache-http-client/pom.xml +++ b/apache-http-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.7 + 4.0.8-SNAPSHOT apache-http-client-signature @@ -20,7 +20,7 @@ - 4.0.7 + 4.0.8-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 9ec9666..865ce90 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.7 + 4.0.8-SNAPSHOT http-signature-common diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index d504c60..99bab74 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -9,7 +9,7 @@ java-http-signature com.joyent.http-signature - 4.0.7 + 4.0.8-SNAPSHOT 4.0.0 @@ -19,7 +19,7 @@ - 4.0.7 + 4.0.8-SNAPSHOT 1.23.0 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 816b5a2..bc1f4b3 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.7 + 4.0.8-SNAPSHOT jaxrs-client-signature @@ -22,7 +22,7 @@ 1.4.0.Final 1.0.2 - 4.0.7 + 4.0.8-SNAPSHOT 8.0 2.1 2.26 diff --git a/microbench/pom.xml b/microbench/pom.xml index 045f224..7c2c243 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -12,7 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. java-http-signature com.joyent.http-signature - 4.0.7 + 4.0.8-SNAPSHOT microbench @@ -20,7 +20,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - 4.0.7 + 4.0.8-SNAPSHOT 1.19 benchmarks diff --git a/pom.xml b/pom.xml index b983ec6..049d7da 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.joyent.http-signature java-http-signature - 4.0.7 + 4.0.8-SNAPSHOT pom java-http-signature @@ -61,7 +61,7 @@ scm:git:git://github.com/joyent/java-http-signature.git scm:git:git://github.com/joyent/java-http-signature.git git@github.com:joyent/java-http-signature.git - java-http-signature-4.0.7 + HEAD github.com From 9ebdd788a7a9f191a910156e9e686c83d92ed76d Mon Sep 17 00:00:00 2001 From: Tomas Celaya Date: Sun, 29 Apr 2018 11:15:51 -0700 Subject: [PATCH 06/28] Resolve #50. KeyPairLoader builds a KeyPair from a private key, so it should be more explicit about the input it expects (#51) --- .../joyent/http/signature/KeyPairLoader.java | 4 ++ .../http/signature/KeyPairLoaderTest.java | 46 +++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/joyent/http/signature/KeyPairLoader.java b/common/src/main/java/com/joyent/http/signature/KeyPairLoader.java index c584ce1..74d815e 100644 --- a/common/src/main/java/com/joyent/http/signature/KeyPairLoader.java +++ b/common/src/main/java/com/joyent/http/signature/KeyPairLoader.java @@ -161,6 +161,8 @@ public static KeyPair getKeyPair(final Path keyPath, final char[] password) thro try (InputStream is = Files.newInputStream(keyPath)) { return getKeyPair(is, password); + } catch (final KeyLoadException kle) { + throw new IOException("Unable to load private key at path: " + keyPath, kle); } } @@ -246,6 +248,8 @@ public static KeyPair getKeyPair(final InputStream is, } pemKeyPair = (PEMKeyPair) pemObject; + } else if (pemObject == null) { + throw new KeyLoadException("Failed to load PEM object, please verify the input is a private key"); } else { throw new KeyLoadException("Unexpected PEM object loaded: " + pemObject.getClass().getCanonicalName()); } diff --git a/common/src/test/java/com/joyent/http/signature/KeyPairLoaderTest.java b/common/src/test/java/com/joyent/http/signature/KeyPairLoaderTest.java index 052ddbc..4dda762 100644 --- a/common/src/test/java/com/joyent/http/signature/KeyPairLoaderTest.java +++ b/common/src/test/java/com/joyent/http/signature/KeyPairLoaderTest.java @@ -22,7 +22,6 @@ import java.nio.file.Path; import java.security.KeyPair; import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; import java.security.Security; import java.util.UUID; @@ -33,13 +32,52 @@ public class KeyPairLoaderTest { private static final String RSA_HEADER = "-----BEGIN RSA PRIVATE KEY-----"; + /** + * Since serializing a public key to the OpenSSH format would require an external library we've generated + * a key just for testing. The corresponding private key was destroyed. + */ + private static final String TEST_PUBLIC_KEY = + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDZbnRl5z0dd3NAvRprIrUcRJxJzhnNvozxlBUYj47+OtxP6dlETjrvMHtqg7/+NZ" + + "C+4/HyXF8MBYmNKQXXzOOThIlG/Cxx4rSNRx3TBeKijQ8+gw2c5QwM/0SHv73WGgL81Br07Fk3y2I7eqHvyBD428jBoOgH" + + "+ecGT4pdL/Zyrw=="; + private static final ClassLoader CLASS_LOADER = KeyPairLoaderTest.class.getClassLoader(); public void willThrowOnNullInputs() { Assert.assertThrows(() -> - KeyPairLoader.getKeyPair((String) null, null)); + KeyPairLoader.getKeyPair((File) null, null)); Assert.assertThrows(() -> KeyPairLoader.getKeyPair((Path) null, null)); + Assert.assertThrows(() -> + KeyPairLoader.getKeyPair((String) null, null)); + Assert.assertThrows(() -> + KeyPairLoader.getKeyPair((InputStream) null, null)); + } + + public void willThrowUsefulExceptionsOnEmptyFile() throws IOException { + final Path emptyFile = Files.createTempFile("id_rsa", ""); + + final IOException emptyFileException = Assert.expectThrows(IOException.class, () -> + KeyPairLoader.getKeyPair(emptyFile)); + + // error message should contain the path specified and the words "private key" + Assert.assertTrue(emptyFileException.getMessage().contains(emptyFile.toString())); + Assert.assertTrue(emptyFileException.getMessage().contains("private key")); + } + + public void willThrowUsefulExceptionsOnPublicKeyFile() throws Exception { + final Path publicKeyFile = Files.createTempFile("id_rsa", ".pub"); + + try (final FileOutputStream fos = new FileOutputStream(publicKeyFile.toFile())) { + fos.write(TEST_PUBLIC_KEY.getBytes(StandardCharsets.UTF_8)); + } + + final IOException publicKeyFileException = Assert.expectThrows(IOException.class, () -> + KeyPairLoader.getKeyPair(publicKeyFile)); + + // error message should contain the path specified and the words "private key" + Assert.assertTrue(publicKeyFileException.getMessage().contains(publicKeyFile.toString())); + Assert.assertTrue(publicKeyFileException.getMessage().contains("private key")); } public void canLoadGeneratedBytesKeyPair() throws Exception { @@ -142,7 +180,7 @@ public void willThrowWhenPkcs11IsRequestedButUnavailable() throws Exception { // TEST UTILITY METHODS - private KeyPair generateKeyPair() throws NoSuchAlgorithmException { + private KeyPair generateKeyPair() throws Exception { final KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA"); generator.initialize(1024); return generator.generateKeyPair(); @@ -167,7 +205,7 @@ private byte[] serializePrivateKey(final KeyPair keyPair, return baos.toByteArray(); } - private void compareKeyContents(KeyPair expectedKeyPair, KeyPair actualKeyPair) { + private void compareKeyContents(final KeyPair expectedKeyPair, final KeyPair actualKeyPair) { AssertJUnit.assertArrayEquals( expectedKeyPair.getPrivate().getEncoded(), actualKeyPair.getPrivate().getEncoded()); From da695aa98db4e4d1df186f1dfef46fc64881cf50 Mon Sep 17 00:00:00 2001 From: Tomas Celaya Date: Sun, 29 Apr 2018 11:17:33 -0700 Subject: [PATCH 07/28] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c02f3a..d0549d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.0.8] + +### Fixed +- [NullPointerException when key file is not a valid private key]https://github.com/joyent/java-http-signature/issues/50 + ## [4.0.7] - 2018-04-02 ### Fixed From a5a2c55e7867db0937f3da53c8c725c51325e247 Mon Sep 17 00:00:00 2001 From: Tomas Celaya Date: Sun, 29 Apr 2018 11:17:50 -0700 Subject: [PATCH 08/28] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0549d0..494b788 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [4.0.8] ### Fixed -- [NullPointerException when key file is not a valid private key]https://github.com/joyent/java-http-signature/issues/50 +- [NullPointerException when key file is not a valid private key](https://github.com/joyent/java-http-signature/issues/50) ## [4.0.7] - 2018-04-02 From c94a16d51b74645742c3f23e67a125c64a741154 Mon Sep 17 00:00:00 2001 From: Tomas Celaya Date: Sun, 29 Apr 2018 15:10:33 -0700 Subject: [PATCH 09/28] Fix javadoc error --- .../main/java/com/joyent/http/signature/KeyFingerprinter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/joyent/http/signature/KeyFingerprinter.java b/common/src/main/java/com/joyent/http/signature/KeyFingerprinter.java index fa26299..a31091a 100644 --- a/common/src/main/java/com/joyent/http/signature/KeyFingerprinter.java +++ b/common/src/main/java/com/joyent/http/signature/KeyFingerprinter.java @@ -46,7 +46,7 @@ private KeyFingerprinter() { * still the one used by Triton and Manta as the key id. * * @param keyPair The KeyPair to calculate the fingerprint of - * @return The fingerprint (ex: {@code 9f:0b:50:ae:e3:da:f6:eb:b5:71:9a:69:ee:79:9e:c2}) + * @return The MD5 fingerprint (ex: {@code 9f:0b:50:ae:e3:da:f6:eb:b5:71:9a:69:ee:79:9e:c2}) */ public static String md5Fingerprint(final KeyPair keyPair) { Objects.requireNonNull(keyPair); @@ -70,7 +70,7 @@ public static String md5Fingerprint(final KeyPair keyPair) { * SHA256 of the serialized public key as a fingerprint. * * @param keyPair The KeyPair to calculate the fingerprint of - * @return The fingerprint (ex: {@code: LP3pWCEhg6rdmE05GhUKbZ7uOZqsJd0sK0AR3sVoMq4}) + * @return The SHA fingerprint (ex: {@code LP3pWCEhg6rdmE05GhUKbZ7uOZqsJd0sK0AR3sVoMq4}) */ public static String sha256Fingerprint(final KeyPair keyPair) { Objects.requireNonNull(keyPair); From dee89db89ffaf8fb8e4285992030e4c253087c87 Mon Sep 17 00:00:00 2001 From: Tomas Celaya Date: Sun, 29 Apr 2018 15:19:38 -0700 Subject: [PATCH 10/28] [maven-release-plugin] prepare release java-http-signature-4.0.8 --- apache-http-client/pom.xml | 4 ++-- common/pom.xml | 2 +- google-http-client/pom.xml | 4 ++-- jaxrs-client/pom.xml | 4 ++-- microbench/pom.xml | 4 ++-- pom.xml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apache-http-client/pom.xml b/apache-http-client/pom.xml index 3946a23..a5c8b48 100644 --- a/apache-http-client/pom.xml +++ b/apache-http-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.8-SNAPSHOT + 4.0.8 apache-http-client-signature @@ -20,7 +20,7 @@ - 4.0.8-SNAPSHOT + 4.0.8 diff --git a/common/pom.xml b/common/pom.xml index 865ce90..c443b33 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.8-SNAPSHOT + 4.0.8 http-signature-common diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 99bab74..8032d7b 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -9,7 +9,7 @@ java-http-signature com.joyent.http-signature - 4.0.8-SNAPSHOT + 4.0.8 4.0.0 @@ -19,7 +19,7 @@ - 4.0.8-SNAPSHOT + 4.0.8 1.23.0 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index bc1f4b3..70d23ed 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.8-SNAPSHOT + 4.0.8 jaxrs-client-signature @@ -22,7 +22,7 @@ 1.4.0.Final 1.0.2 - 4.0.8-SNAPSHOT + 4.0.8 8.0 2.1 2.26 diff --git a/microbench/pom.xml b/microbench/pom.xml index 7c2c243..92e175e 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -12,7 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. java-http-signature com.joyent.http-signature - 4.0.8-SNAPSHOT + 4.0.8 microbench @@ -20,7 +20,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - 4.0.8-SNAPSHOT + 4.0.8 1.19 benchmarks diff --git a/pom.xml b/pom.xml index 049d7da..b113311 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.joyent.http-signature java-http-signature - 4.0.8-SNAPSHOT + 4.0.8 pom java-http-signature @@ -61,7 +61,7 @@ scm:git:git://github.com/joyent/java-http-signature.git scm:git:git://github.com/joyent/java-http-signature.git git@github.com:joyent/java-http-signature.git - HEAD + java-http-signature-4.0.8 github.com From df078efe3e3a83c35aecc249fd90136447f0fd8f Mon Sep 17 00:00:00 2001 From: Tomas Celaya Date: Sun, 29 Apr 2018 15:19:39 -0700 Subject: [PATCH 11/28] [maven-release-plugin] prepare for next development iteration --- apache-http-client/pom.xml | 4 ++-- common/pom.xml | 2 +- google-http-client/pom.xml | 4 ++-- jaxrs-client/pom.xml | 4 ++-- microbench/pom.xml | 4 ++-- pom.xml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apache-http-client/pom.xml b/apache-http-client/pom.xml index a5c8b48..9ac7594 100644 --- a/apache-http-client/pom.xml +++ b/apache-http-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.8 + 4.0.9-SNAPSHOT apache-http-client-signature @@ -20,7 +20,7 @@ - 4.0.8 + 4.0.9-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index c443b33..4c7aa32 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.8 + 4.0.9-SNAPSHOT http-signature-common diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 8032d7b..0a831bf 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -9,7 +9,7 @@ java-http-signature com.joyent.http-signature - 4.0.8 + 4.0.9-SNAPSHOT 4.0.0 @@ -19,7 +19,7 @@ - 4.0.8 + 4.0.9-SNAPSHOT 1.23.0 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 70d23ed..e4b6b1b 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.8 + 4.0.9-SNAPSHOT jaxrs-client-signature @@ -22,7 +22,7 @@ 1.4.0.Final 1.0.2 - 4.0.8 + 4.0.9-SNAPSHOT 8.0 2.1 2.26 diff --git a/microbench/pom.xml b/microbench/pom.xml index 92e175e..878275b 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -12,7 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. java-http-signature com.joyent.http-signature - 4.0.8 + 4.0.9-SNAPSHOT microbench @@ -20,7 +20,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - 4.0.8 + 4.0.9-SNAPSHOT 1.19 benchmarks diff --git a/pom.xml b/pom.xml index b113311..00fdff6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.joyent.http-signature java-http-signature - 4.0.8 + 4.0.9-SNAPSHOT pom java-http-signature @@ -61,7 +61,7 @@ scm:git:git://github.com/joyent/java-http-signature.git scm:git:git://github.com/joyent/java-http-signature.git git@github.com:joyent/java-http-signature.git - java-http-signature-4.0.8 + HEAD github.com From 03ee7a14a78b8e9722a0c244993e9e7fe03e5cb0 Mon Sep 17 00:00:00 2001 From: Tomas Celaya Date: Mon, 30 Apr 2018 10:32:49 -0700 Subject: [PATCH 12/28] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 494b788..a71d910 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [4.0.8] +## [4.0.8] - 2018-04-29 ### Fixed - [NullPointerException when key file is not a valid private key](https://github.com/joyent/java-http-signature/issues/50) From 454eba23a96f56ca78585ec0eabce5f87789192e Mon Sep 17 00:00:00 2001 From: Elijah Zupancic Date: Thu, 17 Jan 2019 10:28:24 -0800 Subject: [PATCH 13/28] Upgraded library dependencies (#52) * Upgraded library dependencies - Resolved errorprone warnings and errors. --- CHANGELOG.md | 5 +++++ .../HttpSignatureAuthenticationStrategy.java | 5 +---- common/pom.xml | 2 +- .../main/java/com/joyent/http/signature/Signer.java | 11 +++-------- .../signature/KeyFingerprinterIntegrationCycle.java | 1 + .../com/joyent/http/signature/SignerTestUtil.java | 2 +- google-http-client/pom.xml | 2 +- .../google/httpclient/RequestHttpSignerTest.java | 3 ++- jaxrs-client/pom.xml | 8 ++++---- microbench/pom.xml | 2 +- pom.xml | 10 +++++----- 11 files changed, 25 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a71d910..fd9b814 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.0.9] - 2019-01-15 + +### Changed + - Upgraded dependency versions. + ## [4.0.8] - 2018-04-29 ### Fixed diff --git a/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthenticationStrategy.java b/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthenticationStrategy.java index ff40529..adafd71 100644 --- a/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthenticationStrategy.java +++ b/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthenticationStrategy.java @@ -114,11 +114,8 @@ public boolean isAuthenticationRequested(final HttpHost authHost, return true; } - if (clientContext.getTargetAuthState() == null) { - return true; - } + return clientContext.getTargetAuthState() == null; - return false; } @Override diff --git a/common/pom.xml b/common/pom.xml index 4c7aa32..bab2d05 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -20,7 +20,7 @@ - 1.59 + 1.60 2.1.0 1.11 diff --git a/common/src/main/java/com/joyent/http/signature/Signer.java b/common/src/main/java/com/joyent/http/signature/Signer.java index 3b0b09e..c355a2f 100644 --- a/common/src/main/java/com/joyent/http/signature/Signer.java +++ b/common/src/main/java/com/joyent/http/signature/Signer.java @@ -12,7 +12,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.security.InvalidKeyException; @@ -325,7 +324,7 @@ public String createAuthorizationHeader(final String login, try { signature.initSign(keyPair.getPrivate()); final String signingString = String.format(AUTHZ_SIGNING_STRING, date); - signature.update(signingString.getBytes("UTF-8")); + signature.update(signingString.getBytes(StandardCharsets.UTF_8)); final byte[] signedDate = signature.sign(); final byte[] encodedSignedDate = Base64.encode(signedDate); final String fingerprint = KeyFingerprinter.md5Fingerprint(keyPair); @@ -336,8 +335,6 @@ public String createAuthorizationHeader(final String login, throw new CryptoException("invalid key", e); } catch (final SignatureException e) { throw new CryptoException("invalid signature", e); - } catch (final UnsupportedEncodingException e) { - throw new CryptoException("invalid encoding", e); } } @@ -472,17 +469,15 @@ public boolean verifyAuthorizationHeader(final KeyPair keyPair, final String encodedSignedDate = authzHeader.substring(startIndex + AUTHZ_PATTERN.length(), authzHeader.length() - 1); - final byte[] signedDate = Base64.decode(encodedSignedDate.getBytes("UTF-8")); + final byte[] signedDate = Base64.decode(encodedSignedDate.getBytes(StandardCharsets.UTF_8)); - signature.update(myDate.getBytes("UTF-8")); + signature.update(myDate.getBytes(StandardCharsets.UTF_8)); return signature.verify(signedDate); } catch (final InvalidKeyException e) { throw new CryptoException("invalid key", e); } catch (final SignatureException e) { throw new CryptoException("invalid signature", e); - } catch (final UnsupportedEncodingException e) { - throw new CryptoException("invalid encoding", e); } } diff --git a/common/src/test/java/com/joyent/http/signature/KeyFingerprinterIntegrationCycle.java b/common/src/test/java/com/joyent/http/signature/KeyFingerprinterIntegrationCycle.java index 838a90b..3f60ca0 100644 --- a/common/src/test/java/com/joyent/http/signature/KeyFingerprinterIntegrationCycle.java +++ b/common/src/test/java/com/joyent/http/signature/KeyFingerprinterIntegrationCycle.java @@ -57,6 +57,7 @@ public void keygen(int iteration) throws IOException, InterruptedException { } // NOTE: need -E md5 for openssh > 6.7 + @SuppressWarnings("StringSplitter") public String readMd5Fingerprint(int iteration) throws IOException, InterruptedException { Process p = Runtime.getRuntime().exec(new String[] { "ssh-keygen", "-l", "-f", privateFileName(iteration) + ".pub"}); diff --git a/common/src/test/java/com/joyent/http/signature/SignerTestUtil.java b/common/src/test/java/com/joyent/http/signature/SignerTestUtil.java index a7c8ce8..a955a80 100644 --- a/common/src/test/java/com/joyent/http/signature/SignerTestUtil.java +++ b/common/src/test/java/com/joyent/http/signature/SignerTestUtil.java @@ -14,7 +14,7 @@ import java.util.Map; public class SignerTestUtil { - @SuppressWarnings("serial") + @SuppressWarnings({"serial", "DoubleBraceInitialization"}) public static final Map keys = new HashMap() {{ put("rsa_1024", new TestKeyResource("9f:0b:50:ae:e3:da:f6:eb:b5:71:9a:69:ee:79:9e:c2", "LP3pWCEhg6rdmE05GhUKbZ7uOZqsJd0sK0AR3sVoMq4", diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 0a831bf..b400fff 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -20,7 +20,7 @@ 4.0.9-SNAPSHOT - 1.23.0 + 1.28.0 diff --git a/google-http-client/src/test/java/com/joyent/http/signature/google/httpclient/RequestHttpSignerTest.java b/google-http-client/src/test/java/com/joyent/http/signature/google/httpclient/RequestHttpSignerTest.java index ed8b50e..a9bd3dd 100644 --- a/google-http-client/src/test/java/com/joyent/http/signature/google/httpclient/RequestHttpSignerTest.java +++ b/google-http-client/src/test/java/com/joyent/http/signature/google/httpclient/RequestHttpSignerTest.java @@ -8,6 +8,7 @@ import com.google.api.client.http.HttpRequestFactory; import com.google.api.client.http.HttpTransport; import com.google.api.client.testing.http.MockHttpTransport; +import com.google.common.primitives.Ints; import com.joyent.http.signature.Signer; import com.joyent.http.signature.SignerTestUtil; import com.joyent.http.signature.ThreadLocalSigner; @@ -97,7 +98,7 @@ public void canSignRequest() throws IOException { System.out.println(String.format("Total signing time for request: %dms", total)); } - long average = Math.round(running / iterations); + long average = Ints.saturatedCast(running / iterations); System.out.println(String.format("Average signing time: %dms", average)); String authorization = request.getHeaders().getAuthorization(); diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index e4b6b1b..7e4738a 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -24,10 +24,10 @@ 1.0.2 4.0.9-SNAPSHOT 8.0 - 2.1 - 2.26 - 5.181 - 1.4.0.Final + 2.1.1 + 2.27 + 5.184 + 1.4.1.Final diff --git a/microbench/pom.xml b/microbench/pom.xml index 878275b..15a0d52 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -21,7 +21,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. 4.0.9-SNAPSHOT - 1.19 + 1.21 benchmarks diff --git a/pom.xml b/pom.xml index 00fdff6..9cbbaf3 100644 --- a/pom.xml +++ b/pom.xml @@ -89,9 +89,9 @@ 1 true - 8.8 - 4.5.5 - 6.14.2 + 8.16 + 4.5.6 + 6.14.3 1.7.25 1.2.3 @@ -117,8 +117,8 @@ 2.9 - 2.8.3 - 2.2.0 + 2.8.5 + 2.3.2 From eab396e6c97d0e2f56eb933ec05110d66ec052fe Mon Sep 17 00:00:00 2001 From: Elijah Zupancic Date: Thu, 17 Jan 2019 18:30:56 +0000 Subject: [PATCH 14/28] [maven-release-plugin] prepare release java-http-signature-4.0.9 --- apache-http-client/pom.xml | 4 ++-- common/pom.xml | 2 +- google-http-client/pom.xml | 4 ++-- jaxrs-client/pom.xml | 4 ++-- microbench/pom.xml | 4 ++-- pom.xml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apache-http-client/pom.xml b/apache-http-client/pom.xml index 9ac7594..6b5b25c 100644 --- a/apache-http-client/pom.xml +++ b/apache-http-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.9-SNAPSHOT + 4.0.9 apache-http-client-signature @@ -20,7 +20,7 @@ - 4.0.9-SNAPSHOT + 4.0.9 diff --git a/common/pom.xml b/common/pom.xml index bab2d05..92179fd 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.9-SNAPSHOT + 4.0.9 http-signature-common diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index b400fff..74fc960 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -9,7 +9,7 @@ java-http-signature com.joyent.http-signature - 4.0.9-SNAPSHOT + 4.0.9 4.0.0 @@ -19,7 +19,7 @@ - 4.0.9-SNAPSHOT + 4.0.9 1.28.0 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 7e4738a..a5816d0 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.9-SNAPSHOT + 4.0.9 jaxrs-client-signature @@ -22,7 +22,7 @@ 1.4.0.Final 1.0.2 - 4.0.9-SNAPSHOT + 4.0.9 8.0 2.1.1 2.27 diff --git a/microbench/pom.xml b/microbench/pom.xml index 15a0d52..ae4d1b0 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -12,7 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. java-http-signature com.joyent.http-signature - 4.0.9-SNAPSHOT + 4.0.9 microbench @@ -20,7 +20,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - 4.0.9-SNAPSHOT + 4.0.9 1.21 benchmarks diff --git a/pom.xml b/pom.xml index 9cbbaf3..df2869e 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.joyent.http-signature java-http-signature - 4.0.9-SNAPSHOT + 4.0.9 pom java-http-signature @@ -61,7 +61,7 @@ scm:git:git://github.com/joyent/java-http-signature.git scm:git:git://github.com/joyent/java-http-signature.git git@github.com:joyent/java-http-signature.git - HEAD + java-http-signature-4.0.9 github.com From 57d7eeeb9e1c5edd7e69cc91ab27c84145de44ce Mon Sep 17 00:00:00 2001 From: Elijah Zupancic Date: Thu, 17 Jan 2019 18:30:56 +0000 Subject: [PATCH 15/28] [maven-release-plugin] prepare for next development iteration --- apache-http-client/pom.xml | 4 ++-- common/pom.xml | 2 +- google-http-client/pom.xml | 4 ++-- jaxrs-client/pom.xml | 4 ++-- microbench/pom.xml | 4 ++-- pom.xml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apache-http-client/pom.xml b/apache-http-client/pom.xml index 6b5b25c..6964e02 100644 --- a/apache-http-client/pom.xml +++ b/apache-http-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.9 + 4.0.10-SNAPSHOT apache-http-client-signature @@ -20,7 +20,7 @@ - 4.0.9 + 4.0.10-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 92179fd..5e81d5d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.9 + 4.0.10-SNAPSHOT http-signature-common diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 74fc960..13bea6d 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -9,7 +9,7 @@ java-http-signature com.joyent.http-signature - 4.0.9 + 4.0.10-SNAPSHOT 4.0.0 @@ -19,7 +19,7 @@ - 4.0.9 + 4.0.10-SNAPSHOT 1.28.0 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index a5816d0..33cabe0 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.9 + 4.0.10-SNAPSHOT jaxrs-client-signature @@ -22,7 +22,7 @@ 1.4.0.Final 1.0.2 - 4.0.9 + 4.0.10-SNAPSHOT 8.0 2.1.1 2.27 diff --git a/microbench/pom.xml b/microbench/pom.xml index ae4d1b0..c873554 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -12,7 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. java-http-signature com.joyent.http-signature - 4.0.9 + 4.0.10-SNAPSHOT microbench @@ -20,7 +20,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - 4.0.9 + 4.0.10-SNAPSHOT 1.21 benchmarks diff --git a/pom.xml b/pom.xml index df2869e..a4aaeb5 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.joyent.http-signature java-http-signature - 4.0.9 + 4.0.10-SNAPSHOT pom java-http-signature @@ -61,7 +61,7 @@ scm:git:git://github.com/joyent/java-http-signature.git scm:git:git://github.com/joyent/java-http-signature.git git@github.com:joyent/java-http-signature.git - java-http-signature-4.0.9 + HEAD github.com From 1e72d58f2b05adc7e401ce29cea02233c4bdd725 Mon Sep 17 00:00:00 2001 From: Ashwin A Nair Date: Tue, 26 Feb 2019 17:07:09 -0800 Subject: [PATCH 16/28] Upgraded BC Version to 1.61 --- common/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/pom.xml b/common/pom.xml index 5e81d5d..8c75f8f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -20,7 +20,7 @@ - 1.60 + 1.61 2.1.0 1.11 From 9ee3137ac7fdc518f5136ee16a3e8161619461f9 Mon Sep 17 00:00:00 2001 From: Ashwin A Nair Date: Tue, 26 Feb 2019 17:16:32 -0800 Subject: [PATCH 17/28] Upgrade Apache-Http-Client Dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4aaeb5..0b49759 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ true 8.16 - 4.5.6 + 4.5.7 6.14.3 1.7.25 1.2.3 From fea0384020b02b16100b4815e35aef9c75035083 Mon Sep 17 00:00:00 2001 From: Ashwin A Nair Date: Wed, 27 Feb 2019 14:07:43 -0800 Subject: [PATCH 18/28] Update CHANGELOG For New Release 4.0.10 --- CHANGELOG.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd9b814..3b1f0c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.0.10] - 2019-02-27 + +### Changed + - Upgraded dependency versions for BC and Apache-Http-Client. + - [Upgrade Apache-Http-Client Dependency](https://github.com/joyent/java-http-signature/commit/9ee3137ac7fdc518f5136ee16a3e8161619461f9) + - [Upgraded BC Version To 1.61](https://github.com/joyent/java-http-signature/commit/1e72d58f2b05adc7e401ce29cea02233c4bdd725) + ## [4.0.9] - 2019-01-15 ### Changed @@ -10,7 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [4.0.8] - 2018-04-29 ### Fixed -- [NullPointerException when key file is not a valid private key](https://github.com/joyent/java-http-signature/issues/50) + - [NullPointerException when key file is not a valid private key](https://github.com/joyent/java-http-signature/issues/50) ## [4.0.7] - 2018-04-02 @@ -215,5 +222,5 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [1.0.0] - 2015-11-10 ### Added -- Forked HTTP signature from the Java Manta project. -- Created three artifacts - common, google-http-client and apache-http-client + - Forked HTTP signature from the Java Manta project. + - Created three artifacts - common, google-http-client and apache-http-client From cd2b6bea8bf24f7cb05bb398b60ce2b7b69aee01 Mon Sep 17 00:00:00 2001 From: Ashwin A Nair Date: Wed, 27 Feb 2019 14:45:51 -0800 Subject: [PATCH 19/28] [maven-release-plugin] prepare release java-http-signature-4.0.10 --- apache-http-client/pom.xml | 4 ++-- common/pom.xml | 2 +- google-http-client/pom.xml | 4 ++-- jaxrs-client/pom.xml | 4 ++-- microbench/pom.xml | 4 ++-- pom.xml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apache-http-client/pom.xml b/apache-http-client/pom.xml index 6964e02..1e2c186 100644 --- a/apache-http-client/pom.xml +++ b/apache-http-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.10-SNAPSHOT + 4.0.10 apache-http-client-signature @@ -20,7 +20,7 @@ - 4.0.10-SNAPSHOT + 4.0.10 diff --git a/common/pom.xml b/common/pom.xml index 8c75f8f..21e5367 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.10-SNAPSHOT + 4.0.10 http-signature-common diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 13bea6d..929b020 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -9,7 +9,7 @@ java-http-signature com.joyent.http-signature - 4.0.10-SNAPSHOT + 4.0.10 4.0.0 @@ -19,7 +19,7 @@ - 4.0.10-SNAPSHOT + 4.0.10 1.28.0 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 33cabe0..8a9e10f 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.10-SNAPSHOT + 4.0.10 jaxrs-client-signature @@ -22,7 +22,7 @@ 1.4.0.Final 1.0.2 - 4.0.10-SNAPSHOT + 4.0.10 8.0 2.1.1 2.27 diff --git a/microbench/pom.xml b/microbench/pom.xml index c873554..84728b2 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -12,7 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. java-http-signature com.joyent.http-signature - 4.0.10-SNAPSHOT + 4.0.10 microbench @@ -20,7 +20,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - 4.0.10-SNAPSHOT + 4.0.10 1.21 benchmarks diff --git a/pom.xml b/pom.xml index 0b49759..265458f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.joyent.http-signature java-http-signature - 4.0.10-SNAPSHOT + 4.0.10 pom java-http-signature @@ -61,7 +61,7 @@ scm:git:git://github.com/joyent/java-http-signature.git scm:git:git://github.com/joyent/java-http-signature.git git@github.com:joyent/java-http-signature.git - HEAD + java-http-signature-4.0.10 github.com From 45bc2ca0a7b4e4bcbc6bfb05bffd3304f793488d Mon Sep 17 00:00:00 2001 From: Ashwin A Nair Date: Wed, 27 Feb 2019 14:45:51 -0800 Subject: [PATCH 20/28] [maven-release-plugin] prepare for next development iteration --- apache-http-client/pom.xml | 4 ++-- common/pom.xml | 2 +- google-http-client/pom.xml | 4 ++-- jaxrs-client/pom.xml | 4 ++-- microbench/pom.xml | 4 ++-- pom.xml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apache-http-client/pom.xml b/apache-http-client/pom.xml index 1e2c186..234a080 100644 --- a/apache-http-client/pom.xml +++ b/apache-http-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.10 + 4.0.11-SNAPSHOT apache-http-client-signature @@ -20,7 +20,7 @@ - 4.0.10 + 4.0.11-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 21e5367..a85af45 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.10 + 4.0.11-SNAPSHOT http-signature-common diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 929b020..37962a3 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -9,7 +9,7 @@ java-http-signature com.joyent.http-signature - 4.0.10 + 4.0.11-SNAPSHOT 4.0.0 @@ -19,7 +19,7 @@ - 4.0.10 + 4.0.11-SNAPSHOT 1.28.0 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 8a9e10f..25a649b 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.10 + 4.0.11-SNAPSHOT jaxrs-client-signature @@ -22,7 +22,7 @@ 1.4.0.Final 1.0.2 - 4.0.10 + 4.0.11-SNAPSHOT 8.0 2.1.1 2.27 diff --git a/microbench/pom.xml b/microbench/pom.xml index 84728b2..baf904c 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -12,7 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. java-http-signature com.joyent.http-signature - 4.0.10 + 4.0.11-SNAPSHOT microbench @@ -20,7 +20,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - 4.0.10 + 4.0.11-SNAPSHOT 1.21 benchmarks diff --git a/pom.xml b/pom.xml index 265458f..87609ba 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.joyent.http-signature java-http-signature - 4.0.10 + 4.0.11-SNAPSHOT pom java-http-signature @@ -61,7 +61,7 @@ scm:git:git://github.com/joyent/java-http-signature.git scm:git:git://github.com/joyent/java-http-signature.git git@github.com:joyent/java-http-signature.git - java-http-signature-4.0.10 + HEAD github.com From a4a726c292474454e8e21814d0e17aa0204c831a Mon Sep 17 00:00:00 2001 From: Ashwin A Nair Date: Wed, 23 Oct 2019 16:43:46 -0700 Subject: [PATCH 21/28] Updated Developer Information --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 87609ba..0fb1465 100644 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,12 @@ Joyent joyent.com + + ashwin@nair.name + Ashwin A Nair + Joyent + joyent.com + Phillip Ross phillip.w.g.ross at gmail.com From 582811ec2402146c3b6fddf362f680a7199bd5dd Mon Sep 17 00:00:00 2001 From: Ashwin Nair Date: Tue, 3 Mar 2020 13:47:14 -0800 Subject: [PATCH 22/28] Upgrade Dependencies (#58) * Dependency Upgrade for java-http-signature * Fixed Checkstyle violations compatible with upgrade * TestNG version fixing testSignedRequestWithFilter, jaxrs-client-signature pom upgrade * Modifications to Signer.java * CHANGELOG.md changes documenting next release --- CHANGELOG.md | 20 +++++++- .../httpclient/HttpSignatureAuthScheme.java | 3 +- .../httpclient/HttpSignatureConfigurator.java | 2 + checkstyle.xml | 23 +++++----- common/pom.xml | 4 +- .../com/joyent/http/signature/Signer.java | 21 +++++---- google-http-client/pom.xml | 2 +- jaxrs-client/pom.xml | 10 ++-- .../SignedRequestClientRequestFilterIT.java | 3 -- .../http/signature/BenchmarkSigner.java | 3 +- pom.xml | 46 +++++++++---------- 11 files changed, 78 insertions(+), 59 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b1f0c6..575df9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.1.0] + +### Changed + - [Upgraded dependencies to latest stable versions:](https://github.com/joyent/java-http-signature/commit/aa0ad5dd209b86129dfe56e22553054056e7b3bb) + - HTTP Signatures dependency: 4.0.9 → 4.0.10 + - BouncyCastle: 1.61 → 1.64 + - Apache HttpClient: 4.5.7 → 4.5.11 + - Google HttpClient: 1.28.0 → 1.32.1 + - Jersey-Client 2.27 → 2.30.1 + - Arquillian 1.4.0.Final → 1.6.0.Final + - Arquillian-TestNG 1.4.0.Final → 1.6.0.Final + - Slfj 1.7.25 → 1.7.30 + - Checkstyle 8.16 → 8.30 + - Commons-Codec 1.11 → 1.13 + - Upgraded maven and maven-plugin dependencies. + - Added checkstyle warnings to [HttpSignatureAuthScheme.java](https://github.com/joyent/java-http-signature/blob/master/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthScheme.java), + [HttpSignatureConfigurator.java](https://github.com/joyent/java-http-signature/blob/master/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureConfigurator.java) and fixed checkstyle errors. + ## [4.0.10] - 2019-02-27 ### Changed @@ -9,7 +27,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - [Upgrade Apache-Http-Client Dependency](https://github.com/joyent/java-http-signature/commit/9ee3137ac7fdc518f5136ee16a3e8161619461f9) - [Upgraded BC Version To 1.61](https://github.com/joyent/java-http-signature/commit/1e72d58f2b05adc7e401ce29cea02233c4bdd725) -## [4.0.9] - 2019-01-15 + ## [4.0.9] - 2019-01-15 ### Changed - Upgraded dependency versions. diff --git a/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthScheme.java b/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthScheme.java index 00a1c59..0f3d19e 100644 --- a/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthScheme.java +++ b/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthScheme.java @@ -33,7 +33,8 @@ * @author Elijah Zupancic * @since 1.0.0 */ -@SuppressWarnings("deprecation") +@SuppressWarnings({"deprecation", "checkstyle:javadocmethod", "checkstyle:javadoctype", + "checkstyle:javadocvariable"}) public class HttpSignatureAuthScheme implements ContextAwareAuthScheme { /** * Name of authentication scheme. diff --git a/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureConfigurator.java b/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureConfigurator.java index 55c0ba4..f7dcc94 100644 --- a/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureConfigurator.java +++ b/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureConfigurator.java @@ -22,6 +22,8 @@ * @author Elijah Zupancic * @since 2.0.5 */ +@SuppressWarnings({"checkstyle:javadocmethod", "checkstyle:javadoctype", + "checkstyle:javadocvariable", "unused"}) public class HttpSignatureConfigurator { /** * Public/private keypair object used to sign HTTP requests. diff --git a/checkstyle.xml b/checkstyle.xml index c11a34d..db65c26 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -42,6 +42,11 @@ + + + + + @@ -69,13 +74,12 @@ - - - - - + + + + - + @@ -101,12 +105,7 @@ - - - - - - + diff --git a/common/pom.xml b/common/pom.xml index a85af45..850fdff 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -20,9 +20,9 @@ - 1.61 + 1.64 2.1.0 - 1.11 + 1.13 diff --git a/common/src/main/java/com/joyent/http/signature/Signer.java b/common/src/main/java/com/joyent/http/signature/Signer.java index c355a2f..61d3e2a 100644 --- a/common/src/main/java/com/joyent/http/signature/Signer.java +++ b/common/src/main/java/com/joyent/http/signature/Signer.java @@ -112,7 +112,7 @@ public Signer(final Builder builder) { httpHeaderAlgorithm = builder.httpHeaderAlgorithm(); if (provider == null) { try { - signature = Signature.getInstance(builder.javaStandardName(provider)); + signature = Signature.getInstance(builder.javaStandardName(null)); } catch (NoSuchAlgorithmException nsae) { throw new CryptoException(nsae); } @@ -215,6 +215,7 @@ public String createAuthorizationHeader(final String login, * @param keyPair public/private keypair * @return value to Authorization header */ + @SuppressWarnings("unused") public String createAuthorizationHeader(final String login, final KeyPair keyPair) { return createAuthorizationHeader(login, keyPair, defaultSignDateAsString()); @@ -652,15 +653,17 @@ public static SigningAlgorithmHelper create(final KeyPair keyPair) { * @return New {@code SigningAlgorithmHelper} instance. */ public static SigningAlgorithmHelper create(final String algorithm) { - if (algorithm.equals("RSA")) { - return new RsaHelper(); - } else if (algorithm.equals("DSA")) { - return new DsaHelper(); + switch (algorithm) { + case "RSA": + return new RsaHelper(); + case "DSA": + return new DsaHelper(); // See NssBridgeKeyConverter on the two names - } else if (algorithm.equals("ECDSA") || algorithm.equals("EC")) { - return new EcdsaHelper(); - } else { - throw new IllegalArgumentException("invalid signing algorithm: " + algorithm); + case "ECDSA": + case "EC": + return new EcdsaHelper(); + default: + throw new IllegalArgumentException("invalid signing algorithm: " + algorithm); } } diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 37962a3..873cf9d 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -20,7 +20,7 @@ 4.0.11-SNAPSHOT - 1.28.0 + 1.32.1 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 25a649b..2e07149 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -20,14 +20,14 @@ - 1.4.0.Final + 1.6.0.Final 1.0.2 4.0.11-SNAPSHOT - 8.0 + 8.0.1 2.1.1 - 2.27 - 5.184 - 1.4.1.Final + 2.30.1 + 5.201 + 1.6.0.Final diff --git a/jaxrs-client/src/test/java/com/joyent/http/signature/jaxrs/client/SignedRequestClientRequestFilterIT.java b/jaxrs-client/src/test/java/com/joyent/http/signature/jaxrs/client/SignedRequestClientRequestFilterIT.java index 651bd7f..50f3ea6 100644 --- a/jaxrs-client/src/test/java/com/joyent/http/signature/jaxrs/client/SignedRequestClientRequestFilterIT.java +++ b/jaxrs-client/src/test/java/com/joyent/http/signature/jaxrs/client/SignedRequestClientRequestFilterIT.java @@ -127,7 +127,6 @@ public void testSignedRequestWithFilter() throws URISyntaxException, IOException } Assert.assertNotNull(response); - Assert.assertNotNull(response.getStatus()); Assert.assertEquals(response.getStatus(), 200); logger.debug("response status code: {}", response.getStatus()); Assert.assertNotNull(response.getMediaType()); @@ -161,6 +160,4 @@ public void testSignedRequestWithFilter() throws URISyntaxException, IOException && authorizationString.contains("signature=") ); } - - } diff --git a/microbench/src/main/java/com/joyent/http/signature/BenchmarkSigner.java b/microbench/src/main/java/com/joyent/http/signature/BenchmarkSigner.java index 2a1dda5..8f7e452 100644 --- a/microbench/src/main/java/com/joyent/http/signature/BenchmarkSigner.java +++ b/microbench/src/main/java/com/joyent/http/signature/BenchmarkSigner.java @@ -88,8 +88,7 @@ public boolean verifyHeaderLatency() { } protected String signHeader(final String now) { - String authzHeader = signer.createAuthorizationHeader("bench", keyPair, now); - return authzHeader; + return signer.createAuthorizationHeader("bench", keyPair, now); } protected boolean verifyHeader(final String ts, final String header) { diff --git a/pom.xml b/pom.xml index 0fb1465..fd6bc88 100644 --- a/pom.xml +++ b/pom.xml @@ -95,36 +95,36 @@ 1 true - 8.16 - 4.5.7 + 8.30 + 4.5.11 6.14.3 - 1.7.25 + 1.7.30 1.2.3 - 3.0.0 - 3.0.0 - 3.7.0 - 3.0.2 - 2.8.2 - 1.4.1 - 2.21.0 + 3.1.1 + 3.1.0 + 3.8.1 + 3.1.1 + 3.0.0-M1 + 3.0.0-M2 + 2.22.2 1.6 - 2.5.2 - 3.0.2 - 1.4 - 3.0.0 - 2.5 + 3.0.0-M1 + 3.2.0 + 3.0.0 + 3.1.1 + 3.0.0 2.5.3 - 3.0.2 - 2.4.2 - 3.0.1 - 2.21.0 - 0.8.1 - 2.9 + 3.1.0 + 3.2.2 + 3.2.1 + 2.22.2 + 0.8.5 + 3.0.0 - 2.8.5 - 2.3.2 + 2.8.6 + 2.3.4 From be90359e1c37afcbf53e976ef1adfd34c48941a5 Mon Sep 17 00:00:00 2001 From: Ashwin A Nair Date: Tue, 3 Mar 2020 15:47:56 -0800 Subject: [PATCH 23/28] [maven-release-plugin] prepare release java-http-signature-4.1.0 --- apache-http-client/pom.xml | 4 ++-- common/pom.xml | 2 +- google-http-client/pom.xml | 4 ++-- jaxrs-client/pom.xml | 4 ++-- microbench/pom.xml | 4 ++-- pom.xml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apache-http-client/pom.xml b/apache-http-client/pom.xml index 234a080..cf56d4f 100644 --- a/apache-http-client/pom.xml +++ b/apache-http-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.11-SNAPSHOT + 4.1.0 apache-http-client-signature @@ -20,7 +20,7 @@ - 4.0.11-SNAPSHOT + 4.1.0 diff --git a/common/pom.xml b/common/pom.xml index 850fdff..87f1d51 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.11-SNAPSHOT + 4.1.0 http-signature-common diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 873cf9d..1127723 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -9,7 +9,7 @@ java-http-signature com.joyent.http-signature - 4.0.11-SNAPSHOT + 4.1.0 4.0.0 @@ -19,7 +19,7 @@ - 4.0.11-SNAPSHOT + 4.1.0 1.32.1 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 2e07149..b3be053 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.0.11-SNAPSHOT + 4.1.0 jaxrs-client-signature @@ -22,7 +22,7 @@ 1.6.0.Final 1.0.2 - 4.0.11-SNAPSHOT + 4.1.0 8.0.1 2.1.1 2.30.1 diff --git a/microbench/pom.xml b/microbench/pom.xml index baf904c..8dcc122 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -12,7 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. java-http-signature com.joyent.http-signature - 4.0.11-SNAPSHOT + 4.1.0 microbench @@ -20,7 +20,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - 4.0.11-SNAPSHOT + 4.1.0 1.21 benchmarks diff --git a/pom.xml b/pom.xml index fd6bc88..63d5fa1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.joyent.http-signature java-http-signature - 4.0.11-SNAPSHOT + 4.1.0 pom java-http-signature @@ -67,7 +67,7 @@ scm:git:git://github.com/joyent/java-http-signature.git scm:git:git://github.com/joyent/java-http-signature.git git@github.com:joyent/java-http-signature.git - HEAD + java-http-signature-4.1.0 github.com From 43252cc5639851613d7c3c4dd1232a324d0ccd53 Mon Sep 17 00:00:00 2001 From: Ashwin A Nair Date: Tue, 3 Mar 2020 15:47:57 -0800 Subject: [PATCH 24/28] [maven-release-plugin] prepare for next development iteration --- apache-http-client/pom.xml | 4 ++-- common/pom.xml | 2 +- google-http-client/pom.xml | 4 ++-- jaxrs-client/pom.xml | 4 ++-- microbench/pom.xml | 4 ++-- pom.xml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apache-http-client/pom.xml b/apache-http-client/pom.xml index cf56d4f..dd1db5c 100644 --- a/apache-http-client/pom.xml +++ b/apache-http-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.1.0 + 4.1.1-SNAPSHOT apache-http-client-signature @@ -20,7 +20,7 @@ - 4.1.0 + 4.1.1-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 87f1d51..72c8983 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.1.0 + 4.1.1-SNAPSHOT http-signature-common diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 1127723..f19f327 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -9,7 +9,7 @@ java-http-signature com.joyent.http-signature - 4.1.0 + 4.1.1-SNAPSHOT 4.0.0 @@ -19,7 +19,7 @@ - 4.1.0 + 4.1.1-SNAPSHOT 1.32.1 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index b3be053..766233f 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.1.0 + 4.1.1-SNAPSHOT jaxrs-client-signature @@ -22,7 +22,7 @@ 1.6.0.Final 1.0.2 - 4.1.0 + 4.1.1-SNAPSHOT 8.0.1 2.1.1 2.30.1 diff --git a/microbench/pom.xml b/microbench/pom.xml index 8dcc122..465f7f7 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -12,7 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. java-http-signature com.joyent.http-signature - 4.1.0 + 4.1.1-SNAPSHOT microbench @@ -20,7 +20,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - 4.1.0 + 4.1.1-SNAPSHOT 1.21 benchmarks diff --git a/pom.xml b/pom.xml index 63d5fa1..85d27c3 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.joyent.http-signature java-http-signature - 4.1.0 + 4.1.1-SNAPSHOT pom java-http-signature @@ -67,7 +67,7 @@ scm:git:git://github.com/joyent/java-http-signature.git scm:git:git://github.com/joyent/java-http-signature.git git@github.com:joyent/java-http-signature.git - java-http-signature-4.1.0 + HEAD github.com From 3e965237fc32b1718edee974c227192e4ca9e5be Mon Sep 17 00:00:00 2001 From: Ashwin Nair Date: Mon, 23 Mar 2020 14:18:36 -0700 Subject: [PATCH 25/28] Dependency upgrade from 2.1.0 -> 3.0.0 (#60) --- common/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/pom.xml b/common/pom.xml index 72c8983..ee8b53b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -21,7 +21,7 @@ 1.64 - 2.1.0 + 3.0.0 1.13 From adad5e0b90b2f5c6b7f362f21805dce515bfb9b6 Mon Sep 17 00:00:00 2001 From: Ashwin Nair Date: Mon, 23 Mar 2020 14:54:11 -0700 Subject: [PATCH 26/28] Release java-http-signature-4.1.1 (#61) * CHANGELOG.md updates * [maven-release-plugin] prepare release java-http-signature-4.1.1 * [maven-release-plugin] prepare for next development iteration --- CHANGELOG.md | 7 ++++++- apache-http-client/pom.xml | 4 ++-- common/pom.xml | 2 +- google-http-client/pom.xml | 4 ++-- jaxrs-client/pom.xml | 4 ++-- microbench/pom.xml | 4 ++-- pom.xml | 2 +- 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 575df9a..1502cf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [4.1.0] +## [4.1.1] - 2020-03-23 + +### Changed +- [Dependency upgrade for jnagmp from 2.1.0 -> 3.0.0](https://github.com/joyent/java-http-signature/pull/60) + +## [4.1.0] - 2020-03-03 ### Changed - [Upgraded dependencies to latest stable versions:](https://github.com/joyent/java-http-signature/commit/aa0ad5dd209b86129dfe56e22553054056e7b3bb) diff --git a/apache-http-client/pom.xml b/apache-http-client/pom.xml index dd1db5c..8c75be1 100644 --- a/apache-http-client/pom.xml +++ b/apache-http-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT apache-http-client-signature @@ -20,7 +20,7 @@ - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index ee8b53b..49f2361 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT http-signature-common diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index f19f327..3258dc9 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -9,7 +9,7 @@ java-http-signature com.joyent.http-signature - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT 4.0.0 @@ -19,7 +19,7 @@ - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT 1.32.1 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 766233f..8102777 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT jaxrs-client-signature @@ -22,7 +22,7 @@ 1.6.0.Final 1.0.2 - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT 8.0.1 2.1.1 2.30.1 diff --git a/microbench/pom.xml b/microbench/pom.xml index 465f7f7..f17fc20 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -12,7 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. java-http-signature com.joyent.http-signature - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT microbench @@ -20,7 +20,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT 1.21 benchmarks diff --git a/pom.xml b/pom.xml index 85d27c3..639a2cd 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.joyent.http-signature java-http-signature - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT pom java-http-signature From fa4e342af7efe5ac39dcbe554d4078decb37e615 Mon Sep 17 00:00:00 2001 From: Ashwin Nair Date: Wed, 8 Apr 2020 16:55:04 -0700 Subject: [PATCH 27/28] Dependency upgrade for BC, Checkstyle & Codec libraries (#62) * Upgrade dependency for BC, checkstyle & codec libraries * CHANGELOG.md updates --- CHANGELOG.md | 8 ++++++++ common/pom.xml | 4 ++-- pom.xml | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1502cf4..0e1b885 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.1.2] + +### Changed +- [Dependency upgrade for BC, Checkstyle & Codec libraries](https://github.com/joyent/java-http-signature/pull/62) + - BouncyCastle: 1.64 → 1.65 + - Commons-Codec: 1.13 → 1.14 + - Checkstyle: 8.30 → 8.3 + ## [4.1.1] - 2020-03-23 ### Changed diff --git a/common/pom.xml b/common/pom.xml index 49f2361..18afe48 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -20,9 +20,9 @@ - 1.64 + 1.65 3.0.0 - 1.13 + 1.14 diff --git a/pom.xml b/pom.xml index 639a2cd..3f645e4 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 1 true - 8.30 + 8.31 4.5.11 6.14.3 1.7.30 From 2fd3953ab313ab1d44c216b3b3558f18fe33e36c Mon Sep 17 00:00:00 2001 From: Ashwin Nair Date: Thu, 9 Apr 2020 13:09:11 -0700 Subject: [PATCH 28/28] Release java-http-signature-4.1.2 (#63) * CHANGELOG.md update * [maven-release-plugin] prepare release java-http-signature-4.1.2 * [maven-release-plugin] prepare for next development iteration --- CHANGELOG.md | 2 +- apache-http-client/pom.xml | 4 ++-- common/pom.xml | 2 +- google-http-client/pom.xml | 4 ++-- jaxrs-client/pom.xml | 4 ++-- microbench/pom.xml | 4 ++-- pom.xml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e1b885..6218877 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [4.1.2] +## [4.1.2] - 2020-04-08 ### Changed - [Dependency upgrade for BC, Checkstyle & Codec libraries](https://github.com/joyent/java-http-signature/pull/62) diff --git a/apache-http-client/pom.xml b/apache-http-client/pom.xml index 8c75be1..67485b3 100644 --- a/apache-http-client/pom.xml +++ b/apache-http-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.1.2-SNAPSHOT + 4.1.3-SNAPSHOT apache-http-client-signature @@ -20,7 +20,7 @@ - 4.1.2-SNAPSHOT + 4.1.3-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 18afe48..9b7e7df 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.1.2-SNAPSHOT + 4.1.3-SNAPSHOT http-signature-common diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 3258dc9..ff094c8 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -9,7 +9,7 @@ java-http-signature com.joyent.http-signature - 4.1.2-SNAPSHOT + 4.1.3-SNAPSHOT 4.0.0 @@ -19,7 +19,7 @@ - 4.1.2-SNAPSHOT + 4.1.3-SNAPSHOT 1.32.1 diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 8102777..a0078ba 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -12,7 +12,7 @@ java-http-signature com.joyent.http-signature - 4.1.2-SNAPSHOT + 4.1.3-SNAPSHOT jaxrs-client-signature @@ -22,7 +22,7 @@ 1.6.0.Final 1.0.2 - 4.1.2-SNAPSHOT + 4.1.3-SNAPSHOT 8.0.1 2.1.1 2.30.1 diff --git a/microbench/pom.xml b/microbench/pom.xml index f17fc20..c5dd7fd 100644 --- a/microbench/pom.xml +++ b/microbench/pom.xml @@ -12,7 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. java-http-signature com.joyent.http-signature - 4.1.2-SNAPSHOT + 4.1.3-SNAPSHOT microbench @@ -20,7 +20,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - 4.1.2-SNAPSHOT + 4.1.3-SNAPSHOT 1.21 benchmarks diff --git a/pom.xml b/pom.xml index 3f645e4..ab30a3b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.joyent.http-signature java-http-signature - 4.1.2-SNAPSHOT + 4.1.3-SNAPSHOT pom java-http-signature