Skip to content

Fix newline handling on Windows #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2020
Merged

Fix newline handling on Windows #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# CHANGELOG

## [4.0.3] - 2020-05-15

Updated the plugin to fix newlines used in the SigV4 signature on Windows. This resolves [Issue
#12](https://github.com/aws/aws-sigv4-auth-cassandra-java-driver-plugin/issues/12).

## [4.0.2] - 2020-03-31

Changed the plugin to use a `DateTimeFormatter` to ensure precisely 3 digits of millisecond precision for the SigV4
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# IMPORTANT: Latest Version

The current version is 4.0.2. The 4.0.0 version was built with JDK9, which includes a breaking API change in ByteBuffer, despite targetting Java 8 source and bytecode. The 4.0.1 version has a bug related to `Instant.toString()`, which causes signature mismatch errors on JDK9 and later.
The current version is 4.0.3. Please see the [changelog](./CHANGELOG.md) for details on version history.

# What

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>software.aws.mcs</groupId>
<artifactId>aws-sigv4-auth-cassandra-java-driver-plugin</artifactId>
<version>4.0.2</version>
<version>4.0.3</version>
<name>AWS SigV4 Auth Java Driver 4.x Plugin</name>
<description>A Plugin to allow SigV4 authentication for Java Cassandra drivers with Amazon MCS</description>
<url>https://github.com/aws/aws-sigv4-auth-cassandra-java-driver-plugin</url>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/software/aws/mcs/auth/SigV4AuthProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ private String generateSignature(byte[] nonce, Instant requestTimestamp, AWSCred

String canonicalRequest = canonicalizeRequest(credentials.getAWSAccessKeyId(), signingScope, requestTimestamp, nonceHash);

String stringToSign = String.format("%s%n%s%n%s%n%s",
String stringToSign = String.format("%s\n%s\n%s\n%s",
SignerConstants.AWS4_SIGNING_ALGORITHM,
timestampFormatter.format(requestTimestamp),
signingScope,
Expand Down Expand Up @@ -313,7 +313,7 @@ private static String canonicalizeRequest(String accessKey,

String queryString = String.join("&", queryStringHeaders);

return String.format("PUT%n/authenticate%n%s%nhost:%s%n%nhost%n%s",
return String.format("PUT\n/authenticate\n%s\nhost:%s\n\nhost\n%s",
queryString, CANONICAL_SERVICE, payloadHash);
}

Expand Down