diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-06-23 14:35:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-23 14:35:02 +0200 |
commit | 7a7279d2980cd4099b8070cbf0c298dc8d666301 (patch) | |
tree | 7dde57616d70125dc9df8fc4d24793eeb086bc73 /hosted-api/src/main/java/ai/vespa/hosted/api/RequestSigner.java | |
parent | 72e118f0ce52eadc644c4012b96e3b3bd8e57dd1 (diff) | |
parent | cb7f6a43f4f18e0d172f25bac640c8c52753b9b6 (diff) |
Merge pull request #13670 from vespa-engine/jonmv/signatures-cleanup
Remove unused code
Diffstat (limited to 'hosted-api/src/main/java/ai/vespa/hosted/api/RequestSigner.java')
-rw-r--r-- | hosted-api/src/main/java/ai/vespa/hosted/api/RequestSigner.java | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/RequestSigner.java b/hosted-api/src/main/java/ai/vespa/hosted/api/RequestSigner.java index 5d314d90356..fa610b9dece 100644 --- a/hosted-api/src/main/java/ai/vespa/hosted/api/RequestSigner.java +++ b/hosted-api/src/main/java/ai/vespa/hosted/api/RequestSigner.java @@ -7,7 +7,6 @@ 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; @@ -45,7 +44,6 @@ public class RequestSigner { 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; } @@ -81,26 +79,4 @@ public class RequestSigner { } } - // 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); - } - } - } |