diff options
| author | Tor Brede Vekterli <vekterli@yahooinc.com> | 2022-12-09 11:28:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-09 11:28:40 +0100 |
| commit | 63e0907c8e3f4775e43d0046f6ade647d32ce1ca (patch) | |
| tree | 1196592fc270db89910fe71e089188b53312bc66 | |
| parent | f6b952ee9097ae7c2c10ca00962bb5b4ac543d24 (diff) | |
| parent | fb7197b974f76002c3f89e432b0051ffe23d6e40 (diff) | |
Merge pull request #25182 from vespa-engine/vekterli/allow-trailing-dots-in-tool-key-id
Allow trailing dots in decryption tool key ID
| -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()) { |