From 450aeef0ca337addacb2c3553e68b18bba233d88 Mon Sep 17 00:00:00 2001 From: Raja Nadar Date: Mon, 29 Aug 2016 17:32:59 -0700 Subject: [PATCH] remove auth/token/revoke-prefix in favor of sys/revoke-prefix for hashicorp/vault#1280 --- src/VaultSharp/IVaultClient.cs | 11 ----------- src/VaultSharp/VaultClient.cs | 7 ------- .../End2End/VaultClientEnd2EndTests.cs | 4 ---- test/VaultSharp.UnitTests/VaultClientTests.cs | 1 - 4 files changed, 23 deletions(-) diff --git a/src/VaultSharp/IVaultClient.cs b/src/VaultSharp/IVaultClient.cs index dde25b38..6687fb29 100644 --- a/src/VaultSharp/IVaultClient.cs +++ b/src/VaultSharp/IVaultClient.cs @@ -620,17 +620,6 @@ public interface IVaultClient /// Task RevokeCallingTokenAsync(); - /// - /// Revokes all tokens generated at a given prefix, along with child tokens, and all secrets generated using those tokens. - /// Uses include revoking all tokens generated by a credential backend during a suspected compromise. - /// - /// [required] - /// The prefix path. - /// - /// The task. - /// - Task RevokeAllTokensUnderPrefixAsync(string prefixPath); - /// /// Renews a lease associated with the calling token. /// This is used to prevent the expiration of a token, and the automatic revocation of it. diff --git a/src/VaultSharp/VaultClient.cs b/src/VaultSharp/VaultClient.cs index 6b6845cc..cf90c80f 100644 --- a/src/VaultSharp/VaultClient.cs +++ b/src/VaultSharp/VaultClient.cs @@ -542,13 +542,6 @@ public async Task RevokeCallingTokenAsync() await MakeVaultApiRequest("auth/token/revoke-self", HttpMethod.Post).ConfigureAwait(continueOnCapturedContext: _continueAsyncTasksOnCapturedContext); } - public async Task RevokeAllTokensUnderPrefixAsync(string prefixPath) - { - Checker.NotNull(prefixPath, "prefixPath"); - - await MakeVaultApiRequest("auth/token/revoke-prefix/" + prefixPath.Trim('/'), HttpMethod.Post).ConfigureAwait(continueOnCapturedContext: _continueAsyncTasksOnCapturedContext); - } - public async Task RenewCallingTokenAsync(int? incrementSeconds = null) { var requestData = incrementSeconds.HasValue ? new { increment = incrementSeconds.Value } : null; diff --git a/test/VaultSharp.UnitTests/End2End/VaultClientEnd2EndTests.cs b/test/VaultSharp.UnitTests/End2End/VaultClientEnd2EndTests.cs index c9d806bf..90ea481e 100644 --- a/test/VaultSharp.UnitTests/End2End/VaultClientEnd2EndTests.cs +++ b/test/VaultSharp.UnitTests/End2End/VaultClientEnd2EndTests.cs @@ -671,10 +671,6 @@ private async Task TokenTests() await _authenticatedClient.RevokeTokenAsync(secret1.AuthorizationInfo.ClientToken, true); await Assert.ThrowsAsync(() => _authenticatedClient.GetTokenInfoAsync(secret1.AuthorizationInfo.ClientToken)); - await _authenticatedClient.RevokeAllTokensUnderPrefixAsync("auth/token"); - await Assert.ThrowsAsync(() => _authenticatedClient.GetTokenInfoAsync(secret2.AuthorizationInfo.ClientToken)); - await Assert.ThrowsAsync(() => _authenticatedClient.GetTokenInfoAsync(secret3.AuthorizationInfo.ClientToken)); - // check if renewal of same token calls renew-self. // do it with lease id. diff --git a/test/VaultSharp.UnitTests/VaultClientTests.cs b/test/VaultSharp.UnitTests/VaultClientTests.cs index db68ec52..817b1b7a 100644 --- a/test/VaultSharp.UnitTests/VaultClientTests.cs +++ b/test/VaultSharp.UnitTests/VaultClientTests.cs @@ -84,7 +84,6 @@ public async Task NullTests() await Assert.ThrowsAsync(() => client.DeleteSecretAsync(null)); await Assert.ThrowsAsync(() => client.GetTokenInfoAsync(null)); await Assert.ThrowsAsync(() => client.RevokeTokenAsync(null, true)); - await Assert.ThrowsAsync(() => client.RevokeAllTokensUnderPrefixAsync(null)); await Assert.ThrowsAsync(() => client.RenewTokenAsync(null)); }