1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
|
// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package ai.vespa.hosted.api;
import com.yahoo.security.KeyUtils;
import com.yahoo.security.SignatureUtils;
import java.io.InputStream;
import java.net.http.HttpRequest;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.Signature;
import java.security.SignatureException;
import java.time.Clock;
import java.util.Base64;
import java.util.function.Supplier;
import static ai.vespa.hosted.api.Signatures.sha256Digest;
import static com.yahoo.security.SignatureAlgorithm.SHA256_WITH_ECDSA;
import static java.nio.charset.StandardCharsets.UTF_8;
/**
* Signs HTTP request headers using a private key, for verification by the indicated public key.
*
* @author jonmv
*/
public class RequestSigner {
private final Signature signer;
private final String keyId;
private final String base64PemPublicKey;
private final Clock clock;
/** Creates a new request signer from the given PEM encoded ECDSA key, with a public key with the given ID. */
public RequestSigner(String pemPrivateKey, String keyId) {
this(pemPrivateKey, keyId, Clock.systemUTC());
}
/** Creates a new request signer with a custom clock. */
public RequestSigner(String pemPrivateKey, String keyId, Clock clock) {
this(KeyUtils.fromPemEncodedPrivateKey(pemPrivateKey), keyId, clock);
}
/** Creates a new request signer with a custom clock. */
public RequestSigner(PrivateKey privateKey, String keyId, Clock clock) {
this.signer = SignatureUtils.createSigner(privateKey, SHA256_WITH_ECDSA);
this.keyId = keyId;
this.base64PemPublicKey = Base64.getEncoder().encodeToString(KeyUtils.toPem(KeyUtils.extractPublicKey(privateKey)).getBytes(UTF_8));
PublicKey key = KeyUtils.extractPublicKey(privateKey);
this.clock = clock;
}
/**
* Completes, signs and returns the given request builder and data.<br>
* <br>
* The request builder's method and data are set to the given arguments, and a hash of the
* content is computed and added to a header, together with other meta data, like the URI
* of the request, the current UTC time, and the id and value of the public key which shall
* be used to * verify this signature.
* Finally, a signature is computed from these fields, based on the private key of this, and
* added to the request as another header.
*/
public HttpRequest signed(HttpRequest.Builder request, Method method, Supplier<InputStream> data) {
try {
String timestamp = clock.instant().toString();
String contentHash = Base64.getEncoder().encodeToString(sha256Digest(data::get));
byte[] canonicalMessage = Signatures.canonicalMessageOf(method.name(), request.copy().build().uri(), timestamp, contentHash);
signer.update(canonicalMessage);
String signature = Base64.getEncoder().encodeToString(signer.sign());
request.setHeader("X-Timestamp", timestamp);
request.setHeader("X-Content-Hash", contentHash);
request.setHeader("X-Key-Id", keyId);
request.setHeader("X-Key", base64PemPublicKey);
request.setHeader("X-Authorization", signature);
request.method(method.name(), HttpRequest.BodyPublishers.ofInputStream(data));
return request.build();
}
catch (SignatureException e) {
throw new IllegalArgumentException(e);
}
}
// TODO jonmv: Simulates old clients — remove shortly (2 Oct 2019).
public HttpRequest legacySigned(HttpRequest.Builder request, Method method, Supplier<InputStream> data) {
try {
String timestamp = clock.instant().toString();
String contentHash = Base64.getEncoder().encodeToString(sha256Digest(data::get));
byte[] canonicalMessage = Signatures.canonicalMessageOf(method.name(), request.copy().build().uri(), timestamp, contentHash);
signer.update(canonicalMessage);
String signature = Base64.getEncoder().encodeToString(signer.sign());
request.setHeader("X-Timestamp", timestamp);
request.setHeader("X-Content-Hash", contentHash);
request.setHeader("X-Key-Id", keyId);
request.setHeader("X-Authorization", signature);
request.method(method.name(), HttpRequest.BodyPublishers.ofInputStream(data));
return request.build();
}
catch (SignatureException e) {
throw new IllegalArgumentException(e);
}
}
}
|