Skip to content

Commit

Permalink
Fix DateTimeFormatter Pattern and Jacoco Coverage Configuration (#18388)
Browse files Browse the repository at this point in the history 
Fix DateTimeFormatter pattern and Jacoco coverage configuration
  • Loading branch information
@alzimmermsft
alzimmermsft authored Dec 29, 2020
1 parent 34a28f2 commit 7ffbe01
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 65 deletions.
36 changes: 4 additions & 32 deletions sdk/communication/azure-communication-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<name>Microsoft Azure common library for communication service client</name>
<description>
This package contains data structures commonly used for communicating with Microsoft Azure Communication Services.
This package contains data structures commonly used for communicating with Microsoft Azure Communication Services.
For this release, see notes - https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/communication/azure-communication-common/README.md and https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/communication/azure-communication-common/CHANGELOG.md.
</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>
Expand All @@ -38,6 +38,8 @@
<properties>
<src.dir>src/main</src.dir>
<test.dir>src/test</test.dir>
<jacoco.min.linecoverage>0.50</jacoco.min.linecoverage>
<jacoco.min.branchcoverage>0.50</jacoco.min.branchcoverage>
</properties>

<dependencies>
Expand All @@ -51,7 +53,7 @@
<artifactId>azure-core-http-netty</artifactId>
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<scope>compile</scope>
</dependency>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
Expand Down Expand Up @@ -83,34 +85,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<properties>
<jacoco.min.linecoverage>0.75</jacoco.min.linecoverage>
<jacoco.min.branchcoverage>0.75</jacoco.min.branchcoverage>
</properties>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<configuration>
<rules>
<bannedDependencies>
<includes>
<include>com.azure:*</include>
</includes>
</bannedDependencies>
</rules>
</configuration>
</plugin>
</plugins>
</build>
</project>
57 changes: 24 additions & 33 deletions ...on-common/src/main/java/com/azure/communication/common/CommunicationClientCredential.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,28 @@
// Licensed under the MIT License.
package com.azure.communication.common;

import java.net.URL;
import java.nio.ByteBuffer;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Base64;
import java.util.Objects;

import com.azure.core.util.logging.ClientLogger;
import reactor.core.Exceptions;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import com.azure.core.util.logging.ClientLogger;

import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import java.net.URL;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.security.InvalidKeyException;
import java.time.format.DateTimeFormatter;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.Base64;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

/**
Expand All @@ -36,7 +34,7 @@ public final class CommunicationClientCredential {
private static final String HOST_HEADER = "host";
private static final String CONTENT_HASH_HEADER = "x-ms-content-sha256";
// Order of the headers are important here for generating correct signature
private static final String[] SIGNED_HEADERS = new String[]{DATE_HEADER, HOST_HEADER, CONTENT_HASH_HEADER };
private static final String[] SIGNED_HEADERS = new String[]{DATE_HEADER, HOST_HEADER, CONTENT_HASH_HEADER};

private static final String AUTHORIZATIONHEADERNAME = "Authorization";
private static final String HMACSHA256FORMAT = "HMAC-SHA256 SignedHeaders=%s&Signature=%s";
Expand All @@ -45,52 +43,45 @@ public final class CommunicationClientCredential {
// was an issue with the day of month part. RFC_1123_DATE_TIME does not
// append a leading '0' on days that are less than 10. It is important
// that the locale remain US. In other locals the values that are generated
// for the day and month strings may be different. (e.g. Canada day strings
// for the day and month strings may be different. (e.g. Canada day strings
// have a '.' at the end)
static final DateTimeFormatter HMAC_DATETIMEFORMATTER_PATTERN =
DateTimeFormatter.ofPattern("E, dd MMM YYYY HH:mm:ss 'GMT'", Locale.US);
static final DateTimeFormatter HMAC_DATETIMEFORMATTER_PATTERN =
DateTimeFormatter.ofPattern("E, dd MMM yyyy HH:mm:ss 'GMT'", Locale.US);

private final ClientLogger logger = new ClientLogger(CommunicationClientCredential.class);
private final Mac sha256HMAC;

/**
* Requires resource access key to create the credential
*
* @param accessKey resource access key as provided by Azure in Base64 format
*/
public CommunicationClientCredential(String accessKey) {
Objects.requireNonNull(accessKey, "'accessKey' cannot be null");
byte[] key = Base64.getDecoder().decode(accessKey);
Mac sha256HMAC = null;
Mac sha256HMAC;
try {
sha256HMAC = Mac.getInstance("HmacSHA256");
sha256HMAC.init(new SecretKeySpec(key, "HmacSHA256"));
} catch (NoSuchAlgorithmException e) {
throw logger.logExceptionAsError(new RuntimeException(e));
} catch (InvalidKeyException e) {
} catch (NoSuchAlgorithmException | InvalidKeyException e) {
throw logger.logExceptionAsError(new RuntimeException(e));
}
this.sha256HMAC = sha256HMAC;
}

Mono<Map<String, String>> appendAuthorizationHeaders(URL url, String httpMethod, Flux<ByteBuffer> contents) {
return contents
.collect(() -> {
try {
return MessageDigest.getInstance("SHA-256");
} catch (NoSuchAlgorithmException e) {
throw logger.logExceptionAsError(Exceptions.propagate(e));
}
}, (messageDigest, byteBuffer) -> {
messageDigest.update(byteBuffer);
})
.flatMap(messageDigest -> Mono.just(addAuthenticationHeaders(
url,
httpMethod,
messageDigest)));
return contents.collect(() -> {
try {
return MessageDigest.getInstance("SHA-256");
} catch (NoSuchAlgorithmException e) {
throw logger.logExceptionAsError(Exceptions.propagate(e));
}
}, MessageDigest::update)
.map(messageDigest -> addAuthenticationHeaders(url, httpMethod, messageDigest));
}

private Map<String, String> addAuthenticationHeaders(final URL url, final String httpMethod,
final MessageDigest messageDigest) {
final MessageDigest messageDigest) {
final Map<String, String> headers = new HashMap<>();

final String contentHash = Base64.getEncoder().encodeToString(messageDigest.digest());
Expand Down

0 comments on commit 7ffbe01

Please sign in to comment.