From 1e75ee27385bd813ebcf4cc1d2aabb945cee7de2 Mon Sep 17 00:00:00 2001 From: Esta Nagy <nagyesta@gmail.com> Date: Thu, 26 Sep 2024 21:36:39 +0200 Subject: [PATCH] Bugfix: URLs should be case-insensitive (#1159) - Adds additional mappings to controller endpoints with two word path segments to mitigate inaccuracies in the clients which might expect camelCase paths in these cases Updates #1158 {patch} Signed-off-by: Esta Nagy <nagyesta@gmail.com> --- .../lowkeyvault/controller/v7_2/KeyController.java | 12 ++++++++---- .../controller/v7_2/KeyCryptoController.java | 6 ++++-- .../controller/v7_2/SecretController.java | 12 ++++++++---- .../controller/v7_3/CertificateController.java | 12 ++++++++---- .../lowkeyvault/controller/v7_3/KeyController.java | 12 ++++++++---- .../controller/v7_3/KeyCryptoController.java | 6 ++++-- .../controller/v7_3/KeyPolicyController.java | 6 ++++-- .../controller/v7_3/SecretController.java | 12 ++++++++---- .../controller/v7_4/CertificateController.java | 12 ++++++++---- .../lowkeyvault/controller/v7_4/KeyController.java | 12 ++++++++---- .../controller/v7_4/KeyCryptoController.java | 6 ++++-- .../controller/v7_4/KeyPolicyController.java | 6 ++++-- .../controller/v7_4/SecretController.java | 12 ++++++++---- .../controller/v7_5/CertificateController.java | 12 ++++++++---- .../lowkeyvault/controller/v7_5/KeyController.java | 12 ++++++++---- .../controller/v7_5/KeyCryptoController.java | 6 ++++-- .../controller/v7_5/KeyPolicyController.java | 6 ++++-- .../controller/v7_5/SecretController.java | 12 ++++++++---- 18 files changed, 116 insertions(+), 58 deletions(-) diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_2/KeyController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_2/KeyController.java index 1fc1a821..7b1f7bc7 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_2/KeyController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_2/KeyController.java @@ -97,7 +97,8 @@ public ResponseEntity<KeyVaultItemListModel<KeyVaultKeyItemModel>> listKeys( } @Override - @GetMapping(value = {"/deletedkeys", "/deletedkeys/"}, + @GetMapping(value = {"/deletedkeys", "/deletedkeys/", + "/deletedKeys", "/deletedKeys/"}, params = API_VERSION_7_2, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultItemListModel<DeletedKeyVaultKeyItemModel>> listDeletedKeys( @@ -142,7 +143,8 @@ public ResponseEntity<KeyVaultKeyModel> updateVersion( } @Override - @GetMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/"}, + @GetMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/", + "/deletedKeys/{keyName}", "/deletedKeys/{keyName}/"}, params = API_VERSION_7_2, produces = APPLICATION_JSON_VALUE) public ResponseEntity<DeletedKeyVaultKeyModel> getDeletedKey( @@ -152,7 +154,8 @@ public ResponseEntity<DeletedKeyVaultKeyModel> getDeletedKey( } @Override - @PostMapping(value = {"/deletedkeys/{keyName}/recover", "/deletedkeys/{keyName}/recover/"}, + @PostMapping(value = {"/deletedkeys/{keyName}/recover", "/deletedkeys/{keyName}/recover/", + "/deletedKeys/{keyName}/recover", "/deletedKeys/{keyName}/recover/"}, params = API_VERSION_7_2, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultKeyModel> recoverDeletedKey( @@ -162,7 +165,8 @@ public ResponseEntity<KeyVaultKeyModel> recoverDeletedKey( } @Override - @DeleteMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/"}, + @DeleteMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/", + "/deletedKeys/{keyName}", "/deletedKeys/{keyName}/"}, params = API_VERSION_7_2, produces = APPLICATION_JSON_VALUE) public ResponseEntity<Void> purgeDeleted( diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_2/KeyCryptoController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_2/KeyCryptoController.java index f8fd9980..3a0b6247 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_2/KeyCryptoController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_2/KeyCryptoController.java @@ -39,7 +39,8 @@ public KeyCryptoController(@NonNull final KeyConverterRegistry registry, @NonNul @Override @PostMapping(value = {"/keys/{keyName}/{keyVersion}/encrypt", "/keys/{keyName}/{keyVersion}/encrypt/", - "/keys/{keyName}/{keyVersion}/wrapkey", "/keys/{keyName}/{keyVersion}/wrapkey/"}, + "/keys/{keyName}/{keyVersion}/wrapkey", "/keys/{keyName}/{keyVersion}/wrapkey/", + "/keys/{keyName}/{keyVersion}/wrapKey", "/keys/{keyName}/{keyVersion}/wrapKey/"}, params = API_VERSION_7_2, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE) @@ -53,7 +54,8 @@ public ResponseEntity<KeyOperationsResult> encrypt( @Override @PostMapping(value = {"/keys/{keyName}/{keyVersion}/decrypt", "/keys/{keyName}/{keyVersion}/decrypt/", - "/keys/{keyName}/{keyVersion}/unwrapkey", "/keys/{keyName}/{keyVersion}/unwrapkey/"}, + "/keys/{keyName}/{keyVersion}/unwrapkey", "/keys/{keyName}/{keyVersion}/unwrapkey/", + "/keys/{keyName}/{keyVersion}/unwrapKey", "/keys/{keyName}/{keyVersion}/unwrapKey/"}, params = API_VERSION_7_2, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE) diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_2/SecretController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_2/SecretController.java index 16854423..875685f6 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_2/SecretController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_2/SecretController.java @@ -84,7 +84,8 @@ public ResponseEntity<KeyVaultItemListModel<KeyVaultSecretItemModel>> listSecret } @Override - @GetMapping(value = {"/deletedsecrets", "/deletedsecrets/"}, + @GetMapping(value = {"/deletedsecrets", "/deletedsecrets/", + "/deletedSecrets", "/deletedSecrets/"}, params = API_VERSION_7_2, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultItemListModel<DeletedKeyVaultSecretItemModel>> listDeletedSecrets( @@ -129,7 +130,8 @@ public ResponseEntity<KeyVaultSecretModel> updateVersion( } @Override - @GetMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/"}, + @GetMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/", + "/deletedSecrets/{secretName}", "/deletedSecrets/{secretName}/"}, params = API_VERSION_7_2, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultSecretModel> getDeletedSecret( @@ -139,7 +141,8 @@ public ResponseEntity<KeyVaultSecretModel> getDeletedSecret( } @Override - @DeleteMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/"}, + @DeleteMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/", + "/deletedSecrets/{secretName}", "/deletedSecrets/{secretName}/"}, params = API_VERSION_7_2, produces = APPLICATION_JSON_VALUE) public ResponseEntity<Void> purgeDeleted( @@ -149,7 +152,8 @@ public ResponseEntity<Void> purgeDeleted( } @Override - @PostMapping(value = {"/deletedsecrets/{secretName}/recover", "/deletedsecrets/{secretName}/recover/"}, + @PostMapping(value = {"/deletedsecrets/{secretName}/recover", "/deletedsecrets/{secretName}/recover/", + "/deletedSecrets/{secretName}/recover", "/deletedSecrets/{secretName}/recover/"}, params = API_VERSION_7_2, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultSecretModel> recoverDeletedSecret( diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/CertificateController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/CertificateController.java index b6e13ea5..90baa65d 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/CertificateController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/CertificateController.java @@ -94,7 +94,8 @@ public ResponseEntity<DeletedKeyVaultCertificateModel> delete( @Override @GetMapping( - value = {"/deletedcertificates/{certificateName}", "/deletedcertificates/{certificateName}/"}, + value = {"/deletedcertificates/{certificateName}", "/deletedcertificates/{certificateName}/", + "/deletedCertificates/{certificateName}", "/deletedCertificates/{certificateName}/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<DeletedKeyVaultCertificateModel> getDeletedCertificate( @@ -105,7 +106,8 @@ public ResponseEntity<DeletedKeyVaultCertificateModel> getDeletedCertificate( @Override @PostMapping( - value = {"/deletedcertificates/{certificateName}/recover", "/deletedcertificates/{certificateName}/recover/"}, + value = {"/deletedcertificates/{certificateName}/recover", "/deletedcertificates/{certificateName}/recover/", + "/deletedCertificates/{certificateName}/recover", "/deletedCertificates/{certificateName}/recover/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultCertificateModel> recoverDeletedCertificate( @@ -116,7 +118,8 @@ public ResponseEntity<KeyVaultCertificateModel> recoverDeletedCertificate( @Override @DeleteMapping( - value = {"/deletedcertificates/{certificateName}", "/deletedcertificates/{certificateName}/"}, + value = {"/deletedcertificates/{certificateName}", "/deletedcertificates/{certificateName}/", + "/deletedCertificates/{certificateName}", "/deletedCertificates/{certificateName}/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<Void> purgeDeleted( @@ -153,7 +156,8 @@ public ResponseEntity<KeyVaultItemListModel<KeyVaultCertificateItemModel>> listC @Override @GetMapping( - value = {"/deletedcertificates", "/deletedcertificates/"}, + value = {"/deletedcertificates", "/deletedcertificates/", + "/deletedCertificates", "/deletedCertificates/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultItemListModel<DeletedKeyVaultCertificateItemModel>> listDeletedCertificates( diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyController.java index e39e6921..41c0aac4 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyController.java @@ -99,7 +99,8 @@ public ResponseEntity<KeyVaultItemListModel<KeyVaultKeyItemModel>> listKeys( } @Override - @GetMapping(value = {"/deletedkeys", "/deletedkeys/"}, + @GetMapping(value = {"/deletedkeys", "/deletedkeys/", + "/deletedKeys", "/deletedKeys/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultItemListModel<DeletedKeyVaultKeyItemModel>> listDeletedKeys( @@ -158,7 +159,8 @@ public ResponseEntity<KeyVaultKeyModel> rotateKey( } @Override - @GetMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/"}, + @GetMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/", + "/deletedKeys/{keyName}", "/deletedKeys/{keyName}/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<DeletedKeyVaultKeyModel> getDeletedKey( @@ -168,7 +170,8 @@ public ResponseEntity<DeletedKeyVaultKeyModel> getDeletedKey( } @Override - @PostMapping(value = {"/deletedkeys/{keyName}/recover", "/deletedkeys/{keyName}/recover/"}, + @PostMapping(value = {"/deletedkeys/{keyName}/recover", "/deletedkeys/{keyName}/recover/", + "/deletedKeys/{keyName}/recover", "/deletedKeys/{keyName}/recover/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultKeyModel> recoverDeletedKey( @@ -178,7 +181,8 @@ public ResponseEntity<KeyVaultKeyModel> recoverDeletedKey( } @Override - @DeleteMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/"}, + @DeleteMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/", + "/deletedKeys/{keyName}", "/deletedKeys/{keyName}/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<Void> purgeDeleted( diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyCryptoController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyCryptoController.java index cae7243e..1f3137bf 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyCryptoController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyCryptoController.java @@ -42,7 +42,8 @@ public KeyCryptoController(@NonNull final KeyConverterRegistry registry, @NonNul @Override @PostMapping(value = {"/keys/{keyName}/{keyVersion}/encrypt", "/keys/{keyName}/{keyVersion}/encrypt/", - "/keys/{keyName}/{keyVersion}/wrapkey", "/keys/{keyName}/{keyVersion}/wrapkey/"}, + "/keys/{keyName}/{keyVersion}/wrapkey", "/keys/{keyName}/{keyVersion}/wrapkey/", + "/keys/{keyName}/{keyVersion}/wrapKey", "/keys/{keyName}/{keyVersion}/wrapKey/"}, params = API_VERSION_7_3, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE) @@ -56,7 +57,8 @@ public ResponseEntity<KeyOperationsResult> encrypt( @Override @PostMapping(value = {"/keys/{keyName}/{keyVersion}/decrypt", "/keys/{keyName}/{keyVersion}/decrypt/", - "/keys/{keyName}/{keyVersion}/unwrapkey", "/keys/{keyName}/{keyVersion}/unwrapkey/"}, + "/keys/{keyName}/{keyVersion}/unwrapkey", "/keys/{keyName}/{keyVersion}/unwrapkey/", + "/keys/{keyName}/{keyVersion}/unwrapKey", "/keys/{keyName}/{keyVersion}/unwrapKey/"}, params = API_VERSION_7_3, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE) diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyPolicyController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyPolicyController.java index 87f0765c..2c6945e8 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyPolicyController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyPolicyController.java @@ -31,7 +31,8 @@ public KeyPolicyController(@NonNull final KeyConverterRegistry registry, @NonNul super(registry, vaultService); } - @GetMapping(value = {"/keys/{keyName}/rotationpolicy", "/keys/{keyName}/rotationpolicy/"}, + @GetMapping(value = {"/keys/{keyName}/rotationpolicy", "/keys/{keyName}/rotationpolicy/", + "/keys/{keyName}/rotationPolicy", "/keys/{keyName}/rotationPolicy/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyRotationPolicyModel> getRotationPolicy( @@ -40,7 +41,8 @@ public ResponseEntity<KeyRotationPolicyModel> getRotationPolicy( return super.getRotationPolicy(keyName, baseUri); } - @PutMapping(value = {"/keys/{keyName}/rotationpolicy", "/keys/{keyName}/rotationpolicy/"}, + @PutMapping(value = {"/keys/{keyName}/rotationpolicy", "/keys/{keyName}/rotationpolicy/", + "/keys/{keyName}/rotationPolicy", "/keys/{keyName}/rotationPolicy/"}, params = API_VERSION_7_3, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE) diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/SecretController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/SecretController.java index 0c354eef..0e2e09eb 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/SecretController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_3/SecretController.java @@ -84,7 +84,8 @@ public ResponseEntity<KeyVaultItemListModel<KeyVaultSecretItemModel>> listSecret } @Override - @GetMapping(value = {"/deletedsecrets", "/deletedsecrets/"}, + @GetMapping(value = {"/deletedsecrets", "/deletedsecrets/", + "/deletedSecrets", "/deletedSecrets/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultItemListModel<DeletedKeyVaultSecretItemModel>> listDeletedSecrets( @@ -129,7 +130,8 @@ public ResponseEntity<KeyVaultSecretModel> updateVersion( } @Override - @GetMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/"}, + @GetMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/", + "/deletedSecrets/{secretName}", "/deletedSecrets/{secretName}/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultSecretModel> getDeletedSecret( @@ -139,7 +141,8 @@ public ResponseEntity<KeyVaultSecretModel> getDeletedSecret( } @Override - @DeleteMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/"}, + @DeleteMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/", + "/deletedSecrets/{secretName}", "/deletedSecrets/{secretName}/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<Void> purgeDeleted( @@ -149,7 +152,8 @@ public ResponseEntity<Void> purgeDeleted( } @Override - @PostMapping(value = {"/deletedsecrets/{secretName}/recover", "/deletedsecrets/{secretName}/recover/"}, + @PostMapping(value = {"/deletedsecrets/{secretName}/recover", "/deletedsecrets/{secretName}/recover/", + "/deletedSecrets/{secretName}/recover", "/deletedSecrets/{secretName}/recover/"}, params = API_VERSION_7_3, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultSecretModel> recoverDeletedSecret( diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/CertificateController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/CertificateController.java index cc0bee12..f744acd4 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/CertificateController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/CertificateController.java @@ -94,7 +94,8 @@ public ResponseEntity<DeletedKeyVaultCertificateModel> delete( @Override @GetMapping( - value = {"/deletedcertificates/{certificateName}", "/deletedcertificates/{certificateName}/"}, + value = {"/deletedcertificates/{certificateName}", "/deletedcertificates/{certificateName}/", + "/deletedCertificates/{certificateName}", "/deletedCertificates/{certificateName}/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<DeletedKeyVaultCertificateModel> getDeletedCertificate( @@ -105,7 +106,8 @@ public ResponseEntity<DeletedKeyVaultCertificateModel> getDeletedCertificate( @Override @PostMapping( - value = {"/deletedcertificates/{certificateName}/recover", "/deletedcertificates/{certificateName}/recover/"}, + value = {"/deletedcertificates/{certificateName}/recover", "/deletedcertificates/{certificateName}/recover/", + "/deletedCertificates/{certificateName}/recover", "/deletedCertificates/{certificateName}/recover/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultCertificateModel> recoverDeletedCertificate( @@ -116,7 +118,8 @@ public ResponseEntity<KeyVaultCertificateModel> recoverDeletedCertificate( @Override @DeleteMapping( - value = {"/deletedcertificates/{certificateName}", "/deletedcertificates/{certificateName}/"}, + value = {"/deletedcertificates/{certificateName}", "/deletedcertificates/{certificateName}/", + "/deletedCertificates/{certificateName}", "/deletedCertificates/{certificateName}/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<Void> purgeDeleted( @@ -153,7 +156,8 @@ public ResponseEntity<KeyVaultItemListModel<KeyVaultCertificateItemModel>> listC @Override @GetMapping( - value = {"/deletedcertificates", "/deletedcertificates/"}, + value = {"/deletedcertificates", "/deletedcertificates/", + "/deletedCertificates", "/deletedCertificates/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultItemListModel<DeletedKeyVaultCertificateItemModel>> listDeletedCertificates( diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/KeyController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/KeyController.java index 30e457ff..8de6352e 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/KeyController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/KeyController.java @@ -99,7 +99,8 @@ public ResponseEntity<KeyVaultItemListModel<KeyVaultKeyItemModel>> listKeys( } @Override - @GetMapping(value = {"/deletedkeys", "/deletedkeys/"}, + @GetMapping(value = {"/deletedkeys", "/deletedkeys/", + "/deletedKeys", "/deletedKeys/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultItemListModel<DeletedKeyVaultKeyItemModel>> listDeletedKeys( @@ -158,7 +159,8 @@ public ResponseEntity<KeyVaultKeyModel> rotateKey( } @Override - @GetMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/"}, + @GetMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/", + "/deletedKeys/{keyName}", "/deletedKeys/{keyName}/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<DeletedKeyVaultKeyModel> getDeletedKey( @@ -168,7 +170,8 @@ public ResponseEntity<DeletedKeyVaultKeyModel> getDeletedKey( } @Override - @PostMapping(value = {"/deletedkeys/{keyName}/recover", "/deletedkeys/{keyName}/recover/"}, + @PostMapping(value = {"/deletedkeys/{keyName}/recover", "/deletedkeys/{keyName}/recover/", + "/deletedKeys/{keyName}/recover", "/deletedKeys/{keyName}/recover/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultKeyModel> recoverDeletedKey( @@ -178,7 +181,8 @@ public ResponseEntity<KeyVaultKeyModel> recoverDeletedKey( } @Override - @DeleteMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/"}, + @DeleteMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/", + "/deletedKeys/{keyName}", "/deletedKeys/{keyName}/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<Void> purgeDeleted( diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/KeyCryptoController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/KeyCryptoController.java index 89d29ac2..3ed6e8f7 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/KeyCryptoController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/KeyCryptoController.java @@ -42,7 +42,8 @@ public KeyCryptoController(@NonNull final KeyConverterRegistry registry, @NonNul @Override @PostMapping(value = {"/keys/{keyName}/{keyVersion}/encrypt", "/keys/{keyName}/{keyVersion}/encrypt/", - "/keys/{keyName}/{keyVersion}/wrapkey", "/keys/{keyName}/{keyVersion}/wrapkey/"}, + "/keys/{keyName}/{keyVersion}/wrapkey", "/keys/{keyName}/{keyVersion}/wrapkey/", + "/keys/{keyName}/{keyVersion}/wrapKey", "/keys/{keyName}/{keyVersion}/wrapKey/"}, params = API_VERSION_7_4, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE) @@ -56,7 +57,8 @@ public ResponseEntity<KeyOperationsResult> encrypt( @Override @PostMapping(value = {"/keys/{keyName}/{keyVersion}/decrypt", "/keys/{keyName}/{keyVersion}/decrypt/", - "/keys/{keyName}/{keyVersion}/unwrapkey", "/keys/{keyName}/{keyVersion}/unwrapkey/"}, + "/keys/{keyName}/{keyVersion}/unwrapkey", "/keys/{keyName}/{keyVersion}/unwrapkey/", + "/keys/{keyName}/{keyVersion}/unwrapKey", "/keys/{keyName}/{keyVersion}/unwrapKey/"}, params = API_VERSION_7_4, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE) diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/KeyPolicyController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/KeyPolicyController.java index 2c8716ba..69a5bb1b 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/KeyPolicyController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/KeyPolicyController.java @@ -31,7 +31,8 @@ public KeyPolicyController(@NonNull final KeyConverterRegistry registry, @NonNul super(registry, vaultService); } - @GetMapping(value = {"/keys/{keyName}/rotationpolicy", "/keys/{keyName}/rotationpolicy/"}, + @GetMapping(value = {"/keys/{keyName}/rotationpolicy", "/keys/{keyName}/rotationpolicy/", + "/keys/{keyName}/rotationPolicy", "/keys/{keyName}/rotationPolicy/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyRotationPolicyModel> getRotationPolicy( @@ -40,7 +41,8 @@ public ResponseEntity<KeyRotationPolicyModel> getRotationPolicy( return super.getRotationPolicy(keyName, baseUri); } - @PutMapping(value = {"/keys/{keyName}/rotationpolicy", "/keys/{keyName}/rotationpolicy/"}, + @PutMapping(value = {"/keys/{keyName}/rotationpolicy", "/keys/{keyName}/rotationpolicy/", + "/keys/{keyName}/rotationPolicy", "/keys/{keyName}/rotationPolicy/"}, params = API_VERSION_7_4, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE) diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/SecretController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/SecretController.java index 79dbdf51..10584506 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/SecretController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_4/SecretController.java @@ -84,7 +84,8 @@ public ResponseEntity<KeyVaultItemListModel<KeyVaultSecretItemModel>> listSecret } @Override - @GetMapping(value = {"/deletedsecrets", "/deletedsecrets/"}, + @GetMapping(value = {"/deletedsecrets", "/deletedsecrets/", + "/deletedSecrets", "/deletedSecrets/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultItemListModel<DeletedKeyVaultSecretItemModel>> listDeletedSecrets( @@ -129,7 +130,8 @@ public ResponseEntity<KeyVaultSecretModel> updateVersion( } @Override - @GetMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/"}, + @GetMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/", + "/deletedSecrets/{secretName}", "/deletedSecrets/{secretName}/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultSecretModel> getDeletedSecret( @@ -139,7 +141,8 @@ public ResponseEntity<KeyVaultSecretModel> getDeletedSecret( } @Override - @DeleteMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/"}, + @DeleteMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/", + "/deletedSecrets/{secretName}", "/deletedSecrets/{secretName}/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<Void> purgeDeleted( @@ -149,7 +152,8 @@ public ResponseEntity<Void> purgeDeleted( } @Override - @PostMapping(value = {"/deletedsecrets/{secretName}/recover", "/deletedsecrets/{secretName}/recover/"}, + @PostMapping(value = {"/deletedsecrets/{secretName}/recover", "/deletedsecrets/{secretName}/recover/", + "/deletedSecrets/{secretName}/recover", "/deletedSecrets/{secretName}/recover/"}, params = API_VERSION_7_4, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultSecretModel> recoverDeletedSecret( diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/CertificateController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/CertificateController.java index e05d9938..2e625e59 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/CertificateController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/CertificateController.java @@ -94,7 +94,8 @@ public ResponseEntity<DeletedKeyVaultCertificateModel> delete( @Override @GetMapping( - value = {"/deletedcertificates/{certificateName}", "/deletedcertificates/{certificateName}/"}, + value = {"/deletedcertificates/{certificateName}", "/deletedcertificates/{certificateName}/", + "/deletedCertificates/{certificateName}", "/deletedCertificates/{certificateName}/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<DeletedKeyVaultCertificateModel> getDeletedCertificate( @@ -105,7 +106,8 @@ public ResponseEntity<DeletedKeyVaultCertificateModel> getDeletedCertificate( @Override @PostMapping( - value = {"/deletedcertificates/{certificateName}/recover", "/deletedcertificates/{certificateName}/recover/"}, + value = {"/deletedcertificates/{certificateName}/recover", "/deletedcertificates/{certificateName}/recover/", + "/deletedCertificates/{certificateName}/recover", "/deletedCertificates/{certificateName}/recover/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultCertificateModel> recoverDeletedCertificate( @@ -116,7 +118,8 @@ public ResponseEntity<KeyVaultCertificateModel> recoverDeletedCertificate( @Override @DeleteMapping( - value = {"/deletedcertificates/{certificateName}", "/deletedcertificates/{certificateName}/"}, + value = {"/deletedcertificates/{certificateName}", "/deletedcertificates/{certificateName}/", + "/deletedCertificates/{certificateName}", "/deletedCertificates/{certificateName}/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<Void> purgeDeleted( @@ -153,7 +156,8 @@ public ResponseEntity<KeyVaultItemListModel<KeyVaultCertificateItemModel>> listC @Override @GetMapping( - value = {"/deletedcertificates", "/deletedcertificates/"}, + value = {"/deletedcertificates", "/deletedcertificates/", + "/deletedCertificates", "/deletedCertificates/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultItemListModel<DeletedKeyVaultCertificateItemModel>> listDeletedCertificates( diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/KeyController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/KeyController.java index 6614112e..d4ba9838 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/KeyController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/KeyController.java @@ -99,7 +99,8 @@ public ResponseEntity<KeyVaultItemListModel<KeyVaultKeyItemModel>> listKeys( } @Override - @GetMapping(value = {"/deletedkeys", "/deletedkeys/"}, + @GetMapping(value = {"/deletedkeys", "/deletedkeys/", + "/deletedKeys", "/deletedKeys/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultItemListModel<DeletedKeyVaultKeyItemModel>> listDeletedKeys( @@ -158,7 +159,8 @@ public ResponseEntity<KeyVaultKeyModel> rotateKey( } @Override - @GetMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/"}, + @GetMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/", + "/deletedKeys/{keyName}", "/deletedKeys/{keyName}/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<DeletedKeyVaultKeyModel> getDeletedKey( @@ -168,7 +170,8 @@ public ResponseEntity<DeletedKeyVaultKeyModel> getDeletedKey( } @Override - @PostMapping(value = {"/deletedkeys/{keyName}/recover", "/deletedkeys/{keyName}/recover/"}, + @PostMapping(value = {"/deletedkeys/{keyName}/recover", "/deletedkeys/{keyName}/recover/", + "/deletedKeys/{keyName}/recover", "/deletedKeys/{keyName}/recover/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultKeyModel> recoverDeletedKey( @@ -178,7 +181,8 @@ public ResponseEntity<KeyVaultKeyModel> recoverDeletedKey( } @Override - @DeleteMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/"}, + @DeleteMapping(value = {"/deletedkeys/{keyName}", "/deletedkeys/{keyName}/", + "/deletedKeys/{keyName}", "/deletedKeys/{keyName}/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<Void> purgeDeleted( diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/KeyCryptoController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/KeyCryptoController.java index 15b85204..f2c7fafa 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/KeyCryptoController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/KeyCryptoController.java @@ -42,7 +42,8 @@ public KeyCryptoController(@NonNull final KeyConverterRegistry registry, @NonNul @Override @PostMapping(value = {"/keys/{keyName}/{keyVersion}/encrypt", "/keys/{keyName}/{keyVersion}/encrypt/", - "/keys/{keyName}/{keyVersion}/wrapkey", "/keys/{keyName}/{keyVersion}/wrapkey/"}, + "/keys/{keyName}/{keyVersion}/wrapkey", "/keys/{keyName}/{keyVersion}/wrapkey/", + "/keys/{keyName}/{keyVersion}/wrapKey", "/keys/{keyName}/{keyVersion}/wrapKey/"}, params = API_VERSION_7_5, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE) @@ -56,7 +57,8 @@ public ResponseEntity<KeyOperationsResult> encrypt( @Override @PostMapping(value = {"/keys/{keyName}/{keyVersion}/decrypt", "/keys/{keyName}/{keyVersion}/decrypt/", - "/keys/{keyName}/{keyVersion}/unwrapkey", "/keys/{keyName}/{keyVersion}/unwrapkey/"}, + "/keys/{keyName}/{keyVersion}/unwrapkey", "/keys/{keyName}/{keyVersion}/unwrapkey/", + "/keys/{keyName}/{keyVersion}/unwrapKey", "/keys/{keyName}/{keyVersion}/unwrapKey/"}, params = API_VERSION_7_5, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE) diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/KeyPolicyController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/KeyPolicyController.java index cd65d135..aaefa376 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/KeyPolicyController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/KeyPolicyController.java @@ -31,7 +31,8 @@ public KeyPolicyController(@NonNull final KeyConverterRegistry registry, @NonNul super(registry, vaultService); } - @GetMapping(value = {"/keys/{keyName}/rotationpolicy", "/keys/{keyName}/rotationpolicy/"}, + @GetMapping(value = {"/keys/{keyName}/rotationpolicy", "/keys/{keyName}/rotationpolicy/", + "/keys/{keyName}/rotationPolicy", "/keys/{keyName}/rotationPolicy/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyRotationPolicyModel> getRotationPolicy( @@ -40,7 +41,8 @@ public ResponseEntity<KeyRotationPolicyModel> getRotationPolicy( return super.getRotationPolicy(keyName, baseUri); } - @PutMapping(value = {"/keys/{keyName}/rotationpolicy", "/keys/{keyName}/rotationpolicy/"}, + @PutMapping(value = {"/keys/{keyName}/rotationpolicy", "/keys/{keyName}/rotationpolicy/", + "/keys/{keyName}/rotationPolicy", "/keys/{keyName}/rotationPolicy/"}, params = API_VERSION_7_5, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE) diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/SecretController.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/SecretController.java index 1ab58d8d..07305931 100644 --- a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/SecretController.java +++ b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/v7_5/SecretController.java @@ -84,7 +84,8 @@ public ResponseEntity<KeyVaultItemListModel<KeyVaultSecretItemModel>> listSecret } @Override - @GetMapping(value = {"/deletedsecrets", "/deletedsecrets/"}, + @GetMapping(value = {"/deletedsecrets", "/deletedsecrets/", + "/deletedSecrets", "/deletedSecrets/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultItemListModel<DeletedKeyVaultSecretItemModel>> listDeletedSecrets( @@ -129,7 +130,8 @@ public ResponseEntity<KeyVaultSecretModel> updateVersion( } @Override - @GetMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/"}, + @GetMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/", + "/deletedSecrets/{secretName}", "/deletedSecrets/{secretName}/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultSecretModel> getDeletedSecret( @@ -139,7 +141,8 @@ public ResponseEntity<KeyVaultSecretModel> getDeletedSecret( } @Override - @DeleteMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/"}, + @DeleteMapping(value = {"/deletedsecrets/{secretName}", "/deletedsecrets/{secretName}/", + "/deletedSecrets/{secretName}", "/deletedSecrets/{secretName}/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<Void> purgeDeleted( @@ -149,7 +152,8 @@ public ResponseEntity<Void> purgeDeleted( } @Override - @PostMapping(value = {"/deletedsecrets/{secretName}/recover", "/deletedsecrets/{secretName}/recover/"}, + @PostMapping(value = {"/deletedsecrets/{secretName}/recover", "/deletedsecrets/{secretName}/recover/", + "/deletedSecrets/{secretName}/recover", "/deletedSecrets/{secretName}/recover/"}, params = API_VERSION_7_5, produces = APPLICATION_JSON_VALUE) public ResponseEntity<KeyVaultSecretModel> recoverDeletedSecret(