Updated CryptographyServiceClient to preserve the HTTP port if provided in a key identifier.
#24539
Conversation
…ed in a key identifier.
ghost
added
the
|
API changes have been detected in API changes + public CryptographyAsyncClient getCryptographyAsyncClient(String keyName)
+ public CryptographyAsyncClient getCryptographyAsyncClient(String keyName, String keyVersion)
+ public CryptographyClient getCryptographyClient(String keyName)
+ public CryptographyClient getCryptographyClient(String keyName, String keyVersion) |
| @@ -797,6 +797,11 @@ private void unpackAndValidateId(String keyId) { | |||
| URL url = new URL(keyId); | |||
| String[] tokens = url.getPath().split("/"); | |||
| String endpoint = url.getProtocol() + "://" + url.getHost(); | |||
|
|
|||
| if (url.getPort() != -1) { | |||
| endpoint += ":" + url.getPort(); | |||
There was a problem hiding this comment.
If supported by versions of Java we support,
have you looked at https://docs.oracle.com/javase/7/docs/api/java/net/URL.html#getAuthority()? It will return both host and port (if port is provided)
String endpoint = url.getProtocol() + "://" + url.getAuthority();There was a problem hiding this comment.
Great suggestion, thank you Maor!
There was a problem hiding this comment.
@maorleger Now that I think about it, getAuthority() also includes username and password information if present on the URL, would we want to include any of that in the key identifier in case somebody actually includes it?
There was a problem hiding this comment.
I'll play it safe and use getHost() and getPort() for now.
There was a problem hiding this comment.
That makes sense! Sorry, was afk
Fixes: #24508.