diff options
| author | Tor Brede Vekterli <vekterli@yahooinc.com> | 2022-12-09 11:02:08 +0100 |
|---|---|---|
| committer | Tor Brede Vekterli <vekterli@yahooinc.com> | 2022-12-09 11:02:08 +0100 |
| commit | fb7197b974f76002c3f89e432b0051ffe23d6e40 (patch) | |
| tree | 9882f25f748dac081d3ca47c55cebefbb3ec657b /vespaclient-java | |
| parent | 0f15b405cad738460a8126bf9ef689ec3edfd094 (diff) | |
Allow trailing dots in decryption tool key ID
Makes it easier to include an explicit key version as part of the ID.
Diffstat (limited to 'vespaclient-java')
| -rw-r--r-- | vespaclient-java/src/main/java/com/yahoo/vespa/security/tool/crypto/ToolUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespa/security/tool/crypto/ToolUtils.java b/vespaclient-java/src/main/java/com/yahoo/vespa/security/tool/crypto/ToolUtils.java index 11e227f29b5..fbf0dde0fb2 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespa/security/tool/crypto/ToolUtils.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespa/security/tool/crypto/ToolUtils.java @@ -26,7 +26,7 @@ public class ToolUtils { static final String NO_INTERACTIVE_OPTION = "no-interactive"; static final String PRIVATE_KEY_DIR_ENV_VAR = "VESPA_CRYPTO_CLI_PRIVATE_KEY_DIR"; - static final Pattern SAFE_KEY_ID_PATTERN = Pattern.compile("^[a-zA-Z0-9_-]+$"); + static final Pattern SAFE_KEY_ID_PATTERN = Pattern.compile("^[a-zA-Z0-9_-][a-zA-Z0-9_.-]*$"); static void verifyExpectedKeyId(SealedSharedKey sealedSharedKey, Optional<String> maybeKeyId) { if (maybeKeyId.isPresent()) { |