Skip to content
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

[Communication]: Remove state variable in HmacAuthenticationPolicy #21932

Merged
merged 1 commit into from
May 28, 2021
+13 −15
Merged

[Communication]: Remove state variable in HmacAuthenticationPolicy #21932

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions ...src/main/java/com/azure/communication/common/implementation/HmacAuthenticationPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ public final class HmacAuthenticationPolicy implements HttpPipelinePolicy {
DateTimeFormatter.ofPattern("E, dd MMM yyyy HH:mm:ss 'GMT'", Locale.US);

private final AzureKeyCredential credential;

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

/**
Expand All @@ -72,18 +70,7 @@ public HmacAuthenticationPolicy(AzureKeyCredential clientCredential) {
}

@Override
public synchronized Mono<HttpResponse> process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) {
String accessKey = credential.getKey();
byte[] key = Base64.getDecoder().decode(accessKey);
Mac sha256HMAC;
try {
sha256HMAC = Mac.getInstance("HmacSHA256");
sha256HMAC.init(new SecretKeySpec(key, "HmacSHA256"));
} catch (NoSuchAlgorithmException | InvalidKeyException e) {
throw logger.logExceptionAsError(new RuntimeException(e));
}
this.sha256HMAC = sha256HMAC;

public Mono<HttpResponse> process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) {
final Flux<ByteBuffer> contents = context.getHttpRequest().getBody() == null
? Flux.just(ByteBuffer.allocate(0))
: context.getHttpRequest().getBody();
Expand Down Expand Up @@ -136,7 +123,7 @@ private Map<String, String> addAuthenticationHeaders(final URL url,
return headers;
}

private synchronized void addSignatureHeader(final URL url, final String httpMethod, final Map<String, String> httpHeaders) {
private void addSignatureHeader(final URL url, final String httpMethod, final Map<String, String> httpHeaders) {
final String signedHeaderNames = String.join(";", SIGNED_HEADERS);
final String signedHeaderValues = Arrays.stream(SIGNED_HEADERS)
.map(httpHeaders::get)
Expand All @@ -150,6 +137,17 @@ private synchronized void addSignatureHeader(final URL url, final String httpMet
// String-To-Sign=HTTP_METHOD + '\n' + path_and_query + '\n' + signed_headers_values
// The line separator has to be \n. Using %n with String.format will result in a 401 from the service.
String stringToSign = httpMethod.toUpperCase(Locale.US) + "\n" + pathAndQuery + "\n" + signedHeaderValues;

String accessKey = credential.getKey();
byte[] key = Base64.getDecoder().decode(accessKey);
Mac sha256HMAC;
try {
sha256HMAC = Mac.getInstance("HmacSHA256");
sha256HMAC.init(new SecretKeySpec(key, "HmacSHA256"));
} catch (NoSuchAlgorithmException | InvalidKeyException e) {
throw logger.logExceptionAsError(new RuntimeException(e));
}

final String signature =
Base64.getEncoder().encodeToString(sha256HMAC.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8)));
httpHeaders.put(AUTHORIZATIONHEADERNAME, String.format(HMACSHA256FORMAT, signedHeaderNames, signature));
Expand Down