Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Client Encryption]: Removes Plaintext encryption type support. #2453

Merged
merged 5 commits into from
May 13, 2021
Merged

[Client Encryption]: Removes Plaintext encryption type support. #2453

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc43382
Removes Plaintext EncryptionType support.
kr-santosh May 11, 2021
7e7c1ff
Merge branch 'master' into users/sakulk/removeplaintextenc
j82w May 13, 2021
c32bc64
Merge branch 'master' into users/sakulk/removeplaintextenc
j82w May 13, 2021
ca49516
Merge branch 'master' into users/sakulk/removeplaintextenc
j82w May 13, 2021
76cac65
Merge branch 'master' into users/sakulk/removeplaintextenc
j82w May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Microsoft.Azure.Cosmos.Encryption/src/CosmosEncryptionType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ namespace Microsoft.Azure.Cosmos.Encryption
/// </summary>
internal static class CosmosEncryptionType
{
/// <summary>
/// Plaintext, unencrypted data.
/// </summary>
public const string Plaintext = "Plaintext";

/// <summary>
/// Deterministic encryption always generates the same encrypted value for any given plain text value.
/// </summary>
Expand Down
1 change: 0 additions & 1 deletion Microsoft.Azure.Cosmos.Encryption/src/EncryptionSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ private static EncryptionType GetEncryptionTypeForProperty(ClientEncryptionInclu
{
CosmosEncryptionType.Deterministic => EncryptionType.Deterministic,
CosmosEncryptionType.Randomized => EncryptionType.Randomized,
CosmosEncryptionType.Plaintext => EncryptionType.Plaintext,
_ => throw new ArgumentException($"Invalid encryption type {clientEncryptionIncludedPath.EncryptionType}. Please refer to https://aka.ms/CosmosClientEncryption for more details. "),
};
}
Expand Down
7 changes: 3 additions & 4 deletions Microsoft.Azure.Cosmos/src/Resource/Settings/ClientEncryptionPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,9 @@ private void ValidateClientEncryptionIncludedPath(ClientEncryptionIncludedPath c
}

if (!string.Equals(clientEncryptionIncludedPath.EncryptionType, "Deterministic") &&
!string.Equals(clientEncryptionIncludedPath.EncryptionType, "Randomized") &&
!string.Equals(clientEncryptionIncludedPath.EncryptionType, "Plaintext"))
!string.Equals(clientEncryptionIncludedPath.EncryptionType, "Randomized"))
{
throw new ArgumentException("EncryptionType should be either 'Deterministic' or 'Randomized' or 'Plaintext'.", nameof(clientEncryptionIncludedPath));
throw new ArgumentException("EncryptionType should be either 'Deterministic' or 'Randomized'. ", nameof(clientEncryptionIncludedPath));
}

if (string.IsNullOrWhiteSpace(clientEncryptionIncludedPath.EncryptionAlgorithm))
Expand All @@ -99,7 +98,7 @@ private void ValidateClientEncryptionIncludedPath(ClientEncryptionIncludedPath c

if (!string.Equals(clientEncryptionIncludedPath.EncryptionAlgorithm, "AEAD_AES_256_CBC_HMAC_SHA256"))
{
throw new ArgumentException("EncryptionAlgorithm should be 'AEAD_AES_256_CBC_HMAC_SHA256'.", nameof(clientEncryptionIncludedPath));
throw new ArgumentException("EncryptionAlgorithm should be 'AEAD_AES_256_CBC_HMAC_SHA256'. ", nameof(clientEncryptionIncludedPath));
}
}
}
Expand Down
22 changes: 20 additions & 2 deletions ....Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Fluent/ContainerSettingsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,25 @@ public async Task WithClientEncryptionPolicyFailureTest()
}
catch (ArgumentException ex)
{
Assert.IsTrue(ex.Message.Contains("EncryptionType should be either 'Deterministic' or 'Randomized' or 'Plaintext'."));
Assert.IsTrue(ex.Message.Contains("EncryptionType should be either 'Deterministic' or 'Randomized'. "));
}

path1.EncryptionType = "Plaintext";

// Invalid EncryptionType
try
{
ContainerResponse containerResponse = await this.database.DefineContainer(containerName, partitionKeyPath)
.WithClientEncryptionPolicy()
.WithIncludedPath(path1)
.Attach()
.CreateAsync();

Assert.Fail("CreateCollection with invalid ClientEncryptionPolicy should have failed.");
}
catch (ArgumentException ex)
{
Assert.IsTrue(ex.Message.Contains("EncryptionType should be either 'Deterministic' or 'Randomized'. "));
}

path1.EncryptionType = "Deterministic";
Expand All @@ -717,7 +735,7 @@ public async Task WithClientEncryptionPolicyFailureTest()
}
catch (ArgumentException ex)
{
Assert.IsTrue(ex.Message.Contains("EncryptionAlgorithm should be 'AEAD_AES_256_CBC_HMAC_SHA256'."));
Assert.IsTrue(ex.Message.Contains("EncryptionAlgorithm should be 'AEAD_AES_256_CBC_HMAC_SHA256'. "));
}
}

Expand Down