diff --git a/src/Microsoft.AspNet.Cryptography.KeyDerivation/KeyDerivation.cs b/src/Microsoft.AspNet.Cryptography.KeyDerivation/KeyDerivation.cs index badd516b95..e5c6204cec 100644 --- a/src/Microsoft.AspNet.Cryptography.KeyDerivation/KeyDerivation.cs +++ b/src/Microsoft.AspNet.Cryptography.KeyDerivation/KeyDerivation.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Cryptography.KeyDerivation.PBKDF2; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.Cryptography.KeyDerivation { @@ -25,8 +24,18 @@ namespace Microsoft.AspNet.Cryptography.KeyDerivation /// /// The PBKDF2 algorithm is specified in RFC 2898. /// - public static byte[] Pbkdf2([NotNull] string password, [NotNull] byte[] salt, KeyDerivationPrf prf, int iterationCount, int numBytesRequested) + public static byte[] Pbkdf2(string password, byte[] salt, KeyDerivationPrf prf, int iterationCount, int numBytesRequested) { + if (password == null) + { + throw new ArgumentNullException(nameof(password)); + } + + if (salt == null) + { + throw new ArgumentNullException(nameof(salt)); + } + // parameter checking if (prf < KeyDerivationPrf.HMACSHA1 || prf > KeyDerivationPrf.HMACSHA512) { diff --git a/src/Microsoft.AspNet.Cryptography.KeyDerivation/project.json b/src/Microsoft.AspNet.Cryptography.KeyDerivation/project.json index d6076a7420..581d8c46d9 100644 --- a/src/Microsoft.AspNet.Cryptography.KeyDerivation/project.json +++ b/src/Microsoft.AspNet.Cryptography.KeyDerivation/project.json @@ -6,8 +6,7 @@ "url": "git://github.com/aspnet/dataprotection" }, "dependencies": { - "Microsoft.AspNet.Cryptography.Internal": "1.0.0-*", - "Microsoft.Extensions.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" } + "Microsoft.AspNet.Cryptography.Internal": "1.0.0-*" }, "frameworks": { "net451": { }, diff --git a/src/Microsoft.AspNet.DataProtection.Abstractions/DataProtectionExtensions.cs b/src/Microsoft.AspNet.DataProtection.Abstractions/DataProtectionExtensions.cs index bba0dd3df3..ee2c0fa106 100644 --- a/src/Microsoft.AspNet.DataProtection.Abstractions/DataProtectionExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection.Abstractions/DataProtectionExtensions.cs @@ -5,10 +5,8 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; -using System.Security.Cryptography; using Microsoft.AspNet.DataProtection.Infrastructure; using Microsoft.AspNet.DataProtection.Abstractions; -using Microsoft.Extensions.Internal; #if DNX451 || DNXCORE50 // [[ISSUE1400]] Replace with DNX_ANY when it becomes available using Microsoft.Dnx.Runtime; @@ -33,8 +31,18 @@ namespace Microsoft.AspNet.DataProtection /// . See that method's /// documentation for more information. /// - public static IDataProtector CreateProtector([NotNull] this IDataProtectionProvider provider, [NotNull] IEnumerable purposes) + public static IDataProtector CreateProtector(this IDataProtectionProvider provider, IEnumerable purposes) { + if (provider == null) + { + throw new ArgumentNullException(nameof(provider)); + } + + if (purposes == null) + { + throw new ArgumentNullException(nameof(purposes)); + } + bool collectionIsEmpty = true; IDataProtectionProvider retVal = provider; foreach (string purpose in purposes) @@ -69,8 +77,18 @@ namespace Microsoft.AspNet.DataProtection /// . See that method's /// documentation for more information. /// - public static IDataProtector CreateProtector([NotNull] this IDataProtectionProvider provider, [NotNull] string purpose, params string[] subPurposes) + public static IDataProtector CreateProtector(this IDataProtectionProvider provider, string purpose, params string[] subPurposes) { + if (provider == null) + { + throw new ArgumentNullException(nameof(provider)); + } + + if (purpose == null) + { + throw new ArgumentNullException(nameof(purpose)); + } + // The method signature isn't simply CreateProtector(this IDataProtectionProvider, params string[] purposes) // because we don't want the code provider.CreateProtector() [parameterless] to inadvertently compile. // The actual signature for this method forces at least one purpose to be provided at the call site. @@ -127,8 +145,13 @@ namespace Microsoft.AspNet.DataProtection /// The service provider from which to retrieve the . /// An . This method is guaranteed never to return null. /// If no service exists in . - public static IDataProtectionProvider GetDataProtectionProvider([NotNull] this IServiceProvider services) + public static IDataProtectionProvider GetDataProtectionProvider(this IServiceProvider services) { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + // We have our own implementation of GetRequiredService since we don't want to // take a dependency on DependencyInjection.Interfaces. IDataProtectionProvider provider = (IDataProtectionProvider)services.GetService(typeof(IDataProtectionProvider)); @@ -152,8 +175,18 @@ namespace Microsoft.AspNet.DataProtection /// then . See those methods' /// documentation for more information. /// - public static IDataProtector GetDataProtector([NotNull] this IServiceProvider services, [NotNull] IEnumerable purposes) + public static IDataProtector GetDataProtector(this IServiceProvider services, IEnumerable purposes) { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + + if (purposes == null) + { + throw new ArgumentNullException(nameof(purposes)); + } + return services.GetDataProtectionProvider().CreateProtector(purposes); } @@ -171,8 +204,18 @@ namespace Microsoft.AspNet.DataProtection /// then . See those methods' /// documentation for more information. /// - public static IDataProtector GetDataProtector([NotNull] this IServiceProvider services, [NotNull] string purpose, params string[] subPurposes) + public static IDataProtector GetDataProtector(this IServiceProvider services, string purpose, params string[] subPurposes) { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + + if (purpose == null) + { + throw new ArgumentNullException(nameof(purpose)); + } + return services.GetDataProtectionProvider().CreateProtector(purpose, subPurposes); } @@ -182,8 +225,18 @@ namespace Microsoft.AspNet.DataProtection /// The data protector to use for this operation. /// The plaintext data to protect. /// The protected form of the plaintext data. - public static string Protect([NotNull] this IDataProtector protector, [NotNull] string plaintext) + public static string Protect(this IDataProtector protector, string plaintext) { + if (protector == null) + { + throw new ArgumentNullException(nameof(protector)); + } + + if (plaintext == null) + { + throw new ArgumentNullException(nameof(plaintext)); + } + try { byte[] plaintextAsBytes = EncodingUtil.SecureUtf8Encoding.GetBytes(plaintext); @@ -206,8 +259,18 @@ namespace Microsoft.AspNet.DataProtection /// /// Thrown if is invalid or malformed. /// - public static string Unprotect([NotNull] this IDataProtector protector, [NotNull] string protectedData) + public static string Unprotect(this IDataProtector protector, string protectedData) { + if (protector == null) + { + throw new ArgumentNullException(nameof(protector)); + } + + if (protectedData == null) + { + throw new ArgumentNullException(nameof(protectedData)); + } + try { byte[] protectedDataAsBytes = WebEncoders.Base64UrlDecode(protectedData); diff --git a/src/Microsoft.AspNet.DataProtection.Abstractions/IDataProtectionProvider.cs b/src/Microsoft.AspNet.DataProtection.Abstractions/IDataProtectionProvider.cs index 3e8a43a1fd..cb57593ada 100644 --- a/src/Microsoft.AspNet.DataProtection.Abstractions/IDataProtectionProvider.cs +++ b/src/Microsoft.AspNet.DataProtection.Abstractions/IDataProtectionProvider.cs @@ -1,9 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; -using Microsoft.Extensions.Internal; - namespace Microsoft.AspNet.DataProtection { /// @@ -24,6 +21,6 @@ namespace Microsoft.AspNet.DataProtection /// values will not be able to decipher each other's payloads. The parameter /// value is not intended to be kept secret. /// - IDataProtector CreateProtector([NotNull] string purpose); + IDataProtector CreateProtector(string purpose); } } diff --git a/src/Microsoft.AspNet.DataProtection.Abstractions/IDataProtector.cs b/src/Microsoft.AspNet.DataProtection.Abstractions/IDataProtector.cs index 782256425c..22b89cea49 100644 --- a/src/Microsoft.AspNet.DataProtection.Abstractions/IDataProtector.cs +++ b/src/Microsoft.AspNet.DataProtection.Abstractions/IDataProtector.cs @@ -1,10 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; -using System.Security.Cryptography; -using Microsoft.Extensions.Internal; - namespace Microsoft.AspNet.DataProtection { /// @@ -17,7 +13,7 @@ namespace Microsoft.AspNet.DataProtection /// /// The plaintext data to protect. /// The protected form of the plaintext data. - byte[] Protect([NotNull] byte[] plaintext); + byte[] Protect(byte[] plaintext); /// /// Cryptographically unprotects a piece of protected data. @@ -27,6 +23,6 @@ namespace Microsoft.AspNet.DataProtection /// /// Thrown if the protected data is invalid or malformed. /// - byte[] Unprotect([NotNull] byte[] protectedData); + byte[] Unprotect(byte[] protectedData); } } diff --git a/src/Microsoft.AspNet.DataProtection.Abstractions/project.json b/src/Microsoft.AspNet.DataProtection.Abstractions/project.json index e12d818db3..be542d12ff 100644 --- a/src/Microsoft.AspNet.DataProtection.Abstractions/project.json +++ b/src/Microsoft.AspNet.DataProtection.Abstractions/project.json @@ -6,7 +6,6 @@ "url": "git://github.com/aspnet/dataprotection" }, "dependencies": { - "Microsoft.Extensions.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, "Microsoft.AspNet.DataProtection.Sources": { "type": "build", "version": "" } }, "frameworks": { diff --git a/src/Microsoft.AspNet.DataProtection.Extensions/DataProtectionExtensions.cs b/src/Microsoft.AspNet.DataProtection.Extensions/DataProtectionExtensions.cs index 08e22d6948..208153c820 100644 --- a/src/Microsoft.AspNet.DataProtection.Extensions/DataProtectionExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection.Extensions/DataProtectionExtensions.cs @@ -2,8 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Security.Cryptography; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection { @@ -17,8 +15,18 @@ namespace Microsoft.AspNet.DataProtection /// The plaintext data to protect. /// The amount of time after which the payload should no longer be unprotectable. /// The protected form of the plaintext data. - public static byte[] Protect([NotNull] this ITimeLimitedDataProtector protector, [NotNull] byte[] plaintext, TimeSpan lifetime) + public static byte[] Protect(this ITimeLimitedDataProtector protector, byte[] plaintext, TimeSpan lifetime) { + if (protector == null) + { + throw new ArgumentNullException(nameof(protector)); + } + + if (plaintext == null) + { + throw new ArgumentNullException(nameof(plaintext)); + } + return protector.Protect(plaintext, DateTimeOffset.UtcNow + lifetime); } @@ -30,8 +38,18 @@ namespace Microsoft.AspNet.DataProtection /// The plaintext data to protect. /// The time when this payload should expire. /// The protected form of the plaintext data. - public static string Protect([NotNull] this ITimeLimitedDataProtector protector, [NotNull] string plaintext, DateTimeOffset expiration) + public static string Protect(this ITimeLimitedDataProtector protector, string plaintext, DateTimeOffset expiration) { + if (protector == null) + { + throw new ArgumentNullException(nameof(protector)); + } + + if (plaintext == null) + { + throw new ArgumentNullException(nameof(plaintext)); + } + var wrappingProtector = new TimeLimitedWrappingProtector(protector) { Expiration = expiration }; return wrappingProtector.Protect(plaintext); } @@ -44,8 +62,18 @@ namespace Microsoft.AspNet.DataProtection /// The plaintext data to protect. /// The amount of time after which the payload should no longer be unprotectable. /// The protected form of the plaintext data. - public static string Protect([NotNull] this ITimeLimitedDataProtector protector, [NotNull] string plaintext, TimeSpan lifetime) + public static string Protect(this ITimeLimitedDataProtector protector, string plaintext, TimeSpan lifetime) { + if (protector == null) + { + throw new ArgumentNullException(nameof(protector)); + } + + if (plaintext == null) + { + throw new ArgumentNullException(nameof(plaintext)); + } + return Protect(protector, plaintext, DateTimeOffset.Now + lifetime); } @@ -55,8 +83,13 @@ namespace Microsoft.AspNet.DataProtection /// /// The to convert to a time-limited protector. /// An . - public static ITimeLimitedDataProtector ToTimeLimitedDataProtector([NotNull] this IDataProtector protector) + public static ITimeLimitedDataProtector ToTimeLimitedDataProtector(this IDataProtector protector) { + if (protector == null) + { + throw new ArgumentNullException(nameof(protector)); + } + return (protector as ITimeLimitedDataProtector) ?? new TimeLimitedDataProtector(protector); } @@ -71,8 +104,18 @@ namespace Microsoft.AspNet.DataProtection /// /// Thrown if is invalid, malformed, or expired. /// - public static string Unprotect([NotNull] this ITimeLimitedDataProtector protector, [NotNull] string protectedData, out DateTimeOffset expiration) + public static string Unprotect(this ITimeLimitedDataProtector protector, string protectedData, out DateTimeOffset expiration) { + if (protector == null) + { + throw new ArgumentNullException(nameof(protector)); + } + + if (protectedData == null) + { + throw new ArgumentNullException(nameof(protectedData)); + } + var wrappingProtector = new TimeLimitedWrappingProtector(protector); string retVal = wrappingProtector.Unprotect(protectedData); expiration = wrappingProtector.Expiration; @@ -91,16 +134,31 @@ namespace Microsoft.AspNet.DataProtection public IDataProtector CreateProtector(string purpose) { + if (purpose == null) + { + throw new ArgumentNullException(nameof(purpose)); + } + throw new NotImplementedException(); } public byte[] Protect(byte[] plaintext) { + if (plaintext == null) + { + throw new ArgumentNullException(nameof(plaintext)); + } + return _innerProtector.Protect(plaintext, Expiration); } public byte[] Unprotect(byte[] protectedData) { + if (protectedData == null) + { + throw new ArgumentNullException(nameof(protectedData)); + } + return _innerProtector.Unprotect(protectedData, out Expiration); } } diff --git a/src/Microsoft.AspNet.DataProtection.Extensions/DataProtectionProvider.cs b/src/Microsoft.AspNet.DataProtection.Extensions/DataProtectionProvider.cs index b0bb0a3ba3..fe8afe6db6 100644 --- a/src/Microsoft.AspNet.DataProtection.Extensions/DataProtectionProvider.cs +++ b/src/Microsoft.AspNet.DataProtection.Extensions/DataProtectionProvider.cs @@ -4,7 +4,6 @@ using System; using System.IO; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection { @@ -21,7 +20,7 @@ namespace Microsoft.AspNet.DataProtection /// /// The in which keys should be stored. This may /// represent a directory on a local disk or a UNC share. - public DataProtectionProvider([NotNull] DirectoryInfo keyDirectory) + public DataProtectionProvider(DirectoryInfo keyDirectory) : this(keyDirectory, configure: null) { } @@ -34,8 +33,13 @@ namespace Microsoft.AspNet.DataProtection /// represent a directory on a local disk or a UNC share. /// An optional callback which provides further configuration of the data protection /// system. See for more information. - public DataProtectionProvider([NotNull] DirectoryInfo keyDirectory, Action configure) + public DataProtectionProvider(DirectoryInfo keyDirectory, Action configure) { + if (keyDirectory == null) + { + throw new ArgumentNullException(nameof(keyDirectory)); + } + // build the service collection ServiceCollection serviceCollection = new ServiceCollection(); serviceCollection.AddDataProtection(); @@ -52,8 +56,13 @@ namespace Microsoft.AspNet.DataProtection /// /// Implements . /// - public IDataProtector CreateProtector([NotNull] string purpose) + public IDataProtector CreateProtector(string purpose) { + if (purpose == null) + { + throw new ArgumentNullException(nameof(purpose)); + } + return _innerProvider.CreateProtector(purpose); } } diff --git a/src/Microsoft.AspNet.DataProtection.Extensions/ITimeLimitedDataProtector.cs b/src/Microsoft.AspNet.DataProtection.Extensions/ITimeLimitedDataProtector.cs index df29c8039b..d211083729 100644 --- a/src/Microsoft.AspNet.DataProtection.Extensions/ITimeLimitedDataProtector.cs +++ b/src/Microsoft.AspNet.DataProtection.Extensions/ITimeLimitedDataProtector.cs @@ -2,8 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Security.Cryptography; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection { @@ -31,7 +29,7 @@ namespace Microsoft.AspNet.DataProtection /// values will not be able to decipher each other's payloads. The parameter /// value is not intended to be kept secret. /// - new ITimeLimitedDataProtector CreateProtector([NotNull] string purpose); + new ITimeLimitedDataProtector CreateProtector(string purpose); /// /// Cryptographically protects a piece of plaintext data, expiring the data at @@ -40,7 +38,7 @@ namespace Microsoft.AspNet.DataProtection /// The plaintext data to protect. /// The time when this payload should expire. /// The protected form of the plaintext data. - byte[] Protect([NotNull] byte[] plaintext, DateTimeOffset expiration); + byte[] Protect(byte[] plaintext, DateTimeOffset expiration); /// /// Cryptographically unprotects a piece of protected data. @@ -52,6 +50,6 @@ namespace Microsoft.AspNet.DataProtection /// /// Thrown if is invalid, malformed, or expired. /// - byte[] Unprotect([NotNull] byte[] protectedData, out DateTimeOffset expiration); + byte[] Unprotect(byte[] protectedData, out DateTimeOffset expiration); } } diff --git a/src/Microsoft.AspNet.DataProtection.Extensions/TimeLimitedDataProtector.cs b/src/Microsoft.AspNet.DataProtection.Extensions/TimeLimitedDataProtector.cs index 0c9aa18126..76c72d0b6f 100644 --- a/src/Microsoft.AspNet.DataProtection.Extensions/TimeLimitedDataProtector.cs +++ b/src/Microsoft.AspNet.DataProtection.Extensions/TimeLimitedDataProtector.cs @@ -5,7 +5,6 @@ using System; using System.Security.Cryptography; using System.Threading; using Microsoft.AspNet.DataProtection.Extensions; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection { @@ -25,8 +24,13 @@ namespace Microsoft.AspNet.DataProtection _innerProtector = innerProtector; } - public ITimeLimitedDataProtector CreateProtector([NotNull] string purpose) + public ITimeLimitedDataProtector CreateProtector(string purpose) { + if (purpose == null) + { + throw new ArgumentNullException(nameof(purpose)); + } + return new TimeLimitedDataProtector(_innerProtector.CreateProtector(purpose)); } @@ -42,8 +46,13 @@ namespace Microsoft.AspNet.DataProtection return retVal; } - public byte[] Protect([NotNull] byte[] plaintext, DateTimeOffset expiration) + public byte[] Protect(byte[] plaintext, DateTimeOffset expiration) { + if (plaintext == null) + { + throw new ArgumentNullException(nameof(plaintext)); + } + // We prepend the expiration time (as a 64-bit UTC tick count) to the unprotected data. byte[] plaintextWithHeader = new byte[checked(8 + plaintext.Length)]; BitHelpers.WriteUInt64(plaintextWithHeader, 0, (ulong)expiration.UtcTicks); @@ -52,13 +61,23 @@ namespace Microsoft.AspNet.DataProtection return GetInnerProtectorWithTimeLimitedPurpose().Protect(plaintextWithHeader); } - public byte[] Unprotect([NotNull] byte[] protectedData, out DateTimeOffset expiration) + public byte[] Unprotect(byte[] protectedData, out DateTimeOffset expiration) { + if (protectedData == null) + { + throw new ArgumentNullException(nameof(protectedData)); + } + return UnprotectCore(protectedData, DateTimeOffset.UtcNow, out expiration); } - internal byte[] UnprotectCore([NotNull] byte[] protectedData, DateTimeOffset now, out DateTimeOffset expiration) + internal byte[] UnprotectCore(byte[] protectedData, DateTimeOffset now, out DateTimeOffset expiration) { + if (protectedData == null) + { + throw new ArgumentNullException(nameof(protectedData)); + } + try { byte[] plaintextWithHeader = GetInnerProtectorWithTimeLimitedPurpose().Unprotect(protectedData); @@ -97,17 +116,32 @@ namespace Microsoft.AspNet.DataProtection IDataProtector IDataProtectionProvider.CreateProtector(string purpose) { + if (purpose == null) + { + throw new ArgumentNullException(nameof(purpose)); + } + return CreateProtector(purpose); } byte[] IDataProtector.Protect(byte[] plaintext) { + if (plaintext == null) + { + throw new ArgumentNullException(nameof(plaintext)); + } + // MaxValue essentially means 'no expiration' return Protect(plaintext, DateTimeOffset.MaxValue); } byte[] IDataProtector.Unprotect(byte[] protectedData) { + if (protectedData == null) + { + throw new ArgumentNullException(nameof(protectedData)); + } + DateTimeOffset expiration; // unused return Unprotect(protectedData, out expiration); } diff --git a/src/Microsoft.AspNet.DataProtection.Extensions/project.json b/src/Microsoft.AspNet.DataProtection.Extensions/project.json index 4634bb8825..5c815caf43 100644 --- a/src/Microsoft.AspNet.DataProtection.Extensions/project.json +++ b/src/Microsoft.AspNet.DataProtection.Extensions/project.json @@ -8,8 +8,7 @@ "dependencies": { "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.DataProtection.Sources": { "type": "build", "version": "" }, - "Microsoft.Extensions.DependencyInjection": "1.0.0-*", - "Microsoft.Extensions.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" } + "Microsoft.Extensions.DependencyInjection": "1.0.0-*" }, "frameworks": { "net451": { }, diff --git a/src/Microsoft.AspNet.DataProtection/ActivatorExtensions.cs b/src/Microsoft.AspNet.DataProtection/ActivatorExtensions.cs index ed736020e5..0c9037e247 100644 --- a/src/Microsoft.AspNet.DataProtection/ActivatorExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection/ActivatorExtensions.cs @@ -5,7 +5,6 @@ using System; using System.Reflection; using Microsoft.AspNet.Cryptography; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection { @@ -18,9 +17,14 @@ namespace Microsoft.AspNet.DataProtection /// Creates an instance of and ensures /// that it is assignable to . /// - public static T CreateInstance(this IActivator activator, [NotNull] string implementationTypeName) + public static T CreateInstance(this IActivator activator, string implementationTypeName) where T : class { + if (implementationTypeName == null) + { + throw new ArgumentNullException(nameof(implementationTypeName)); + } + return activator.CreateInstance(typeof(T), implementationTypeName) as T ?? CryptoUtil.Fail("CreateInstance returned null."); } diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorConfiguration.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorConfiguration.cs index 65f56dc546..408ab869b4 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorConfiguration.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorConfiguration.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel { @@ -13,13 +12,18 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM { private readonly IServiceProvider _services; - public AuthenticatedEncryptorConfiguration([NotNull] AuthenticatedEncryptionOptions options) + public AuthenticatedEncryptorConfiguration(AuthenticatedEncryptionOptions options) : this(options, services: null) { } - public AuthenticatedEncryptorConfiguration([NotNull] AuthenticatedEncryptionOptions options, IServiceProvider services) + public AuthenticatedEncryptorConfiguration(AuthenticatedEncryptionOptions options, IServiceProvider services) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + Options = options; _services = services; } @@ -30,7 +34,7 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM { return this.CreateNewDescriptorCore(); } - + IAuthenticatedEncryptorDescriptor IInternalAuthenticatedEncryptorConfiguration.CreateDescriptorFromSecret(ISecret secret) { return new AuthenticatedEncryptorDescriptor(Options, secret, _services); diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptor.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptor.cs index 2c8c437ffc..7ff60f6985 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptor.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptor.cs @@ -3,7 +3,6 @@ using System; using System.Xml.Linq; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel { @@ -15,13 +14,23 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM { private readonly IServiceProvider _services; - public AuthenticatedEncryptorDescriptor([NotNull] AuthenticatedEncryptionOptions options, [NotNull] ISecret masterKey) + public AuthenticatedEncryptorDescriptor(AuthenticatedEncryptionOptions options, ISecret masterKey) : this(options, masterKey, services: null) { } - public AuthenticatedEncryptorDescriptor([NotNull] AuthenticatedEncryptionOptions options, [NotNull] ISecret masterKey, IServiceProvider services) + public AuthenticatedEncryptorDescriptor(AuthenticatedEncryptionOptions options, ISecret masterKey, IServiceProvider services) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + + if (masterKey == null) + { + throw new ArgumentNullException(nameof(masterKey)); + } + Options = options; MasterKey = masterKey; _services = services; @@ -30,7 +39,7 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM internal ISecret MasterKey { get; } internal AuthenticatedEncryptionOptions Options { get; } - + public IAuthenticatedEncryptor CreateEncryptorInstance() { return Options.CreateAuthenticatedEncryptorInstance(MasterKey, _services); diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializer.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializer.cs index 29dccbf92a..c636872214 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializer.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializer.cs @@ -4,7 +4,6 @@ using System; using System.Linq; using System.Xml.Linq; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel { @@ -29,8 +28,13 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM /// /// Imports the from serialized XML. /// - public IAuthenticatedEncryptorDescriptor ImportFromXml([NotNull] XElement element) + public IAuthenticatedEncryptorDescriptor ImportFromXml(XElement element) { + if (element == null) + { + throw new ArgumentNullException(nameof(element)); + } + // // // diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorConfiguration.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorConfiguration.cs index 3be68f5a6b..54fee95ae8 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorConfiguration.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorConfiguration.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel { @@ -14,13 +13,18 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM { private readonly IServiceProvider _services; - public CngCbcAuthenticatedEncryptorConfiguration([NotNull] CngCbcAuthenticatedEncryptionOptions options) + public CngCbcAuthenticatedEncryptorConfiguration(CngCbcAuthenticatedEncryptionOptions options) : this(options, services: null) { } - public CngCbcAuthenticatedEncryptorConfiguration([NotNull] CngCbcAuthenticatedEncryptionOptions options, IServiceProvider services) + public CngCbcAuthenticatedEncryptorConfiguration(CngCbcAuthenticatedEncryptionOptions options, IServiceProvider services) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + Options = options; _services = services; } diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptor.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptor.cs index 4ec26a0e61..349ec1777b 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptor.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptor.cs @@ -3,7 +3,6 @@ using System; using System.Xml.Linq; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel @@ -16,13 +15,23 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM { private readonly ILogger _log; - public CngCbcAuthenticatedEncryptorDescriptor([NotNull] CngCbcAuthenticatedEncryptionOptions options, [NotNull] ISecret masterKey) + public CngCbcAuthenticatedEncryptorDescriptor(CngCbcAuthenticatedEncryptionOptions options, ISecret masterKey) : this(options, masterKey, services: null) { } - public CngCbcAuthenticatedEncryptorDescriptor([NotNull] CngCbcAuthenticatedEncryptionOptions options, [NotNull] ISecret masterKey, IServiceProvider services) + public CngCbcAuthenticatedEncryptorDescriptor(CngCbcAuthenticatedEncryptionOptions options, ISecret masterKey, IServiceProvider services) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + + if (masterKey == null) + { + throw new ArgumentNullException(nameof(masterKey)); + } + Options = options; MasterKey = masterKey; _log = services.GetLogger(); diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializer.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializer.cs index 9246a80fb1..02972262da 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializer.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializer.cs @@ -3,7 +3,6 @@ using System; using System.Xml.Linq; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel { @@ -28,8 +27,13 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM /// /// Imports the from serialized XML. /// - public IAuthenticatedEncryptorDescriptor ImportFromXml([NotNull] XElement element) + public IAuthenticatedEncryptorDescriptor ImportFromXml(XElement element) { + if (element == null) + { + throw new ArgumentNullException(nameof(element)); + } + // // // diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorConfiguration.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorConfiguration.cs index 40c9905e85..1e587a0ffb 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorConfiguration.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorConfiguration.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel { @@ -14,13 +13,18 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM { private readonly IServiceProvider _services; - public CngGcmAuthenticatedEncryptorConfiguration([NotNull] CngGcmAuthenticatedEncryptionOptions options) + public CngGcmAuthenticatedEncryptorConfiguration(CngGcmAuthenticatedEncryptionOptions options) : this(options, services: null) { } - public CngGcmAuthenticatedEncryptorConfiguration([NotNull] CngGcmAuthenticatedEncryptionOptions options, IServiceProvider services) + public CngGcmAuthenticatedEncryptorConfiguration(CngGcmAuthenticatedEncryptionOptions options, IServiceProvider services) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + Options = options; _services = services; } diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptor.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptor.cs index c18c6b3028..27a7eacbdf 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptor.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptor.cs @@ -3,7 +3,6 @@ using System; using System.Xml.Linq; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel @@ -16,13 +15,23 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM { private readonly ILogger _log; - public CngGcmAuthenticatedEncryptorDescriptor([NotNull] CngGcmAuthenticatedEncryptionOptions options, [NotNull] ISecret masterKey) + public CngGcmAuthenticatedEncryptorDescriptor(CngGcmAuthenticatedEncryptionOptions options, ISecret masterKey) : this(options, masterKey, services: null) { } - public CngGcmAuthenticatedEncryptorDescriptor([NotNull] CngGcmAuthenticatedEncryptionOptions options, [NotNull] ISecret masterKey, IServiceProvider services) + public CngGcmAuthenticatedEncryptorDescriptor(CngGcmAuthenticatedEncryptionOptions options, ISecret masterKey, IServiceProvider services) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + + if (masterKey == null) + { + throw new ArgumentNullException(nameof(masterKey)); + } + Options = options; MasterKey = masterKey; _log = services.GetLogger(); diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializer.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializer.cs index 513163eed9..b7fc2630c8 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializer.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializer.cs @@ -3,7 +3,6 @@ using System; using System.Xml.Linq; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel { @@ -28,8 +27,13 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM /// /// Imports the from serialized XML. /// - public IAuthenticatedEncryptorDescriptor ImportFromXml([NotNull] XElement element) + public IAuthenticatedEncryptorDescriptor ImportFromXml(XElement element) { + if (element == null) + { + throw new ArgumentNullException(nameof(element)); + } + // // // diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/IAuthenticatedEncryptorDescriptorDeserializer.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/IAuthenticatedEncryptorDescriptorDeserializer.cs index ce131098a3..c725f58675 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/IAuthenticatedEncryptorDescriptorDeserializer.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/IAuthenticatedEncryptorDescriptorDeserializer.cs @@ -1,9 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Xml.Linq; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel { @@ -17,6 +15,6 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM /// /// The element to deserialize. /// The represented by . - IAuthenticatedEncryptorDescriptor ImportFromXml([NotNull] XElement element); + IAuthenticatedEncryptorDescriptor ImportFromXml(XElement element); } } diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs index d58fa121c4..3b5bdd4545 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs @@ -2,8 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.Extensions.Internal; -using System.Security.Cryptography; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel { @@ -15,13 +13,18 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM { private readonly IServiceProvider _services; - public ManagedAuthenticatedEncryptorConfiguration([NotNull] ManagedAuthenticatedEncryptionOptions options) + public ManagedAuthenticatedEncryptorConfiguration(ManagedAuthenticatedEncryptionOptions options) : this(options, services: null) { } - public ManagedAuthenticatedEncryptorConfiguration([NotNull] ManagedAuthenticatedEncryptionOptions options, IServiceProvider services) + public ManagedAuthenticatedEncryptorConfiguration(ManagedAuthenticatedEncryptionOptions options, IServiceProvider services) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + Options = options; _services = services; } diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptor.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptor.cs index d7e40021d7..41abf273c7 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptor.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptor.cs @@ -4,7 +4,6 @@ using System; using System.Security.Cryptography; using System.Xml.Linq; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel @@ -17,13 +16,23 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM { private readonly ILogger _log; - public ManagedAuthenticatedEncryptorDescriptor([NotNull] ManagedAuthenticatedEncryptionOptions options, [NotNull] ISecret masterKey) + public ManagedAuthenticatedEncryptorDescriptor(ManagedAuthenticatedEncryptionOptions options, ISecret masterKey) : this(options, masterKey, services: null) { } - public ManagedAuthenticatedEncryptorDescriptor([NotNull] ManagedAuthenticatedEncryptionOptions options, [NotNull] ISecret masterKey, IServiceProvider services) + public ManagedAuthenticatedEncryptorDescriptor(ManagedAuthenticatedEncryptionOptions options, ISecret masterKey, IServiceProvider services) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + + if (masterKey == null) + { + throw new ArgumentNullException(nameof(masterKey)); + } + Options = options; MasterKey = masterKey; _log = services.GetLogger(); diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorDeserializer.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorDeserializer.cs index 905275000a..824d6008e9 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorDeserializer.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorDeserializer.cs @@ -4,7 +4,6 @@ using System; using System.Security.Cryptography; using System.Xml.Linq; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel { @@ -29,8 +28,13 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM /// /// Imports the from serialized XML. /// - public IAuthenticatedEncryptorDescriptor ImportFromXml([NotNull] XElement element) + public IAuthenticatedEncryptorDescriptor ImportFromXml(XElement element) { + if (element == null) + { + throw new ArgumentNullException(nameof(element)); + } + // // // diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/XmlExtensions.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/XmlExtensions.cs index 0d485fd855..858813161d 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/XmlExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/XmlExtensions.cs @@ -3,7 +3,6 @@ using System; using System.Xml.Linq; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel { @@ -18,8 +17,13 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM /// Marks the provided as requiring encryption before being persisted /// to storage. Use when implementing . /// - public static void MarkAsRequiresEncryption([NotNull] this XElement element) + public static void MarkAsRequiresEncryption(this XElement element) { + if (element == null) + { + throw new ArgumentNullException(nameof(element)); + } + element.SetAttributeValue(XmlConstants.RequiresEncryptionAttributeName, true); } } diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/XmlSerializedDescriptorInfo.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/XmlSerializedDescriptorInfo.cs index 01a2d24a94..31a770a0d8 100644 --- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/XmlSerializedDescriptorInfo.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/XmlSerializedDescriptorInfo.cs @@ -4,7 +4,6 @@ using System; using System.Reflection; using System.Xml.Linq; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel { @@ -21,8 +20,18 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM /// The XML-serialized form of the . /// The class whose /// method can be used to deserialize . - public XmlSerializedDescriptorInfo([NotNull] XElement serializedDescriptorElement, [NotNull] Type deserializerType) + public XmlSerializedDescriptorInfo(XElement serializedDescriptorElement, Type deserializerType) { + if (serializedDescriptorElement == null) + { + throw new ArgumentNullException(nameof(serializedDescriptorElement)); + } + + if (deserializerType == null) + { + throw new ArgumentNullException(nameof(deserializerType)); + } + if (!typeof(IAuthenticatedEncryptorDescriptorDeserializer).IsAssignableFrom(deserializerType)) { throw new ArgumentException( diff --git a/src/Microsoft.AspNet.DataProtection/DataProtectionConfiguration.cs b/src/Microsoft.AspNet.DataProtection/DataProtectionConfiguration.cs index deb8119b29..e083d1988a 100644 --- a/src/Microsoft.AspNet.DataProtection/DataProtectionConfiguration.cs +++ b/src/Microsoft.AspNet.DataProtection/DataProtectionConfiguration.cs @@ -9,7 +9,6 @@ using Microsoft.AspNet.DataProtection.KeyManagement; using Microsoft.AspNet.DataProtection.XmlEncryption; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.Extensions.Internal; using Microsoft.Win32; #if !DNXCORE50 // [[ISSUE60]] Remove this #ifdef when Core CLR gets support for EncryptedXml @@ -49,8 +48,13 @@ namespace Microsoft.AspNet.DataProtection /// /// Creates a new configuration object linked to a . /// - public DataProtectionConfiguration([NotNull] IServiceCollection services) + public DataProtectionConfiguration(IServiceCollection services) { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + Services = services; } @@ -68,8 +72,13 @@ namespace Microsoft.AspNet.DataProtection /// /// Registrations are additive. /// - public DataProtectionConfiguration AddKeyEscrowSink([NotNull] IKeyEscrowSink sink) + public DataProtectionConfiguration AddKeyEscrowSink(IKeyEscrowSink sink) { + if (sink == null) + { + throw new ArgumentNullException(nameof(sink)); + } + Services.AddInstance(sink); return this; } @@ -97,8 +106,13 @@ namespace Microsoft.AspNet.DataProtection /// /// Registrations are additive. The factory is registered as . /// - public DataProtectionConfiguration AddKeyEscrowSink([NotNull] Func factory) + public DataProtectionConfiguration AddKeyEscrowSink(Func factory) { + if (factory == null) + { + throw new ArgumentNullException(nameof(factory)); + } + Services.AddSingleton(factory); return this; } @@ -108,8 +122,13 @@ namespace Microsoft.AspNet.DataProtection /// /// A callback that configures the global options. /// The 'this' instance. - public DataProtectionConfiguration ConfigureGlobalOptions([NotNull] Action setupAction) + public DataProtectionConfiguration ConfigureGlobalOptions(Action setupAction) { + if (setupAction == null) + { + throw new ArgumentNullException(nameof(setupAction)); + } + Services.Configure(setupAction); return this; } @@ -137,8 +156,13 @@ namespace Microsoft.AspNet.DataProtection /// /// The directory in which to store keys. /// The 'this' instance. - public DataProtectionConfiguration PersistKeysToFileSystem([NotNull] DirectoryInfo directory) + public DataProtectionConfiguration PersistKeysToFileSystem(DirectoryInfo directory) { + if (directory == null) + { + throw new ArgumentNullException(nameof(directory)); + } + Use(DataProtectionServiceDescriptors.IXmlRepository_FileSystem(directory)); return this; } @@ -148,8 +172,13 @@ namespace Microsoft.AspNet.DataProtection /// /// The location in the registry where keys should be stored. /// The 'this' instance. - public DataProtectionConfiguration PersistKeysToRegistry([NotNull] RegistryKey registryKey) + public DataProtectionConfiguration PersistKeysToRegistry(RegistryKey registryKey) { + if (registryKey == null) + { + throw new ArgumentNullException(nameof(registryKey)); + } + Use(DataProtectionServiceDescriptors.IXmlRepository_Registry(registryKey)); return this; } @@ -161,8 +190,13 @@ namespace Microsoft.AspNet.DataProtection /// /// The certificate to use when encrypting keys. /// The 'this' instance. - public DataProtectionConfiguration ProtectKeysWithCertificate([NotNull] X509Certificate2 certificate) + public DataProtectionConfiguration ProtectKeysWithCertificate(X509Certificate2 certificate) { + if (certificate == null) + { + throw new ArgumentNullException(nameof(certificate)); + } + Use(DataProtectionServiceDescriptors.IXmlEncryptor_Certificate(certificate)); return this; } @@ -172,8 +206,13 @@ namespace Microsoft.AspNet.DataProtection /// /// The thumbprint of the certificate to use when encrypting keys. /// The 'this' instance. - public DataProtectionConfiguration ProtectKeysWithCertificate([NotNull] string thumbprint) + public DataProtectionConfiguration ProtectKeysWithCertificate(string thumbprint) { + if (thumbprint == null) + { + throw new ArgumentNullException(nameof(thumbprint)); + } + // Make sure the thumbprint corresponds to a valid certificate. if (new CertificateResolver().ResolveCertificate(thumbprint) == null) { @@ -249,8 +288,13 @@ namespace Microsoft.AspNet.DataProtection /// and arguments. /// This API is only supported on Windows 8 / Windows Server 2012 and higher. /// - public DataProtectionConfiguration ProtectKeysWithDpapiNG([NotNull] string protectionDescriptorRule, DpapiNGProtectionDescriptorFlags flags) + public DataProtectionConfiguration ProtectKeysWithDpapiNG(string protectionDescriptorRule, DpapiNGProtectionDescriptorFlags flags) { + if (protectionDescriptorRule == null) + { + throw new ArgumentNullException(nameof(protectionDescriptorRule)); + } + Use(DataProtectionServiceDescriptors.IXmlEncryptor_DpapiNG(protectionDescriptorRule, flags)); return this; } @@ -287,15 +331,20 @@ namespace Microsoft.AspNet.DataProtection }); return this; } - + /// /// Configures the data protection system to use the specified cryptographic algorithms /// by default when generating protected payloads. /// /// Information about what cryptographic algorithms should be used. /// The 'this' instance. - public DataProtectionConfiguration UseCryptographicAlgorithms([NotNull] AuthenticatedEncryptionOptions options) + public DataProtectionConfiguration UseCryptographicAlgorithms(AuthenticatedEncryptionOptions options) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + return UseCryptographicAlgorithmsCore(options); } @@ -311,8 +360,13 @@ namespace Microsoft.AspNet.DataProtection /// This API is only available on Windows. /// [EditorBrowsable(EditorBrowsableState.Advanced)] - public DataProtectionConfiguration UseCustomCryptographicAlgorithms([NotNull] CngCbcAuthenticatedEncryptionOptions options) + public DataProtectionConfiguration UseCustomCryptographicAlgorithms(CngCbcAuthenticatedEncryptionOptions options) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + return UseCryptographicAlgorithmsCore(options); } @@ -328,8 +382,13 @@ namespace Microsoft.AspNet.DataProtection /// This API is only available on Windows. /// [EditorBrowsable(EditorBrowsableState.Advanced)] - public DataProtectionConfiguration UseCustomCryptographicAlgorithms([NotNull] CngGcmAuthenticatedEncryptionOptions options) + public DataProtectionConfiguration UseCustomCryptographicAlgorithms(CngGcmAuthenticatedEncryptionOptions options) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + return UseCryptographicAlgorithmsCore(options); } @@ -342,8 +401,13 @@ namespace Microsoft.AspNet.DataProtection /// Information about what cryptographic algorithms should be used. /// The 'this' instance. [EditorBrowsable(EditorBrowsableState.Advanced)] - public DataProtectionConfiguration UseCustomCryptographicAlgorithms([NotNull] ManagedAuthenticatedEncryptionOptions options) + public DataProtectionConfiguration UseCustomCryptographicAlgorithms(ManagedAuthenticatedEncryptionOptions options) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + return UseCryptographicAlgorithmsCore(options); } diff --git a/src/Microsoft.AspNet.DataProtection/DataProtectionProviderFactory.cs b/src/Microsoft.AspNet.DataProtection/DataProtectionProviderFactory.cs index fa50355afb..55fe4fd22d 100644 --- a/src/Microsoft.AspNet.DataProtection/DataProtectionProviderFactory.cs +++ b/src/Microsoft.AspNet.DataProtection/DataProtectionProviderFactory.cs @@ -4,7 +4,6 @@ using System; using Microsoft.AspNet.DataProtection.KeyManagement; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.OptionsModel; namespace Microsoft.AspNet.DataProtection @@ -20,13 +19,33 @@ namespace Microsoft.AspNet.DataProtection /// The global options to use when creating the provider. /// Provides mandatory services for use by the provider. /// An . - public static IDataProtectionProvider GetProviderFromServices([NotNull] DataProtectionOptions options, [NotNull] IServiceProvider services) + public static IDataProtectionProvider GetProviderFromServices(DataProtectionOptions options, IServiceProvider services) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + return GetProviderFromServices(options, services, mustCreateImmediately: false); } - internal static IDataProtectionProvider GetProviderFromServices([NotNull] DataProtectionOptions options, [NotNull] IServiceProvider services, bool mustCreateImmediately) + internal static IDataProtectionProvider GetProviderFromServices(DataProtectionOptions options, IServiceProvider services, bool mustCreateImmediately) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + IDataProtectionProvider dataProtectionProvider = null; // If we're being asked to create the provider immediately, then it means that diff --git a/src/Microsoft.AspNet.DataProtection/DataProtectionServiceCollectionExtensions.cs b/src/Microsoft.AspNet.DataProtection/DataProtectionServiceCollectionExtensions.cs index df79eb2b48..ff3d3aaac4 100644 --- a/src/Microsoft.AspNet.DataProtection/DataProtectionServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection/DataProtectionServiceCollectionExtensions.cs @@ -4,7 +4,6 @@ using System; using Microsoft.AspNet.DataProtection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.Extensions.Internal; namespace Microsoft.Extensions.DependencyInjection { @@ -18,8 +17,13 @@ namespace Microsoft.Extensions.DependencyInjection /// /// The service collection to which to add DataProtection services. /// The instance. - public static IServiceCollection AddDataProtection([NotNull] this IServiceCollection services) + public static IServiceCollection AddDataProtection(this IServiceCollection services) { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + services.AddOptions(); services.TryAdd(DataProtectionServices.GetDefaultServices()); return services; @@ -32,8 +36,18 @@ namespace Microsoft.Extensions.DependencyInjection /// A callback which takes a parameter. /// This callback will be responsible for configuring the system. /// The instance. - public static IServiceCollection ConfigureDataProtection([NotNull] this IServiceCollection services, [NotNull] Action configure) + public static IServiceCollection ConfigureDataProtection(this IServiceCollection services, Action configure) { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + + if (configure == null) + { + throw new ArgumentNullException(nameof(configure)); + } + configure(new DataProtectionConfiguration(services)); return services; } diff --git a/src/Microsoft.AspNet.DataProtection/EphemeralDataProtectionProvider.cs b/src/Microsoft.AspNet.DataProtection/EphemeralDataProtectionProvider.cs index 48c5789c50..7ee3de1aca 100644 --- a/src/Microsoft.AspNet.DataProtection/EphemeralDataProtectionProvider.cs +++ b/src/Microsoft.AspNet.DataProtection/EphemeralDataProtectionProvider.cs @@ -5,7 +5,6 @@ using System; using Microsoft.AspNet.Cryptography.Cng; using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; using Microsoft.AspNet.DataProtection.KeyManagement; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection @@ -57,8 +56,13 @@ namespace Microsoft.AspNet.DataProtection _dataProtectionProvider = new KeyRingBasedDataProtectionProvider(keyringProvider, services); } - public IDataProtector CreateProtector([NotNull] string purpose) + public IDataProtector CreateProtector(string purpose) { + if (purpose == null) + { + throw new ArgumentNullException(nameof(purpose)); + } + // just forward to the underlying provider return _dataProtectionProvider.CreateProtector(purpose); } diff --git a/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtectionProvider.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtectionProvider.cs index 5892be7f9c..e56337ee29 100644 --- a/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtectionProvider.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtectionProvider.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.KeyManagement @@ -18,8 +17,13 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement _logger = services.GetLogger(); // note: for protector (not provider!) type, could be null } - public IDataProtector CreateProtector([NotNull] string purpose) + public IDataProtector CreateProtector(string purpose) { + if (purpose == null) + { + throw new ArgumentNullException(nameof(purpose)); + } + return new KeyRingBasedDataProtector( logger: _logger, keyRingProvider: _keyRingProvider, diff --git a/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtector.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtector.cs index 3fcfbe54de..0a29811bde 100644 --- a/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtector.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtector.cs @@ -9,7 +9,6 @@ using System.Linq; using System.Threading; using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.KeyManagement @@ -54,8 +53,13 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement } } - public IDataProtector CreateProtector([NotNull] string purpose) + public IDataProtector CreateProtector(string purpose) { + if (purpose == null) + { + throw new ArgumentNullException(nameof(purpose)); + } + return new KeyRingBasedDataProtector( logger: _logger, keyRingProvider: _keyRingProvider, @@ -86,6 +90,11 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement public byte[] Protect(byte[] plaintext) { + if (plaintext == null) + { + throw new ArgumentNullException(nameof(plaintext)); + } + // argument & state checking if (plaintext == null) { @@ -177,6 +186,11 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement public byte[] Unprotect(byte[] protectedData) { + if (protectedData == null) + { + throw new ArgumentNullException(nameof(protectedData)); + } + // Argument checking will be done by the callee bool requiresMigration, wasRevoked; // unused return DangerousUnprotect(protectedData, diff --git a/src/Microsoft.AspNet.DataProtection/KeyManagement/XmlKeyManager.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/XmlKeyManager.cs index ee58f769a0..f913b7f6a4 100644 --- a/src/Microsoft.AspNet.DataProtection/KeyManagement/XmlKeyManager.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/XmlKeyManager.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using System.Reflection; using System.Runtime.CompilerServices; using System.Threading; using System.Xml; @@ -15,7 +14,6 @@ using Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel using Microsoft.AspNet.DataProtection.Repositories; using Microsoft.AspNet.DataProtection.XmlEncryption; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using static System.FormattableString; @@ -57,10 +55,20 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement /// Configuration for newly-created keys. /// A provider of optional services. public XmlKeyManager( - [NotNull] IXmlRepository repository, - [NotNull] IAuthenticatedEncryptorConfiguration configuration, + IXmlRepository repository, + IAuthenticatedEncryptorConfiguration configuration, IServiceProvider services) { + if (repository == null) + { + throw new ArgumentNullException(nameof(repository)); + } + + if (configuration == null) + { + throw new ArgumentNullException(nameof(configuration)); + } + KeyEncryptor = services.GetService(); // optional KeyRepository = repository; diff --git a/src/Microsoft.AspNet.DataProtection/Repositories/EphemeralXmlRepository.cs b/src/Microsoft.AspNet.DataProtection/Repositories/EphemeralXmlRepository.cs index a42808c83a..d1baa63b9b 100644 --- a/src/Microsoft.AspNet.DataProtection/Repositories/EphemeralXmlRepository.cs +++ b/src/Microsoft.AspNet.DataProtection/Repositories/EphemeralXmlRepository.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; using System.Xml.Linq; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.Repositories @@ -45,8 +44,13 @@ namespace Microsoft.AspNet.DataProtection.Repositories } } - public virtual void StoreElement([NotNull] XElement element, string friendlyName) + public virtual void StoreElement(XElement element, string friendlyName) { + if (element == null) + { + throw new ArgumentNullException(nameof(element)); + } + XElement cloned = new XElement(element); // makes a deep copy so caller doesn't inadvertently modify it // under lock for thread safety diff --git a/src/Microsoft.AspNet.DataProtection/Repositories/FileSystemXmlRepository.cs b/src/Microsoft.AspNet.DataProtection/Repositories/FileSystemXmlRepository.cs index 3825b72c5b..becb107ac0 100644 --- a/src/Microsoft.AspNet.DataProtection/Repositories/FileSystemXmlRepository.cs +++ b/src/Microsoft.AspNet.DataProtection/Repositories/FileSystemXmlRepository.cs @@ -7,7 +7,6 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Xml.Linq; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.Repositories @@ -25,9 +24,13 @@ namespace Microsoft.AspNet.DataProtection.Repositories /// Creates a with keys stored at the given directory. /// /// The directory in which to persist key material. - public FileSystemXmlRepository([NotNull] DirectoryInfo directory) + public FileSystemXmlRepository(DirectoryInfo directory) : this(directory, services: null) { + if (directory == null) + { + throw new ArgumentNullException(nameof(directory)); + } } /// @@ -35,8 +38,13 @@ namespace Microsoft.AspNet.DataProtection.Repositories /// /// The directory in which to persist key material. /// An optional to provide ancillary services. - public FileSystemXmlRepository([NotNull] DirectoryInfo directory, IServiceProvider services) + public FileSystemXmlRepository(DirectoryInfo directory, IServiceProvider services) { + if (directory == null) + { + throw new ArgumentNullException(nameof(directory)); + } + Directory = directory; Services = services; _logger = services?.GetLogger(); @@ -188,8 +196,13 @@ namespace Microsoft.AspNet.DataProtection.Repositories } } - public virtual void StoreElement([NotNull] XElement element, string friendlyName) + public virtual void StoreElement(XElement element, string friendlyName) { + if (element == null) + { + throw new ArgumentNullException(nameof(element)); + } + if (!IsSafeFilename(friendlyName)) { string newFriendlyName = Guid.NewGuid().ToString(); diff --git a/src/Microsoft.AspNet.DataProtection/Repositories/RegistryXmlRepository.cs b/src/Microsoft.AspNet.DataProtection/Repositories/RegistryXmlRepository.cs index 8006694313..b880a12a80 100644 --- a/src/Microsoft.AspNet.DataProtection/Repositories/RegistryXmlRepository.cs +++ b/src/Microsoft.AspNet.DataProtection/Repositories/RegistryXmlRepository.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Security.Principal; using System.Xml.Linq; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using Microsoft.Win32; @@ -27,17 +26,26 @@ namespace Microsoft.AspNet.DataProtection.Repositories /// Creates a with keys stored in the given registry key. /// /// The registry key in which to persist key material. - public RegistryXmlRepository([NotNull] RegistryKey registryKey) + public RegistryXmlRepository(RegistryKey registryKey) : this(registryKey, services: null) { + if (registryKey == null) + { + throw new ArgumentNullException(nameof(registryKey)); + } } /// /// Creates a with keys stored in the given registry key. /// /// The registry key in which to persist key material. - public RegistryXmlRepository([NotNull] RegistryKey registryKey, IServiceProvider services) + public RegistryXmlRepository(RegistryKey registryKey, IServiceProvider services) { + if (registryKey == null) + { + throw new ArgumentNullException(nameof(registryKey)); + } + RegistryKey = registryKey; Services = services; _logger = services?.GetLogger(); @@ -141,8 +149,13 @@ namespace Microsoft.AspNet.DataProtection.Repositories return (!String.IsNullOrEmpty(data)) ? XElement.Parse(data) : null; } - public virtual void StoreElement([NotNull] XElement element, string friendlyName) + public virtual void StoreElement(XElement element, string friendlyName) { + if (element == null) + { + throw new ArgumentNullException(nameof(element)); + } + if (!IsSafeRegistryValueName(friendlyName)) { string newFriendlyName = Guid.NewGuid().ToString(); diff --git a/src/Microsoft.AspNet.DataProtection/Secret.cs b/src/Microsoft.AspNet.DataProtection/Secret.cs index e87446741b..88a1bc3fda 100644 --- a/src/Microsoft.AspNet.DataProtection/Secret.cs +++ b/src/Microsoft.AspNet.DataProtection/Secret.cs @@ -6,7 +6,6 @@ using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.Cryptography.Cng; using Microsoft.AspNet.Cryptography.SafeHandles; using Microsoft.AspNet.DataProtection.Managed; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection { @@ -37,9 +36,13 @@ namespace Microsoft.AspNet.DataProtection /// Creates a new Secret from the provided input value, where the input value /// is specified as an array. /// - public Secret([NotNull] byte[] value) + public Secret(byte[] value) : this(new ArraySegment(value)) { + if (value == null) + { + throw new ArgumentNullException(nameof(value)); + } } /// @@ -64,8 +67,13 @@ namespace Microsoft.AspNet.DataProtection /// /// Creates a new Secret from another secret object. /// - public Secret([NotNull] ISecret secret) + public Secret(ISecret secret) { + if (secret == null) + { + throw new ArgumentNullException(nameof(secret)); + } + Secret other = secret as Secret; if (other != null) { diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/CertificateResolver.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/CertificateResolver.cs index 6af1f71ad9..9ae11096bd 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/CertificateResolver.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/CertificateResolver.cs @@ -21,6 +21,11 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// The resolved , or null if the certificate cannot be found. public virtual X509Certificate2 ResolveCertificate(string thumbprint) { + if (thumbprint == null) + { + throw new ArgumentNullException(nameof(thumbprint)); + } + if (String.IsNullOrEmpty(thumbprint)) { throw Error.Common_ArgumentCannotBeNullOrEmpty(nameof(thumbprint)); diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/CertificateXmlEncryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/CertificateXmlEncryptor.cs index 6c862bdde0..f2a963d8cd 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/CertificateXmlEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/CertificateXmlEncryptor.cs @@ -10,7 +10,6 @@ using System.Xml; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.XmlEncryption @@ -31,7 +30,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// The thumbprint (as a hex string) of the certificate with which to /// encrypt the key material. The certificate must be locatable by . /// A resolver which can locate objects. - public CertificateXmlEncryptor([NotNull] string thumbprint, [NotNull] ICertificateResolver certificateResolver) + public CertificateXmlEncryptor(string thumbprint, ICertificateResolver certificateResolver) : this(thumbprint, certificateResolver, services: null) { } @@ -45,9 +44,19 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// encrypt the key material. The certificate must be locatable by . /// A resolver which can locate objects. /// An optional to provide ancillary services. - public CertificateXmlEncryptor([NotNull] string thumbprint, [NotNull] ICertificateResolver certificateResolver, IServiceProvider services) + public CertificateXmlEncryptor(string thumbprint, ICertificateResolver certificateResolver, IServiceProvider services) : this(services) { + if (thumbprint == null) + { + throw new ArgumentNullException(nameof(thumbprint)); + } + + if (certificateResolver == null) + { + throw new ArgumentNullException(nameof(certificateResolver)); + } + _certFactory = CreateCertFactory(thumbprint, certificateResolver); } @@ -55,7 +64,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// Creates a given an instance. /// /// The with which to encrypt the key material. - public CertificateXmlEncryptor([NotNull] X509Certificate2 certificate) + public CertificateXmlEncryptor(X509Certificate2 certificate) : this(certificate, services: null) { } @@ -66,9 +75,14 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// /// The with which to encrypt the key material. /// An optional to provide ancillary services. - public CertificateXmlEncryptor([NotNull] X509Certificate2 certificate, IServiceProvider services) + public CertificateXmlEncryptor(X509Certificate2 certificate, IServiceProvider services) : this(services) { + if (certificate == null) + { + throw new ArgumentNullException(nameof(certificate)); + } + _certFactory = () => certificate; } @@ -87,8 +101,13 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// along with information about how to /// decrypt it. /// - public EncryptedXmlInfo Encrypt([NotNull] XElement plaintextElement) + public EncryptedXmlInfo Encrypt(XElement plaintextElement) { + if (plaintextElement == null) + { + throw new ArgumentNullException(nameof(plaintextElement)); + } + // // ... // diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlDecryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlDecryptor.cs index b903ddf48a..d451373e42 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlDecryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlDecryptor.cs @@ -5,7 +5,6 @@ using System; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.DataProtection.Cng; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.XmlEncryption @@ -45,8 +44,13 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// An encrypted XML element. /// The decrypted form of . /// - public XElement Decrypt([NotNull] XElement encryptedElement) + public XElement Decrypt(XElement encryptedElement) { + if (encryptedElement == null) + { + throw new ArgumentNullException(nameof(encryptedElement)); + } + try { // diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlEncryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlEncryptor.cs index d84be70c45..e2c6ee8e11 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlEncryptor.cs @@ -7,7 +7,6 @@ using System.Xml.Linq; using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.Cryptography.SafeHandles; using Microsoft.AspNet.DataProtection.Cng; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using static System.FormattableString; @@ -30,7 +29,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// /// The rule string from which to create the protection descriptor. /// Flags controlling the creation of the protection descriptor. - public DpapiNGXmlEncryptor([NotNull] string protectionDescriptorRule, DpapiNGProtectionDescriptorFlags flags) + public DpapiNGXmlEncryptor(string protectionDescriptorRule, DpapiNGProtectionDescriptorFlags flags) : this(protectionDescriptorRule, flags, services: null) { } @@ -41,8 +40,13 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// The rule string from which to create the protection descriptor. /// Flags controlling the creation of the protection descriptor. /// An optional to provide ancillary services. - public DpapiNGXmlEncryptor([NotNull] string protectionDescriptorRule, DpapiNGProtectionDescriptorFlags flags, IServiceProvider services) + public DpapiNGXmlEncryptor(string protectionDescriptorRule, DpapiNGProtectionDescriptorFlags flags, IServiceProvider services) { + if (protectionDescriptorRule == null) + { + throw new ArgumentNullException(nameof(protectionDescriptorRule)); + } + CryptoUtil.AssertPlatformIsWindows8OrLater(); int ntstatus = UnsafeNativeMethods.NCryptCreateProtectionDescriptor(protectionDescriptorRule, (uint)flags, out _protectionDescriptorHandle); @@ -61,8 +65,13 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// along with information about how to /// decrypt it. /// - public EncryptedXmlInfo Encrypt([NotNull] XElement plaintextElement) + public EncryptedXmlInfo Encrypt(XElement plaintextElement) { + if (plaintextElement == null) + { + throw new ArgumentNullException(nameof(plaintextElement)); + } + string protectionDescriptorRuleString = _protectionDescriptorHandle.GetProtectionDescriptorRuleString(); if (_logger.IsVerboseLevelEnabled()) { @@ -92,7 +101,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption // // {base64} // - + var element = new XElement("encryptedKey", new XComment(" This key is encrypted with Windows DPAPI-NG. "), new XComment(" Rule: " + protectionDescriptorRuleString + " "), diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlDecryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlDecryptor.cs index 0d897d34fa..ad59ab8260 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlDecryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlDecryptor.cs @@ -5,7 +5,6 @@ using System; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.DataProtection.Cng; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.XmlEncryption @@ -42,8 +41,13 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// An encrypted XML element. /// The decrypted form of . /// - public XElement Decrypt([NotNull] XElement encryptedElement) + public XElement Decrypt(XElement encryptedElement) { + if (encryptedElement == null) + { + throw new ArgumentNullException(nameof(encryptedElement)); + } + if (_logger.IsVerboseLevelEnabled()) { _logger.LogVerbose("Decrypting secret element using Windows DPAPI."); diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlEncryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlEncryptor.cs index c7f4b429b1..c1726eb7b6 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlEncryptor.cs @@ -5,9 +5,7 @@ using System; using System.Security.Principal; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; using Microsoft.AspNet.DataProtection.Cng; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.XmlEncryption @@ -56,8 +54,13 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// along with information about how to /// decrypt it. /// - public EncryptedXmlInfo Encrypt([NotNull] XElement plaintextElement) + public EncryptedXmlInfo Encrypt(XElement plaintextElement) { + if (plaintextElement == null) + { + throw new ArgumentNullException(nameof(plaintextElement)); + } + if (_logger.IsVerboseLevelEnabled()) { if (_protectToLocalMachine) diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/EncryptedXmlDecryptor.core50.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/EncryptedXmlDecryptor.core50.cs index a9195d0ef4..5ea97ce76c 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/EncryptedXmlDecryptor.core50.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/EncryptedXmlDecryptor.core50.cs @@ -9,7 +9,6 @@ using System; using System.Xml.Linq; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.XmlEncryption @@ -28,7 +27,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption _logger = services.GetLogger(); } - public XElement Decrypt([NotNull] XElement encryptedElement) + public XElement Decrypt(XElement encryptedElement) { if (_logger.IsErrorLevelEnabled()) { diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/EncryptedXmlDecryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/EncryptedXmlDecryptor.cs index e8aeda1287..51fbcefa0d 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/EncryptedXmlDecryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/EncryptedXmlDecryptor.cs @@ -8,7 +8,6 @@ using System.Security.Cryptography.Xml; using System.Xml; using System.Xml.Linq; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.XmlEncryption { @@ -42,8 +41,13 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// An encrypted XML element. /// The decrypted form of . /// - public XElement Decrypt([NotNull] XElement encryptedElement) + public XElement Decrypt(XElement encryptedElement) { + if (encryptedElement == null) + { + throw new ArgumentNullException(nameof(encryptedElement)); + } + // // ... // diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/EncryptedXmlInfo.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/EncryptedXmlInfo.cs index 237736a0d4..e12016a4e1 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/EncryptedXmlInfo.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/EncryptedXmlInfo.cs @@ -4,7 +4,6 @@ using System; using System.Reflection; using System.Xml.Linq; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.XmlEncryption { @@ -20,8 +19,18 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// A piece of encrypted XML. /// The class whose /// method can be used to decrypt . - public EncryptedXmlInfo([NotNull] XElement encryptedElement, [NotNull] Type decryptorType) + public EncryptedXmlInfo(XElement encryptedElement, Type decryptorType) { + if (encryptedElement == null) + { + throw new ArgumentNullException(nameof(encryptedElement)); + } + + if (decryptorType == null) + { + throw new ArgumentNullException(nameof(decryptorType)); + } + if (!typeof(IXmlDecryptor).IsAssignableFrom(decryptorType)) { throw new ArgumentException( diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/ICertificateResolver.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/ICertificateResolver.cs index 9c73d5f9ee..efc7e66b7b 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/ICertificateResolver.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/ICertificateResolver.cs @@ -3,9 +3,7 @@ #if !DNXCORE50 // [[ISSUE60]] Remove this #ifdef when Core CLR gets support for EncryptedXml -using System; using System.Security.Cryptography.X509Certificates; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.XmlEncryption { @@ -19,7 +17,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// /// The thumbprint (as a hex string) of the certificate to resolve. /// The resolved , or null if the certificate cannot be found. - X509Certificate2 ResolveCertificate([NotNull] string thumbprint); + X509Certificate2 ResolveCertificate(string thumbprint); } } diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlDecryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlDecryptor.cs index 53cfe278f7..dac3935544 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlDecryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlDecryptor.cs @@ -1,9 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Xml.Linq; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.XmlEncryption { @@ -21,6 +19,6 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// Implementations of this method must not mutate the /// instance provided by . /// - XElement Decrypt([NotNull] XElement encryptedElement); + XElement Decrypt(XElement encryptedElement); } } diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlEncryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlEncryptor.cs index 8e503d2548..aea3cbb051 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlEncryptor.cs @@ -1,10 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Xml.Linq; -using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.XmlEncryption { @@ -26,6 +23,6 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// Implementations of this method must not mutate the /// instance provided by . /// - EncryptedXmlInfo Encrypt([NotNull] XElement plaintextElement); + EncryptedXmlInfo Encrypt(XElement plaintextElement); } } diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlDecryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlDecryptor.cs index db699c0146..f5d8fe1cb5 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlDecryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlDecryptor.cs @@ -4,7 +4,6 @@ using System; using System.Linq; using System.Xml.Linq; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.DataProtection.XmlEncryption { @@ -19,8 +18,13 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// An encrypted XML element. /// The decrypted form of . /// - public XElement Decrypt([NotNull] XElement encryptedElement) + public XElement Decrypt(XElement encryptedElement) { + if (encryptedElement == null) + { + throw new ArgumentNullException(nameof(encryptedElement)); + } + // // // diff --git a/src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlEncryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlEncryptor.cs index 84ada1112d..fd3cc01fd9 100644 --- a/src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlEncryptor.cs @@ -3,7 +3,6 @@ using System; using System.Xml.Linq; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.DataProtection.XmlEncryption @@ -42,8 +41,13 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption /// along with information about how to /// decrypt it. /// - public EncryptedXmlInfo Encrypt([NotNull] XElement plaintextElement) + public EncryptedXmlInfo Encrypt(XElement plaintextElement) { + if (plaintextElement == null) + { + throw new ArgumentNullException(nameof(plaintextElement)); + } + if (_logger.IsWarningLevelEnabled()) { _logger.LogWarning("Encrypting using a null encryptor; secret information isn't being protected."); diff --git a/src/Microsoft.AspNet.DataProtection/project.json b/src/Microsoft.AspNet.DataProtection/project.json index a398e7e5e2..4a634c02e7 100644 --- a/src/Microsoft.AspNet.DataProtection/project.json +++ b/src/Microsoft.AspNet.DataProtection/project.json @@ -11,7 +11,6 @@ "Microsoft.AspNet.DataProtection.Sources": { "type": "build", "version": "" }, "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", - "Microsoft.Extensions.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Extensions.OptionsModel": "1.0.0-*" }, "frameworks": {