diff --git a/src/Microsoft.AspNet.Authentication.Cookies/ChunkingCookieManager.cs b/src/Microsoft.AspNet.Authentication.Cookies/ChunkingCookieManager.cs index 73beb79503..95838f409f 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/ChunkingCookieManager.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/ChunkingCookieManager.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using Microsoft.AspNet.Http; -using Microsoft.Framework.Internal; using Microsoft.Framework.Primitives; using Microsoft.Framework.WebEncoders; using Microsoft.Net.Http.Headers; @@ -66,8 +65,18 @@ namespace Microsoft.AspNet.Authentication.Cookies /// /// /// The reassembled cookie, if any, or null. - public string GetRequestCookie([NotNull] HttpContext context, [NotNull] string key) + public string GetRequestCookie(HttpContext context, string key) { + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + + if (key == null) + { + throw new ArgumentNullException(nameof(key)); + } + var requestCookies = context.Request.Cookies; var value = requestCookies[key]; var chunksCount = ParseChunksCount(value); @@ -123,8 +132,23 @@ namespace Microsoft.AspNet.Authentication.Cookies /// /// /// - public void AppendResponseCookie([NotNull] HttpContext context, [NotNull] string key, string value, [NotNull] CookieOptions options) + public void AppendResponseCookie(HttpContext context, string key, string value, CookieOptions options) { + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + + if (key == null) + { + throw new ArgumentNullException(nameof(key)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + var escapedKey = Encoder.UrlEncode(key); var template = new SetCookieHeaderValue(escapedKey) @@ -198,8 +222,23 @@ namespace Microsoft.AspNet.Authentication.Cookies /// /// /// - public void DeleteCookie([NotNull] HttpContext context, [NotNull] string key, [NotNull] CookieOptions options) + public void DeleteCookie(HttpContext context, string key, CookieOptions options) { + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + + if (key == null) + { + throw new ArgumentNullException(nameof(key)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + var escapedKey = Encoder.UrlEncode(key); var keys = new List(); keys.Add(escapedKey + "="); @@ -266,18 +305,33 @@ namespace Microsoft.AspNet.Authentication.Cookies } } - private static bool IsQuoted([NotNull] string value) + private static bool IsQuoted(string value) { + if (value == null) + { + throw new ArgumentNullException(nameof(value)); + } + return value.Length >= 2 && value[0] == '"' && value[value.Length - 1] == '"'; } - private static string RemoveQuotes([NotNull] string value) + private static string RemoveQuotes(string value) { + if (value == null) + { + throw new ArgumentNullException(nameof(value)); + } + return value.Substring(1, value.Length - 2); } - private static string Quote([NotNull] string value) + private static string Quote(string value) { + if (value == null) + { + throw new ArgumentNullException(nameof(value)); + } + return '"' + value + '"'; } } diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieAppBuilderExtensions.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieAppBuilderExtensions.cs index 2ed5f99827..ef4a252a39 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/CookieAppBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieAppBuilderExtensions.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Authentication.Cookies; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Builder { @@ -17,8 +16,13 @@ namespace Microsoft.AspNet.Builder /// /// The IApplicationBuilder passed to your configuration method /// The original app parameter - public static IApplicationBuilder UseCookieAuthentication([NotNull] this IApplicationBuilder app) + public static IApplicationBuilder UseCookieAuthentication(this IApplicationBuilder app) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + return app.UseCookieAuthentication(new CookieAuthenticationOptions()); } @@ -28,8 +32,13 @@ namespace Microsoft.AspNet.Builder /// The IApplicationBuilder passed to your configuration method /// Used to configure the options for the middleware /// The original app parameter - public static IApplicationBuilder UseCookieAuthentication([NotNull] this IApplicationBuilder app, Action configureOptions) + public static IApplicationBuilder UseCookieAuthentication(this IApplicationBuilder app, Action configureOptions) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + var options = new CookieAuthenticationOptions(); if (configureOptions != null) { @@ -44,8 +53,18 @@ namespace Microsoft.AspNet.Builder /// The IApplicationBuilder passed to your configuration method /// Used to configure the middleware /// The original app parameter - public static IApplicationBuilder UseCookieAuthentication([NotNull] this IApplicationBuilder app, [NotNull] CookieAuthenticationOptions options) + public static IApplicationBuilder UseCookieAuthentication(this IApplicationBuilder app, CookieAuthenticationOptions options) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + return app.UseMiddleware(options); } } diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationHandler.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationHandler.cs index 5ddbde3891..e8c100adf8 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationHandler.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationHandler.cs @@ -9,7 +9,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Http.Features.Authentication; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.Primitives; using Microsoft.Net.Http.Headers; @@ -402,8 +401,13 @@ namespace Microsoft.AspNet.Authentication.Cookies return true; } - protected override async Task HandleUnauthorizedAsync([NotNull] ChallengeContext context) + protected override async Task HandleUnauthorizedAsync(ChallengeContext context) { + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + var redirectUri = new AuthenticationProperties(context.Properties).RedirectUri; try { diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationMiddleware.cs index 900ad5505d..faa8fd99d9 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationMiddleware.cs @@ -4,7 +4,6 @@ using System; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.WebEncoders; @@ -13,13 +12,38 @@ namespace Microsoft.AspNet.Authentication.Cookies public class CookieAuthenticationMiddleware : AuthenticationMiddleware { public CookieAuthenticationMiddleware( - [NotNull] RequestDelegate next, - [NotNull] IDataProtectionProvider dataProtectionProvider, - [NotNull] ILoggerFactory loggerFactory, - [NotNull] IUrlEncoder urlEncoder, - [NotNull] CookieAuthenticationOptions options) + RequestDelegate next, + IDataProtectionProvider dataProtectionProvider, + ILoggerFactory loggerFactory, + IUrlEncoder urlEncoder, + CookieAuthenticationOptions options) : base(next, options, loggerFactory, urlEncoder) { + if (next == null) + { + throw new ArgumentNullException(nameof(next)); + } + + if (dataProtectionProvider == null) + { + throw new ArgumentNullException(nameof(dataProtectionProvider)); + } + + if (loggerFactory == null) + { + throw new ArgumentNullException(nameof(loggerFactory)); + } + + if (urlEncoder == null) + { + throw new ArgumentNullException(nameof(urlEncoder)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + if (Options.Events == null) { Options.Events = new CookieAuthenticationEvents(); diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationOptions.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationOptions.cs index 1a1f71bd40..bf10e155b5 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationOptions.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationOptions.cs @@ -4,7 +4,6 @@ using System; using System.Diagnostics.CodeAnalysis; using Microsoft.AspNet.Http; -using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; namespace Microsoft.AspNet.Authentication.Cookies @@ -39,9 +38,13 @@ namespace Microsoft.AspNet.Authentication.Cookies public string CookieName { get { return _cookieName; } - [param: NotNull] set { + if (value == null) + { + throw new ArgumentNullException(nameof(value)); + } + _cookieName = value; } } diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs index d609f12bde..5fb59747b8 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs @@ -4,7 +4,6 @@ using System; using Microsoft.AspNet.Authentication.Cookies; using Microsoft.Framework.Configuration; -using Microsoft.Framework.Internal; namespace Microsoft.Framework.DependencyInjection { @@ -13,13 +12,33 @@ namespace Microsoft.Framework.DependencyInjection /// public static class CookieServiceCollectionExtensions { - public static IServiceCollection AddCookieAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure) + public static IServiceCollection AddCookieAuthentication(this IServiceCollection services, Action configure) { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + + if (configure == null) + { + throw new ArgumentNullException(nameof(configure)); + } + return services.Configure(configure); } - public static IServiceCollection AddCookieAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config) + public static IServiceCollection AddCookieAuthentication(this IServiceCollection services, IConfiguration config) { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + + if (config == null) + { + throw new ArgumentNullException(nameof(config)); + } + return services.Configure(config); } } diff --git a/src/Microsoft.AspNet.Authentication.Cookies/Events/CookieValidatePrincipalContext.cs b/src/Microsoft.AspNet.Authentication.Cookies/Events/CookieValidatePrincipalContext.cs index 5a95fe639f..a37f776d9e 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/Events/CookieValidatePrincipalContext.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/Events/CookieValidatePrincipalContext.cs @@ -1,10 +1,10 @@ // 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.Claims; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authentication.Cookies { @@ -19,9 +19,24 @@ namespace Microsoft.AspNet.Authentication.Cookies /// /// Contains the initial values for identity and extra data /// - public CookieValidatePrincipalContext([NotNull] HttpContext context, [NotNull] AuthenticationTicket ticket, [NotNull] CookieAuthenticationOptions options) + public CookieValidatePrincipalContext(HttpContext context, AuthenticationTicket ticket, CookieAuthenticationOptions options) : base(context, options) { + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + + if (ticket == null) + { + throw new ArgumentNullException(nameof(ticket)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + Principal = ticket.Principal; Properties = ticket.Properties; } diff --git a/src/Microsoft.AspNet.Authentication.Cookies/project.json b/src/Microsoft.AspNet.Authentication.Cookies/project.json index 34d775f155..c7aea2a71f 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/project.json +++ b/src/Microsoft.AspNet.Authentication.Cookies/project.json @@ -5,9 +5,11 @@ "type": "git", "url": "git://github.com/aspnet/security" }, + "compilationOptions": { + "warningsAsErrors": true + }, "dependencies": { "Microsoft.AspNet.Authentication": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.WebEncoders": "1.0.0-*", "Newtonsoft.Json": "6.0.6" }, diff --git a/src/Microsoft.AspNet.Authentication.Facebook/FacebookAppBuilderExtensions.cs b/src/Microsoft.AspNet.Authentication.Facebook/FacebookAppBuilderExtensions.cs index 0e6fc8a971..0df075e356 100644 --- a/src/Microsoft.AspNet.Authentication.Facebook/FacebookAppBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.Facebook/FacebookAppBuilderExtensions.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Authentication.Facebook; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Builder { @@ -17,8 +16,18 @@ namespace Microsoft.AspNet.Builder /// /// The passed to the configure method. /// The updated . - public static IApplicationBuilder UseFacebookAuthentication([NotNull] this IApplicationBuilder app, [NotNull] FacebookOptions options) + public static IApplicationBuilder UseFacebookAuthentication(this IApplicationBuilder app, FacebookOptions options) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + return app.UseMiddleware(options); } @@ -28,8 +37,13 @@ namespace Microsoft.AspNet.Builder /// The passed to the configure method. /// Configures the options. /// The updated . - public static IApplicationBuilder UseFacebookAuthentication([NotNull] this IApplicationBuilder app, Action configureOptions) + public static IApplicationBuilder UseFacebookAuthentication(this IApplicationBuilder app, Action configureOptions) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + var options = new FacebookOptions(); if (configureOptions != null) { diff --git a/src/Microsoft.AspNet.Authentication.Facebook/FacebookHelper.cs b/src/Microsoft.AspNet.Authentication.Facebook/FacebookHelper.cs index f3a99e6c49..bb950f32a3 100644 --- a/src/Microsoft.AspNet.Authentication.Facebook/FacebookHelper.cs +++ b/src/Microsoft.AspNet.Authentication.Facebook/FacebookHelper.cs @@ -1,7 +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 Microsoft.Framework.Internal; +using System; using Newtonsoft.Json.Linq; namespace Microsoft.AspNet.Authentication.Facebook @@ -15,26 +15,66 @@ namespace Microsoft.AspNet.Authentication.Facebook /// /// Gets the Facebook user ID. /// - public static string GetId([NotNull] JObject user) => user.Value("id"); + public static string GetId(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return user.Value("id"); + } /// /// Gets the user's name. /// - public static string GetName([NotNull] JObject user) => user.Value("name"); + public static string GetName(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return user.Value("name"); + } /// /// Gets the user's link. /// - public static string GetLink([NotNull] JObject user) => user.Value("link"); + public static string GetLink(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + return user.Value("link"); + } /// /// Gets the Facebook username. /// - public static string GetUserName([NotNull] JObject user) => user.Value("username"); + public static string GetUserName(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return user.Value("username"); + } + /// /// Gets the Facebook email. /// - public static string GetEmail([NotNull] JObject user) => user.Value("email"); + public static string GetEmail(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return user.Value("email"); + } } } diff --git a/src/Microsoft.AspNet.Authentication.Facebook/FacebookMiddleware.cs b/src/Microsoft.AspNet.Authentication.Facebook/FacebookMiddleware.cs index aa518d5df2..b2893852e9 100644 --- a/src/Microsoft.AspNet.Authentication.Facebook/FacebookMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.Facebook/FacebookMiddleware.cs @@ -6,7 +6,6 @@ using System.Globalization; using Microsoft.AspNet.Authentication.OAuth; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; using Microsoft.Framework.WebEncoders; @@ -29,14 +28,44 @@ namespace Microsoft.AspNet.Authentication.Facebook /// Configuration options for the middleware. /// public FacebookMiddleware( - [NotNull] RequestDelegate next, - [NotNull] IDataProtectionProvider dataProtectionProvider, - [NotNull] ILoggerFactory loggerFactory, - [NotNull] IUrlEncoder encoder, - [NotNull] IOptions sharedOptions, - [NotNull] FacebookOptions options) + RequestDelegate next, + IDataProtectionProvider dataProtectionProvider, + ILoggerFactory loggerFactory, + IUrlEncoder encoder, + IOptions sharedOptions, + FacebookOptions options) : base(next, dataProtectionProvider, loggerFactory, encoder, sharedOptions, options) { + if (next == null) + { + throw new ArgumentNullException(nameof(next)); + } + + if (dataProtectionProvider == null) + { + throw new ArgumentNullException(nameof(dataProtectionProvider)); + } + + if (loggerFactory == null) + { + throw new ArgumentNullException(nameof(loggerFactory)); + } + + if (encoder == null) + { + throw new ArgumentNullException(nameof(encoder)); + } + + if (sharedOptions == null) + { + throw new ArgumentNullException(nameof(sharedOptions)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + if (string.IsNullOrEmpty(Options.AppId)) { throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.Exception_OptionMustBeProvided, nameof(Options.AppId))); diff --git a/src/Microsoft.AspNet.Authentication.Facebook/project.json b/src/Microsoft.AspNet.Authentication.Facebook/project.json index f481284509..e68e580669 100644 --- a/src/Microsoft.AspNet.Authentication.Facebook/project.json +++ b/src/Microsoft.AspNet.Authentication.Facebook/project.json @@ -5,9 +5,11 @@ "type": "git", "url": "git://github.com/aspnet/security" }, + "compilationOptions": { + "warningsAsErrors": true + }, "dependencies": { "Microsoft.AspNet.Authentication.OAuth": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, "Newtonsoft.Json": "6.0.6" }, "frameworks": { diff --git a/src/Microsoft.AspNet.Authentication.Google/GoogleAppBuilderExtensions.cs b/src/Microsoft.AspNet.Authentication.Google/GoogleAppBuilderExtensions.cs index 7d1599ff52..08226c527c 100644 --- a/src/Microsoft.AspNet.Authentication.Google/GoogleAppBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.Google/GoogleAppBuilderExtensions.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Authentication.Google; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Builder { @@ -18,8 +17,18 @@ namespace Microsoft.AspNet.Builder /// The passed to the configure method. /// The Middleware options. /// The updated . - public static IApplicationBuilder UseGoogleAuthentication([NotNull] this IApplicationBuilder app, [NotNull] GoogleOptions options) + public static IApplicationBuilder UseGoogleAuthentication(this IApplicationBuilder app, GoogleOptions options) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + return app.UseMiddleware(options); } @@ -30,8 +39,13 @@ namespace Microsoft.AspNet.Builder /// Used to configure Middleware options. /// Name of the options instance to be used /// The updated . - public static IApplicationBuilder UseGoogleAuthentication([NotNull] this IApplicationBuilder app, Action configureOptions) + public static IApplicationBuilder UseGoogleAuthentication(this IApplicationBuilder app, Action configureOptions) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + var options = new GoogleOptions(); if (configureOptions != null) { diff --git a/src/Microsoft.AspNet.Authentication.Google/GoogleHelper.cs b/src/Microsoft.AspNet.Authentication.Google/GoogleHelper.cs index e8618f3e31..a30e7d1fc2 100644 --- a/src/Microsoft.AspNet.Authentication.Google/GoogleHelper.cs +++ b/src/Microsoft.AspNet.Authentication.Google/GoogleHelper.cs @@ -1,6 +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 Microsoft.Framework.Internal; using Newtonsoft.Json.Linq; @@ -15,32 +16,80 @@ namespace Microsoft.AspNet.Authentication.Google /// /// Gets the Google user ID. /// - public static string GetId([NotNull] JObject user) => user.Value("id"); + public static string GetId(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return user.Value("id"); + } /// /// Gets the user's name. /// - public static string GetName([NotNull] JObject user) => user.Value("displayName"); + public static string GetName(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return user.Value("displayName"); + } /// /// Gets the user's given name. /// - public static string GetGivenName([NotNull] JObject user) => TryGetValue(user, "name", "givenName"); + public static string GetGivenName(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return TryGetValue(user, "name", "givenName"); + } /// /// Gets the user's family name. /// - public static string GetFamilyName([NotNull] JObject user) => TryGetValue(user, "name", "familyName"); + public static string GetFamilyName(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return TryGetValue(user, "name", "familyName"); + } /// /// Gets the user's profile link. /// - public static string GetProfile([NotNull] JObject user) => user.Value("url"); + public static string GetProfile(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return user.Value("url"); + } /// /// Gets the user's email. /// - public static string GetEmail([NotNull] JObject user) => TryGetFirstValue(user, "emails", "value"); + public static string GetEmail(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return TryGetFirstValue(user, "emails", "value"); + } // Get the given subProperty from a property. private static string TryGetValue(JObject user, string propertyName, string subProperty) diff --git a/src/Microsoft.AspNet.Authentication.Google/GoogleMiddleware.cs b/src/Microsoft.AspNet.Authentication.Google/GoogleMiddleware.cs index 43dd9ba80e..1d97d5ec5c 100644 --- a/src/Microsoft.AspNet.Authentication.Google/GoogleMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.Google/GoogleMiddleware.cs @@ -1,11 +1,11 @@ // 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.Diagnostics.CodeAnalysis; using Microsoft.AspNet.Authentication.OAuth; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; using Microsoft.Framework.WebEncoders; @@ -29,14 +29,44 @@ namespace Microsoft.AspNet.Authentication.Google /// Configuration options for the middleware. /// public GoogleMiddleware( - [NotNull] RequestDelegate next, - [NotNull] IDataProtectionProvider dataProtectionProvider, - [NotNull] ILoggerFactory loggerFactory, - [NotNull] IUrlEncoder encoder, - [NotNull] IOptions sharedOptions, - [NotNull] GoogleOptions options) + RequestDelegate next, + IDataProtectionProvider dataProtectionProvider, + ILoggerFactory loggerFactory, + IUrlEncoder encoder, + IOptions sharedOptions, + GoogleOptions options) : base(next, dataProtectionProvider, loggerFactory, encoder, sharedOptions, options) { + if (next == null) + { + throw new ArgumentNullException(nameof(next)); + } + + if (dataProtectionProvider == null) + { + throw new ArgumentNullException(nameof(dataProtectionProvider)); + } + + if (loggerFactory == null) + { + throw new ArgumentNullException(nameof(loggerFactory)); + } + + if (encoder == null) + { + throw new ArgumentNullException(nameof(encoder)); + } + + if (sharedOptions == null) + { + throw new ArgumentNullException(nameof(sharedOptions)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + if (Options.Scope.Count == 0) { // Google OAuth 2.0 asks for non-empty scope. If user didn't set it, set default scope to diff --git a/src/Microsoft.AspNet.Authentication.Google/project.json b/src/Microsoft.AspNet.Authentication.Google/project.json index ab65c2cf78..6f59f918f1 100644 --- a/src/Microsoft.AspNet.Authentication.Google/project.json +++ b/src/Microsoft.AspNet.Authentication.Google/project.json @@ -5,9 +5,11 @@ "type": "git", "url": "git://github.com/aspnet/security" }, + "compilationOptions": { + "warningsAsErrors": true + }, "dependencies": { - "Microsoft.AspNet.Authentication.OAuth": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" } + "Microsoft.AspNet.Authentication.OAuth": "1.0.0-*" }, "frameworks": { "dnx451": { }, diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerAppBuilderExtensions.cs b/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerAppBuilderExtensions.cs index be2d51b1b9..7330aa7b3c 100644 --- a/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerAppBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerAppBuilderExtensions.cs @@ -3,8 +3,6 @@ using System; using Microsoft.AspNet.Authentication.JwtBearer; -using Microsoft.Framework.Internal; -using Microsoft.Framework.OptionsModel; namespace Microsoft.AspNet.Builder { @@ -24,8 +22,18 @@ namespace Microsoft.AspNet.Builder /// The application builder /// Options which control the processing of the bearer header. /// The application builder - public static IApplicationBuilder UseJwtBearerAuthentication([NotNull] this IApplicationBuilder app, [NotNull] JwtBearerOptions options) + public static IApplicationBuilder UseJwtBearerAuthentication(this IApplicationBuilder app, JwtBearerOptions options) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + return app.UseMiddleware(options); } @@ -40,8 +48,13 @@ namespace Microsoft.AspNet.Builder /// The application builder /// Used to configure Middleware options. /// The application builder - public static IApplicationBuilder UseJwtBearerAuthentication([NotNull] this IApplicationBuilder app, Action configureOptions) + public static IApplicationBuilder UseJwtBearerAuthentication(this IApplicationBuilder app, Action configureOptions) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + var options = new JwtBearerOptions(); if (configureOptions != null) { diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerMiddleware.cs b/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerMiddleware.cs index ce919a9206..26e9e1e804 100644 --- a/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerMiddleware.cs @@ -4,7 +4,6 @@ using System; using System.Net.Http; using Microsoft.AspNet.Builder; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.WebEncoders; using Microsoft.IdentityModel.Protocols; @@ -25,12 +24,32 @@ namespace Microsoft.AspNet.Authentication.JwtBearer /// extension method. /// public JwtBearerMiddleware( - [NotNull] RequestDelegate next, - [NotNull] ILoggerFactory loggerFactory, - [NotNull] IUrlEncoder encoder, - [NotNull] JwtBearerOptions options) + RequestDelegate next, + ILoggerFactory loggerFactory, + IUrlEncoder encoder, + JwtBearerOptions options) : base(next, options, loggerFactory, encoder) { + if (next == null) + { + throw new ArgumentNullException(nameof(next)); + } + + if (loggerFactory == null) + { + throw new ArgumentNullException(nameof(loggerFactory)); + } + + if (encoder == null) + { + throw new ArgumentNullException(nameof(encoder)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + if (Options.Events == null) { Options.Events = new JwtBearerEvents(); diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/project.json b/src/Microsoft.AspNet.Authentication.JwtBearer/project.json index 722ed90f88..e1b5de2dfd 100644 --- a/src/Microsoft.AspNet.Authentication.JwtBearer/project.json +++ b/src/Microsoft.AspNet.Authentication.JwtBearer/project.json @@ -5,9 +5,11 @@ "type": "git", "url": "git://github.com/aspnet/security" }, + "compilationOptions": { + "warningsAsErrors": true + }, "dependencies": { "Microsoft.AspNet.Authentication": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": "2.0.0-beta8-*" }, "frameworks": { diff --git a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountAppBuilderExtensions.cs b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountAppBuilderExtensions.cs index 9fe1887bbf..c890b7a9e2 100644 --- a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountAppBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountAppBuilderExtensions.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Authentication.MicrosoftAccount; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Builder { @@ -12,13 +11,28 @@ namespace Microsoft.AspNet.Builder /// public static class MicrosoftAccountAuthenticationExtensions { - public static IApplicationBuilder UseMicrosoftAccountAuthentication([NotNull] this IApplicationBuilder app, [NotNull] MicrosoftAccountOptions options) + public static IApplicationBuilder UseMicrosoftAccountAuthentication(this IApplicationBuilder app, MicrosoftAccountOptions options) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + return app.UseMiddleware(options); } - public static IApplicationBuilder UseMicrosoftAccountAuthentication([NotNull] this IApplicationBuilder app, Action configureOptions) + public static IApplicationBuilder UseMicrosoftAccountAuthentication(this IApplicationBuilder app, Action configureOptions) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + var options = new MicrosoftAccountOptions(); if (configureOptions != null) { diff --git a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountHelper.cs b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountHelper.cs index 8de7ad6138..b0573688e9 100644 --- a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountHelper.cs +++ b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountHelper.cs @@ -1,7 +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 Microsoft.Framework.Internal; +using System; using Newtonsoft.Json.Linq; namespace Microsoft.AspNet.Authentication.MicrosoftAccount @@ -15,27 +15,66 @@ namespace Microsoft.AspNet.Authentication.MicrosoftAccount /// /// Gets the Microsoft Account user ID. /// - public static string GetId([NotNull] JObject user) => user.Value("id"); + public static string GetId(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return user.Value("id"); + } /// /// Gets the user's name. /// - public static string GetName([NotNull] JObject user) => user.Value("name"); + public static string GetName(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return user.Value("name"); + } /// /// Gets the user's first name. /// - public static string GetFirstName([NotNull] JObject user) => user.Value("first_name"); + public static string GetFirstName(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return user.Value("first_name"); + } /// /// Gets the user's last name. /// - public static string GetLastName([NotNull] JObject user) => user.Value("last_name"); + public static string GetLastName(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return user.Value("last_name"); + } /// /// Gets the user's email address. /// - public static string GetEmail([NotNull] JObject user) => user.Value("emails") - ?.Value("preferred"); + public static string GetEmail(JObject user) + { + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + + return user.Value("emails")?.Value("preferred"); + } } } diff --git a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountMiddleware.cs b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountMiddleware.cs index 9f2c5d96e8..167baa9901 100644 --- a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountMiddleware.cs @@ -1,10 +1,10 @@ // 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.AspNet.Authentication.OAuth; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; using Microsoft.Framework.WebEncoders; @@ -27,14 +27,44 @@ namespace Microsoft.AspNet.Authentication.MicrosoftAccount /// Configuration options for the middleware. /// public MicrosoftAccountMiddleware( - [NotNull] RequestDelegate next, - [NotNull] IDataProtectionProvider dataProtectionProvider, - [NotNull] ILoggerFactory loggerFactory, - [NotNull] IUrlEncoder encoder, - [NotNull] IOptions sharedOptions, - [NotNull] MicrosoftAccountOptions options) + RequestDelegate next, + IDataProtectionProvider dataProtectionProvider, + ILoggerFactory loggerFactory, + IUrlEncoder encoder, + IOptions sharedOptions, + MicrosoftAccountOptions options) : base(next, dataProtectionProvider, loggerFactory, encoder, sharedOptions, options) { + if (next == null) + { + throw new ArgumentNullException(nameof(next)); + } + + if (dataProtectionProvider == null) + { + throw new ArgumentNullException(nameof(dataProtectionProvider)); + } + + if (loggerFactory == null) + { + throw new ArgumentNullException(nameof(loggerFactory)); + } + + if (encoder == null) + { + throw new ArgumentNullException(nameof(encoder)); + } + + if (sharedOptions == null) + { + throw new ArgumentNullException(nameof(sharedOptions)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + if (Options.Scope.Count == 0) { // LiveID requires a scope string, so if the user didn't set one we go for the least possible. diff --git a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/project.json b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/project.json index bcc6b3df0c..e5fd920b7f 100644 --- a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/project.json +++ b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/project.json @@ -5,9 +5,11 @@ "type": "git", "url": "git://github.com/aspnet/security" }, + "compilationOptions": { + "warningsAsErrors": true + }, "dependencies": { - "Microsoft.AspNet.Authentication.OAuth": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" } + "Microsoft.AspNet.Authentication.OAuth": "1.0.0-*" }, "frameworks": { "dnx451": { }, diff --git a/src/Microsoft.AspNet.Authentication.OAuth/Events/OAuthCreatingTicketContext.cs b/src/Microsoft.AspNet.Authentication.OAuth/Events/OAuthCreatingTicketContext.cs index 2bbacbfd2e..315f89225b 100644 --- a/src/Microsoft.AspNet.Authentication.OAuth/Events/OAuthCreatingTicketContext.cs +++ b/src/Microsoft.AspNet.Authentication.OAuth/Events/OAuthCreatingTicketContext.cs @@ -7,7 +7,6 @@ using System.Net.Http; using System.Security.Claims; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; -using Microsoft.Framework.Internal; using Newtonsoft.Json.Linq; namespace Microsoft.AspNet.Authentication.OAuth @@ -25,10 +24,10 @@ namespace Microsoft.AspNet.Authentication.OAuth /// The HTTP client used by the authentication middleware /// The tokens returned from the token endpoint. public OAuthCreatingTicketContext( - [NotNull] HttpContext context, - [NotNull] OAuthOptions options, - [NotNull] HttpClient backchannel, - [NotNull] OAuthTokenResponse tokens) + HttpContext context, + OAuthOptions options, + HttpClient backchannel, + OAuthTokenResponse tokens) : this(context, options, backchannel, tokens, user: new JObject()) { } @@ -42,13 +41,38 @@ namespace Microsoft.AspNet.Authentication.OAuth /// The tokens returned from the token endpoint. /// The JSON-serialized user. public OAuthCreatingTicketContext( - [NotNull] HttpContext context, - [NotNull] OAuthOptions options, - [NotNull] HttpClient backchannel, - [NotNull] OAuthTokenResponse tokens, - [NotNull] JObject user) + HttpContext context, + OAuthOptions options, + HttpClient backchannel, + OAuthTokenResponse tokens, + JObject user) : base(context, options) { + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + + if (backchannel == null) + { + throw new ArgumentNullException(nameof(backchannel)); + } + + if (tokens == null) + { + throw new ArgumentNullException(nameof(tokens)); + } + + if (user == null) + { + throw new ArgumentNullException(nameof(user)); + } + TokenResponse = tokens; Backchannel = backchannel; User = user; @@ -96,7 +120,7 @@ namespace Microsoft.AspNet.Authentication.OAuth return null; } } - + /// /// Gets the backchannel used to communicate with the provider. /// diff --git a/src/Microsoft.AspNet.Authentication.OAuth/OAuthExtensions.cs b/src/Microsoft.AspNet.Authentication.OAuth/OAuthExtensions.cs index 813f3cdfeb..ecc03f428e 100644 --- a/src/Microsoft.AspNet.Authentication.OAuth/OAuthExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.OAuth/OAuthExtensions.cs @@ -3,8 +3,6 @@ using System; using Microsoft.AspNet.Authentication.OAuth; -using Microsoft.Framework.Internal; -using Microsoft.Framework.OptionsModel; namespace Microsoft.AspNet.Builder { @@ -19,8 +17,18 @@ namespace Microsoft.AspNet.Builder /// The passed to the configure method. /// Configures the middleware options. /// The updated . - public static IApplicationBuilder UseOAuthAuthentication([NotNull] this IApplicationBuilder app, [NotNull] Action configureOptions) + public static IApplicationBuilder UseOAuthAuthentication(this IApplicationBuilder app, Action configureOptions) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + + if (configureOptions == null) + { + throw new ArgumentNullException(nameof(configureOptions)); + } + var options = new OAuthOptions(); if (configureOptions != null) { @@ -35,8 +43,18 @@ namespace Microsoft.AspNet.Builder /// The passed to the configure method. /// The middleware configuration options. /// The updated . - public static IApplicationBuilder UseOAuthAuthentication([NotNull] this IApplicationBuilder app, [NotNull] OAuthOptions options) + public static IApplicationBuilder UseOAuthAuthentication(this IApplicationBuilder app, OAuthOptions options) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + return app.UseMiddleware>(options); } } diff --git a/src/Microsoft.AspNet.Authentication.OAuth/OAuthHandler.cs b/src/Microsoft.AspNet.Authentication.OAuth/OAuthHandler.cs index c2c3481597..fcf693b249 100644 --- a/src/Microsoft.AspNet.Authentication.OAuth/OAuthHandler.cs +++ b/src/Microsoft.AspNet.Authentication.OAuth/OAuthHandler.cs @@ -13,7 +13,6 @@ using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Http.Extensions; using Microsoft.AspNet.Http.Features.Authentication; using Microsoft.AspNet.WebUtilities; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.Primitives; using Newtonsoft.Json.Linq; @@ -148,7 +147,7 @@ namespace Microsoft.AspNet.Authentication.OAuth ClaimValueTypes.String, Options.ClaimsIssuer)); } } - + return await CreateTicketAsync(identity, properties, tokens); } catch (Exception ex) @@ -188,7 +187,7 @@ namespace Microsoft.AspNet.Authentication.OAuth Principal = new ClaimsPrincipal(identity), Properties = properties }; - + await Options.Events.CreatingTicket(context); if (context.Principal?.Identity == null) @@ -199,8 +198,13 @@ namespace Microsoft.AspNet.Authentication.OAuth return new AuthenticationTicket(context.Principal, context.Properties, Options.AuthenticationScheme); } - protected override async Task HandleUnauthorizedAsync([NotNull] ChallengeContext context) + protected override async Task HandleUnauthorizedAsync(ChallengeContext context) { + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + var properties = new AuthenticationProperties(context.Properties); if (string.IsNullOrEmpty(properties.RedirectUri)) { @@ -257,8 +261,13 @@ namespace Microsoft.AspNet.Authentication.OAuth return string.Join(" ", Options.Scope); } - protected void GenerateCorrelationId([NotNull] AuthenticationProperties properties) + protected void GenerateCorrelationId(AuthenticationProperties properties) { + if (properties == null) + { + throw new ArgumentNullException(nameof(properties)); + } + var correlationKey = Constants.CorrelationPrefix + Options.AuthenticationScheme; var nonceBytes = new byte[32]; @@ -276,8 +285,13 @@ namespace Microsoft.AspNet.Authentication.OAuth Response.Cookies.Append(correlationKey, correlationId, cookieOptions); } - protected bool ValidateCorrelationId([NotNull] AuthenticationProperties properties) + protected bool ValidateCorrelationId(AuthenticationProperties properties) { + if (properties == null) + { + throw new ArgumentNullException(nameof(properties)); + } + var correlationKey = Constants.CorrelationPrefix + Options.AuthenticationScheme; var correlationCookie = Request.Cookies[correlationKey]; if (string.IsNullOrEmpty(correlationCookie)) diff --git a/src/Microsoft.AspNet.Authentication.OAuth/OAuthMiddleware.cs b/src/Microsoft.AspNet.Authentication.OAuth/OAuthMiddleware.cs index 5030fd9673..f9bca2c49b 100644 --- a/src/Microsoft.AspNet.Authentication.OAuth/OAuthMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.OAuth/OAuthMiddleware.cs @@ -7,7 +7,6 @@ using System.Globalization; using System.Net.Http; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; using Microsoft.Framework.WebEncoders; @@ -28,14 +27,44 @@ namespace Microsoft.AspNet.Authentication.OAuth /// /// Configuration options for the middleware. public OAuthMiddleware( - [NotNull] RequestDelegate next, - [NotNull] IDataProtectionProvider dataProtectionProvider, - [NotNull] ILoggerFactory loggerFactory, - [NotNull] IUrlEncoder encoder, - [NotNull] IOptions sharedOptions, - [NotNull] TOptions options) + RequestDelegate next, + IDataProtectionProvider dataProtectionProvider, + ILoggerFactory loggerFactory, + IUrlEncoder encoder, + IOptions sharedOptions, + TOptions options) : base(next, options, loggerFactory, encoder) { + if (next == null) + { + throw new ArgumentNullException(nameof(next)); + } + + if (dataProtectionProvider == null) + { + throw new ArgumentNullException(nameof(dataProtectionProvider)); + } + + if (loggerFactory == null) + { + throw new ArgumentNullException(nameof(loggerFactory)); + } + + if (encoder == null) + { + throw new ArgumentNullException(nameof(encoder)); + } + + if (sharedOptions == null) + { + throw new ArgumentNullException(nameof(sharedOptions)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + // todo: review error handling if (string.IsNullOrEmpty(Options.AuthenticationScheme)) { diff --git a/src/Microsoft.AspNet.Authentication.OAuth/project.json b/src/Microsoft.AspNet.Authentication.OAuth/project.json index d9d3429cfd..374ed755b5 100644 --- a/src/Microsoft.AspNet.Authentication.OAuth/project.json +++ b/src/Microsoft.AspNet.Authentication.OAuth/project.json @@ -5,9 +5,11 @@ "type": "git", "url": "git://github.com/aspnet/security" }, + "compilationOptions": { + "warningsAsErrors": true + }, "dependencies": { "Microsoft.AspNet.Authentication": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, "Newtonsoft.Json": "6.0.6" }, "frameworks": { diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectExtensions.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectExtensions.cs index e8bcf935df..20fc9c85ea 100644 --- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectExtensions.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Authentication.OpenIdConnect; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Builder { @@ -18,8 +17,13 @@ namespace Microsoft.AspNet.Builder /// The application builder /// Options which control the processing of the OpenIdConnect protocol and token validation. /// The application builder - public static IApplicationBuilder UseOpenIdConnectAuthentication([NotNull] this IApplicationBuilder app, Action configureOptions) + public static IApplicationBuilder UseOpenIdConnectAuthentication(this IApplicationBuilder app, Action configureOptions) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + var options = new OpenIdConnectOptions(); if (configureOptions != null) @@ -35,8 +39,18 @@ namespace Microsoft.AspNet.Builder /// The application builder /// Options which control the processing of the OpenIdConnect protocol and token validation. /// The application builder - public static IApplicationBuilder UseOpenIdConnectAuthentication([NotNull] this IApplicationBuilder app, [NotNull] OpenIdConnectOptions options) + public static IApplicationBuilder UseOpenIdConnectAuthentication(this IApplicationBuilder app, OpenIdConnectOptions options) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + return app.UseMiddleware(options); } } diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectHandler.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectHandler.cs index 1c044332cc..0f5179a264 100644 --- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectHandler.cs +++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectHandler.cs @@ -16,7 +16,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Http.Features.Authentication; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.IdentityModel.Protocols.OpenIdConnect; using Microsoft.Net.Http.Headers; @@ -160,8 +159,13 @@ namespace Microsoft.AspNet.Authentication.OpenIdConnect /// /// /// Uses log id's OIDCH-0026 - OIDCH-0050, next num: 37 - protected override async Task HandleUnauthorizedAsync([NotNull] ChallengeContext context) + protected override async Task HandleUnauthorizedAsync(ChallengeContext context) { + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + Logger.LogDebug(Resources.OIDCH_0026_ApplyResponseChallengeAsync, this.GetType()); // order for local RedirectUri @@ -727,7 +731,7 @@ namespace Microsoft.AspNet.Authentication.OpenIdConnect /// A indicating whether the refresh token should be stored. private void SaveTokens(ClaimsPrincipal principal, OpenIdConnectMessage message, bool saveRefreshToken) { - var identity = (ClaimsIdentity) principal.Identity; + var identity = (ClaimsIdentity)principal.Identity; if (!string.IsNullOrEmpty(message.AccessToken)) { @@ -827,8 +831,13 @@ namespace Microsoft.AspNet.Authentication.OpenIdConnect return null; } - private void GenerateCorrelationId([NotNull] AuthenticationProperties properties) + private void GenerateCorrelationId(AuthenticationProperties properties) { + if (properties == null) + { + throw new ArgumentNullException(nameof(properties)); + } + var correlationKey = OpenIdConnectDefaults.CookieStatePrefix; var nonceBytes = new byte[32]; @@ -847,8 +856,13 @@ namespace Microsoft.AspNet.Authentication.OpenIdConnect Response.Cookies.Append(correlationKey + correlationId, NonceProperty, cookieOptions); } - private bool ValidateCorrelationId([NotNull] AuthenticationProperties properties) + private bool ValidateCorrelationId(AuthenticationProperties properties) { + if (properties == null) + { + throw new ArgumentNullException(nameof(properties)); + } + var correlationKey = OpenIdConnectDefaults.CookieStatePrefix; string correlationId; diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectMiddleware.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectMiddleware.cs index d2ccf3c1a9..8207eb4741 100644 --- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectMiddleware.cs @@ -8,7 +8,6 @@ using System.Text; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; using Microsoft.AspNet.Http; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; using Microsoft.Framework.WebEncoders; @@ -34,15 +33,50 @@ namespace Microsoft.AspNet.Authentication.OpenIdConnect /// [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "Managed by caller")] public OpenIdConnectMiddleware( - [NotNull] RequestDelegate next, - [NotNull] IDataProtectionProvider dataProtectionProvider, - [NotNull] ILoggerFactory loggerFactory, - [NotNull] IUrlEncoder encoder, - [NotNull] IServiceProvider services, - [NotNull] IOptions sharedOptions, - [NotNull] OpenIdConnectOptions options) + RequestDelegate next, + IDataProtectionProvider dataProtectionProvider, + ILoggerFactory loggerFactory, + IUrlEncoder encoder, + IServiceProvider services, + IOptions sharedOptions, + OpenIdConnectOptions options) : base(next, options, loggerFactory, encoder) { + if (next == null) + { + throw new ArgumentNullException(nameof(next)); + } + + if (dataProtectionProvider == null) + { + throw new ArgumentNullException(nameof(dataProtectionProvider)); + } + + if (loggerFactory == null) + { + throw new ArgumentNullException(nameof(loggerFactory)); + } + + if (encoder == null) + { + throw new ArgumentNullException(nameof(encoder)); + } + + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + + if (sharedOptions == null) + { + throw new ArgumentNullException(nameof(sharedOptions)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + if (string.IsNullOrEmpty(Options.SignInScheme) && !string.IsNullOrEmpty(sharedOptions.Value.SignInScheme)) { Options.SignInScheme = sharedOptions.Value.SignInScheme; @@ -74,7 +108,7 @@ namespace Microsoft.AspNet.Authentication.OpenIdConnect Options.StringDataFormat = new SecureDataFormat(new StringSerializer(), dataProtector); } - + // if the user has not set the AuthorizeCallback, set it from the redirect_uri if (!Options.CallbackPath.HasValue) { diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/project.json b/src/Microsoft.AspNet.Authentication.OpenIdConnect/project.json index 15fe781773..b2dd3f594f 100644 --- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/project.json +++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/project.json @@ -5,9 +5,11 @@ "type": "git", "url": "git://github.com/aspnet/security" }, + "compilationOptions": { + "warningsAsErrors": true + }, "dependencies": { "Microsoft.AspNet.Authentication": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": "2.0.0-beta8-*" }, "frameworks": { @@ -18,7 +20,6 @@ }, "dnxcore50": { "dependencies": { - "System.Collections.Specialized": "4.0.1-beta-*", "System.Net.Http": "4.0.1-beta-*" } } diff --git a/src/Microsoft.AspNet.Authentication.Twitter/Messages/RequestTokenSerializer.cs b/src/Microsoft.AspNet.Authentication.Twitter/Messages/RequestTokenSerializer.cs index 30ab884c80..6d3adeb1c9 100644 --- a/src/Microsoft.AspNet.Authentication.Twitter/Messages/RequestTokenSerializer.cs +++ b/src/Microsoft.AspNet.Authentication.Twitter/Messages/RequestTokenSerializer.cs @@ -1,10 +1,10 @@ // 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.Diagnostics.CodeAnalysis; using System.IO; using Microsoft.AspNet.Http.Authentication; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authentication.Twitter { @@ -56,8 +56,18 @@ namespace Microsoft.AspNet.Authentication.Twitter /// /// The writer to use in writing the token /// The token to write - public static void Write([NotNull] BinaryWriter writer, [NotNull] RequestToken token) + public static void Write(BinaryWriter writer, RequestToken token) { + if (writer == null) + { + throw new ArgumentNullException(nameof(writer)); + } + + if (token == null) + { + throw new ArgumentNullException(nameof(token)); + } + writer.Write(FormatVersion); writer.Write(token.Token); writer.Write(token.TokenSecret); @@ -70,8 +80,13 @@ namespace Microsoft.AspNet.Authentication.Twitter /// /// The reader to use in reading the token bytes /// The token - public static RequestToken Read([NotNull] BinaryReader reader) + public static RequestToken Read(BinaryReader reader) { + if (reader == null) + { + throw new ArgumentNullException(nameof(reader)); + } + if (reader.ReadInt32() != FormatVersion) { return null; diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterAppBuilderExtensions.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterAppBuilderExtensions.cs index 5a274c2413..baef3e96a8 100644 --- a/src/Microsoft.AspNet.Authentication.Twitter/TwitterAppBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterAppBuilderExtensions.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Authentication.Twitter; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Builder { @@ -12,8 +11,13 @@ namespace Microsoft.AspNet.Builder /// public static class TwitterAppBuilderExtensions { - public static IApplicationBuilder UseTwitterAuthentication([NotNull] this IApplicationBuilder app, Action configureOptions = null) + public static IApplicationBuilder UseTwitterAuthentication(this IApplicationBuilder app, Action configureOptions = null) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + var options = new TwitterOptions(); if (configureOptions != null) { @@ -22,8 +26,18 @@ namespace Microsoft.AspNet.Builder return app.UseTwitterAuthentication(options); } - public static IApplicationBuilder UseTwitterAuthentication([NotNull] this IApplicationBuilder app, [NotNull] TwitterOptions options) + public static IApplicationBuilder UseTwitterAuthentication(this IApplicationBuilder app, TwitterOptions options) { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + return app.UseMiddleware(options); } diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterHandler.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterHandler.cs index c6e2ac1ea9..5bfbc5c731 100644 --- a/src/Microsoft.AspNet.Authentication.Twitter/TwitterHandler.cs +++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterHandler.cs @@ -14,7 +14,6 @@ using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Http.Features.Authentication; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.WebUtilities; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.Primitives; @@ -91,7 +90,7 @@ namespace Microsoft.AspNet.Authentication.Twitter Response.Cookies.Delete(StateCookie, cookieOptions); var accessToken = await ObtainAccessTokenAsync(Options.ConsumerKey, Options.ConsumerSecret, requestToken, oauthVerifier); - + var identity = new ClaimsIdentity(new[] { new Claim(ClaimTypes.NameIdentifier, accessToken.UserId, ClaimValueTypes.String, Options.ClaimsIssuer), @@ -105,7 +104,7 @@ namespace Microsoft.AspNet.Authentication.Twitter { identity.AddClaim(new Claim("access_token", accessToken.Token, ClaimValueTypes.String, Options.ClaimsIssuer)); } - + return await CreateTicketAsync(identity, properties, accessToken); } catch (Exception ex) @@ -124,7 +123,7 @@ namespace Microsoft.AspNet.Authentication.Twitter }; await Options.Events.CreatingTicket(context); - + if (context.Principal?.Identity == null) { return null; @@ -133,8 +132,13 @@ namespace Microsoft.AspNet.Authentication.Twitter return new AuthenticationTicket(context.Principal, context.Properties, Options.AuthenticationScheme); } - protected override async Task HandleUnauthorizedAsync([NotNull] ChallengeContext context) + protected override async Task HandleUnauthorizedAsync(ChallengeContext context) { + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + var properties = new AuthenticationProperties(context.Properties); if (string.IsNullOrEmpty(properties.RedirectUri)) { diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterMiddleware.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterMiddleware.cs index ce5693f92e..268b6bec2d 100644 --- a/src/Microsoft.AspNet.Authentication.Twitter/TwitterMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterMiddleware.cs @@ -7,7 +7,6 @@ using System.Globalization; using System.Net.Http; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; using Microsoft.Framework.WebEncoders; @@ -33,14 +32,44 @@ namespace Microsoft.AspNet.Authentication.Twitter /// Configuration options for the middleware /// public TwitterMiddleware( - [NotNull] RequestDelegate next, - [NotNull] IDataProtectionProvider dataProtectionProvider, - [NotNull] ILoggerFactory loggerFactory, - [NotNull] IUrlEncoder encoder, - [NotNull] IOptions sharedOptions, - [NotNull] TwitterOptions options) + RequestDelegate next, + IDataProtectionProvider dataProtectionProvider, + ILoggerFactory loggerFactory, + IUrlEncoder encoder, + IOptions sharedOptions, + TwitterOptions options) : base(next, options, loggerFactory, encoder) { + if (next == null) + { + throw new ArgumentNullException(nameof(next)); + } + + if (dataProtectionProvider == null) + { + throw new ArgumentNullException(nameof(dataProtectionProvider)); + } + + if (loggerFactory == null) + { + throw new ArgumentNullException(nameof(loggerFactory)); + } + + if (encoder == null) + { + throw new ArgumentNullException(nameof(encoder)); + } + + if (sharedOptions == null) + { + throw new ArgumentNullException(nameof(sharedOptions)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + if (string.IsNullOrEmpty(Options.ConsumerSecret)) { throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.Exception_OptionMustBeProvided, nameof(Options.ConsumerSecret))); diff --git a/src/Microsoft.AspNet.Authentication.Twitter/project.json b/src/Microsoft.AspNet.Authentication.Twitter/project.json index c0268cc5d0..b117d8c4ec 100644 --- a/src/Microsoft.AspNet.Authentication.Twitter/project.json +++ b/src/Microsoft.AspNet.Authentication.Twitter/project.json @@ -5,9 +5,11 @@ "type": "git", "url": "git://github.com/aspnet/security" }, + "compilationOptions": { + "warningsAsErrors": true + }, "dependencies": { - "Microsoft.AspNet.Authentication": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" } + "Microsoft.AspNet.Authentication": "1.0.0-*" }, "frameworks": { "dnx451": { diff --git a/src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs b/src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs index d576f1014c..5990d12358 100644 --- a/src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs +++ b/src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs @@ -63,8 +63,28 @@ namespace Microsoft.AspNet.Authentication /// The utility object to observe the current request and response /// The logging factory used to create loggers /// async completion - public async Task InitializeAsync([NotNull] TOptions options, [NotNull] HttpContext context, [NotNull] ILogger logger, [NotNull] IUrlEncoder encoder) + public async Task InitializeAsync(TOptions options, HttpContext context, ILogger logger, IUrlEncoder encoder) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + + if (logger == null) + { + throw new ArgumentNullException(nameof(logger)); + } + + if (encoder == null) + { + throw new ArgumentNullException(nameof(encoder)); + } + Options = options; Context = context; OriginalPathBase = Request.PathBase; diff --git a/src/Microsoft.AspNet.Authentication/AuthenticationMiddleware.cs b/src/Microsoft.AspNet.Authentication/AuthenticationMiddleware.cs index 9736325570..15dcce5bcd 100644 --- a/src/Microsoft.AspNet.Authentication/AuthenticationMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication/AuthenticationMiddleware.cs @@ -5,7 +5,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.WebEncoders; @@ -16,11 +15,31 @@ namespace Microsoft.AspNet.Authentication private readonly RequestDelegate _next; protected AuthenticationMiddleware( - [NotNull] RequestDelegate next, - [NotNull] TOptions options, - [NotNull] ILoggerFactory loggerFactory, - [NotNull] IUrlEncoder encoder) + RequestDelegate next, + TOptions options, + ILoggerFactory loggerFactory, + IUrlEncoder encoder) { + if (next == null) + { + throw new ArgumentNullException(nameof(next)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + + if (loggerFactory == null) + { + throw new ArgumentNullException(nameof(loggerFactory)); + } + + if (encoder == null) + { + throw new ArgumentNullException(nameof(encoder)); + } + Options = options; Logger = loggerFactory.CreateLogger(this.GetType().FullName); UrlEncoder = encoder; diff --git a/src/Microsoft.AspNet.Authentication/AuthenticationServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication/AuthenticationServiceCollectionExtensions.cs index fbe65663e2..286238b50f 100644 --- a/src/Microsoft.AspNet.Authentication/AuthenticationServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authentication/AuthenticationServiceCollectionExtensions.cs @@ -3,21 +3,35 @@ using System; using Microsoft.AspNet.Authentication; -using Microsoft.Framework.Internal; namespace Microsoft.Framework.DependencyInjection { public static class AuthenticationServiceCollectionExtensions { - public static IServiceCollection AddAuthentication([NotNull] this IServiceCollection services) + public static IServiceCollection AddAuthentication(this IServiceCollection services) { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + services.AddWebEncoders(); services.AddDataProtection(); return services; } - public static IServiceCollection AddAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configureOptions) + public static IServiceCollection AddAuthentication(this IServiceCollection services, Action configureOptions) { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + + if (configureOptions == null) + { + throw new ArgumentNullException(nameof(configureOptions)); + } + services.Configure(configureOptions); return services.AddAuthentication(); } diff --git a/src/Microsoft.AspNet.Authentication/ClaimsTransformationMiddleware.cs b/src/Microsoft.AspNet.Authentication/ClaimsTransformationMiddleware.cs index b4c95310c4..2d2f3461ba 100644 --- a/src/Microsoft.AspNet.Authentication/ClaimsTransformationMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication/ClaimsTransformationMiddleware.cs @@ -1,10 +1,10 @@ // 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.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authentication { @@ -13,9 +13,19 @@ namespace Microsoft.AspNet.Authentication private readonly RequestDelegate _next; public ClaimsTransformationMiddleware( - [NotNull] RequestDelegate next, - [NotNull] ClaimsTransformationOptions options) + RequestDelegate next, + ClaimsTransformationOptions options) { + if (next == null) + { + throw new ArgumentNullException(nameof(next)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + Options = options; _next = next; } @@ -26,7 +36,8 @@ namespace Microsoft.AspNet.Authentication { var handler = new ClaimsTransformationHandler(Options.Transformer); handler.RegisterAuthenticationHandler(context.GetAuthentication()); - try { + try + { if (Options.Transformer != null) { context.User = await Options.Transformer.TransformAsync(context.User); diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/PropertiesSerializer.cs b/src/Microsoft.AspNet.Authentication/DataHandler/PropertiesSerializer.cs index 462a5e3163..e6d6bc1d81 100644 --- a/src/Microsoft.AspNet.Authentication/DataHandler/PropertiesSerializer.cs +++ b/src/Microsoft.AspNet.Authentication/DataHandler/PropertiesSerializer.cs @@ -1,11 +1,11 @@ // 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.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; using Microsoft.AspNet.Http.Authentication; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authentication { @@ -41,8 +41,18 @@ namespace Microsoft.AspNet.Authentication } } - public virtual void Write([NotNull] BinaryWriter writer, [NotNull] AuthenticationProperties properties) + public virtual void Write(BinaryWriter writer, AuthenticationProperties properties) { + if (writer == null) + { + throw new ArgumentNullException(nameof(writer)); + } + + if (properties == null) + { + throw new ArgumentNullException(nameof(properties)); + } + writer.Write(FormatVersion); writer.Write(properties.Items.Count); @@ -53,8 +63,13 @@ namespace Microsoft.AspNet.Authentication } } - public virtual AuthenticationProperties Read([NotNull] BinaryReader reader) + public virtual AuthenticationProperties Read(BinaryReader reader) { + if (reader == null) + { + throw new ArgumentNullException(nameof(reader)); + } + if (reader.ReadInt32() != FormatVersion) { return null; diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/TicketSerializer.cs b/src/Microsoft.AspNet.Authentication/DataHandler/TicketSerializer.cs index 1568f58ec2..44d304004f 100644 --- a/src/Microsoft.AspNet.Authentication/DataHandler/TicketSerializer.cs +++ b/src/Microsoft.AspNet.Authentication/DataHandler/TicketSerializer.cs @@ -5,7 +5,6 @@ using System; using System.IO; using System.Linq; using System.Security.Claims; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authentication { @@ -39,8 +38,18 @@ namespace Microsoft.AspNet.Authentication } } - public virtual void Write([NotNull] BinaryWriter writer, [NotNull] AuthenticationTicket ticket) + public virtual void Write(BinaryWriter writer, AuthenticationTicket ticket) { + if (writer == null) + { + throw new ArgumentNullException(nameof(writer)); + } + + if (ticket == null) + { + throw new ArgumentNullException(nameof(ticket)); + } + writer.Write(FormatVersion); writer.Write(ticket.AuthenticationScheme); @@ -61,8 +70,18 @@ namespace Microsoft.AspNet.Authentication PropertiesSerializer.Default.Write(writer, ticket.Properties); } - protected virtual void WriteIdentity([NotNull] BinaryWriter writer, [NotNull] ClaimsIdentity identity) + protected virtual void WriteIdentity(BinaryWriter writer, ClaimsIdentity identity) { + if (writer == null) + { + throw new ArgumentNullException(nameof(writer)); + } + + if (identity == null) + { + throw new ArgumentNullException(nameof(identity)); + } + var authenticationType = identity.AuthenticationType ?? string.Empty; writer.Write(authenticationType); @@ -99,8 +118,18 @@ namespace Microsoft.AspNet.Authentication } } - protected virtual void WriteClaim([NotNull] BinaryWriter writer, [NotNull] Claim claim) + protected virtual void WriteClaim(BinaryWriter writer, Claim claim) { + if (writer == null) + { + throw new ArgumentNullException(nameof(writer)); + } + + if (claim == null) + { + throw new ArgumentNullException(nameof(claim)); + } + WriteWithDefault(writer, claim.Type, claim.Subject?.NameClaimType ?? ClaimsIdentity.DefaultNameClaimType); writer.Write(claim.Value); WriteWithDefault(writer, claim.ValueType, ClaimValueTypes.String); @@ -117,8 +146,13 @@ namespace Microsoft.AspNet.Authentication } } - public virtual AuthenticationTicket Read([NotNull] BinaryReader reader) + public virtual AuthenticationTicket Read(BinaryReader reader) { + if (reader == null) + { + throw new ArgumentNullException(nameof(reader)); + } + if (reader.ReadInt32() != FormatVersion) { return null; @@ -145,8 +179,13 @@ namespace Microsoft.AspNet.Authentication return new AuthenticationTicket(new ClaimsPrincipal(identities), properties, scheme); } - protected virtual ClaimsIdentity ReadIdentity([NotNull] BinaryReader reader) + protected virtual ClaimsIdentity ReadIdentity(BinaryReader reader) { + if (reader == null) + { + throw new ArgumentNullException(nameof(reader)); + } + var authenticationType = reader.ReadString(); var nameClaimType = ReadWithDefault(reader, ClaimsIdentity.DefaultNameClaimType); var roleClaimType = ReadWithDefault(reader, ClaimsIdentity.DefaultRoleClaimType); @@ -181,8 +220,18 @@ namespace Microsoft.AspNet.Authentication return identity; } - protected virtual Claim ReadClaim([NotNull] BinaryReader reader, [NotNull] ClaimsIdentity identity) + protected virtual Claim ReadClaim(BinaryReader reader, ClaimsIdentity identity) { + if (reader == null) + { + throw new ArgumentNullException(nameof(reader)); + } + + if (identity == null) + { + throw new ArgumentNullException(nameof(identity)); + } + var type = ReadWithDefault(reader, identity.NameClaimType); var value = reader.ReadString(); var valueType = ReadWithDefault(reader, ClaimValueTypes.String); @@ -193,7 +242,7 @@ namespace Microsoft.AspNet.Authentication // Read the number of properties stored in the claim. var count = reader.ReadInt32(); - + for (var index = 0; index != count; ++index) { var key = reader.ReadString(); diff --git a/src/Microsoft.AspNet.Authentication/project.json b/src/Microsoft.AspNet.Authentication/project.json index 0c36e3000c..656d0b2f22 100644 --- a/src/Microsoft.AspNet.Authentication/project.json +++ b/src/Microsoft.AspNet.Authentication/project.json @@ -5,12 +5,14 @@ "type": "git", "url": "git://github.com/aspnet/security" }, + "compilationOptions": { + "warningsAsErrors": true + }, "dependencies": { "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http.Extensions": "1.0.0-*", "Microsoft.Framework.Logging.Abstractions": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.SecurityHelper.Sources": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.OptionsModel": "1.0.0-*", "Microsoft.Framework.WebEncoders": "1.0.0-*" diff --git a/src/Microsoft.AspNet.Authorization/AuthorizationContext.cs b/src/Microsoft.AspNet.Authorization/AuthorizationContext.cs index 54f6b6bbc4..93f4da651d 100644 --- a/src/Microsoft.AspNet.Authorization/AuthorizationContext.cs +++ b/src/Microsoft.AspNet.Authorization/AuthorizationContext.cs @@ -1,10 +1,10 @@ // 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.Collections.Generic; using System.Linq; using System.Security.Claims; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authorization { @@ -18,10 +18,15 @@ namespace Microsoft.AspNet.Authorization private bool _succeedCalled; public AuthorizationContext( - [NotNull] IEnumerable requirements, + IEnumerable requirements, ClaimsPrincipal user, object resource) { + if (requirements == null) + { + throw new ArgumentNullException(nameof(requirements)); + } + Requirements = requirements; User = user; Resource = resource; @@ -36,7 +41,8 @@ namespace Microsoft.AspNet.Authorization public bool HasFailed { get { return _failCalled; } } - public bool HasSucceeded { + public bool HasSucceeded + { get { return !_failCalled && _succeedCalled && !PendingRequirements.Any(); diff --git a/src/Microsoft.AspNet.Authorization/AuthorizationOptions.cs b/src/Microsoft.AspNet.Authorization/AuthorizationOptions.cs index c2931a52cb..66627b458c 100644 --- a/src/Microsoft.AspNet.Authorization/AuthorizationOptions.cs +++ b/src/Microsoft.AspNet.Authorization/AuthorizationOptions.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authorization { @@ -16,21 +15,46 @@ namespace Microsoft.AspNet.Authorization /// public AuthorizationPolicy DefaultPolicy { get; set; } = new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build(); - public void AddPolicy([NotNull] string name, [NotNull] AuthorizationPolicy policy) + public void AddPolicy(string name, AuthorizationPolicy policy) { + if (name == null) + { + throw new ArgumentNullException(nameof(name)); + } + + if (policy == null) + { + throw new ArgumentNullException(nameof(policy)); + } + PolicyMap[name] = policy; } - public void AddPolicy([NotNull] string name, [NotNull] Action configurePolicy) + public void AddPolicy(string name, Action configurePolicy) { + if (name == null) + { + throw new ArgumentNullException(nameof(name)); + } + + if (configurePolicy == null) + { + throw new ArgumentNullException(nameof(configurePolicy)); + } + var policyBuilder = new AuthorizationPolicyBuilder(); configurePolicy(policyBuilder); PolicyMap[name] = policyBuilder.Build(); } - public AuthorizationPolicy GetPolicy([NotNull] string name) + public AuthorizationPolicy GetPolicy(string name) { + if (name == null) + { + throw new ArgumentNullException(nameof(name)); + } + return PolicyMap.ContainsKey(name) ? PolicyMap[name] : null; } - } + } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Authorization/AuthorizationPolicy.cs b/src/Microsoft.AspNet.Authorization/AuthorizationPolicy.cs index 1efb4afd24..bb7af889bc 100644 --- a/src/Microsoft.AspNet.Authorization/AuthorizationPolicy.cs +++ b/src/Microsoft.AspNet.Authorization/AuthorizationPolicy.cs @@ -4,14 +4,23 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authorization { public class AuthorizationPolicy { - public AuthorizationPolicy([NotNull] IEnumerable requirements, [NotNull] IEnumerable activeAuthenticationSchemes) + public AuthorizationPolicy(IEnumerable requirements, IEnumerable activeAuthenticationSchemes) { + if (requirements == null) + { + throw new ArgumentNullException(nameof(requirements)); + } + + if (activeAuthenticationSchemes == null) + { + throw new ArgumentNullException(nameof(activeAuthenticationSchemes)); + } + if (requirements.Count() == 0) { throw new InvalidOperationException(Resources.Exception_AuthorizationPolicyEmpty); @@ -23,13 +32,23 @@ namespace Microsoft.AspNet.Authorization public IReadOnlyList Requirements { get; } public IReadOnlyList ActiveAuthenticationSchemes { get; } - public static AuthorizationPolicy Combine([NotNull] params AuthorizationPolicy[] policies) + public static AuthorizationPolicy Combine(params AuthorizationPolicy[] policies) { + if (policies == null) + { + throw new ArgumentNullException(nameof(policies)); + } + return Combine((IEnumerable)policies); } - public static AuthorizationPolicy Combine([NotNull] IEnumerable policies) + public static AuthorizationPolicy Combine(IEnumerable policies) { + if (policies == null) + { + throw new ArgumentNullException(nameof(policies)); + } + var builder = new AuthorizationPolicyBuilder(); foreach (var policy in policies) { @@ -38,8 +57,18 @@ namespace Microsoft.AspNet.Authorization return builder.Build(); } - public static AuthorizationPolicy Combine([NotNull] AuthorizationOptions options, [NotNull] IEnumerable attributes) + public static AuthorizationPolicy Combine(AuthorizationOptions options, IEnumerable attributes) { + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + + if (attributes == null) + { + throw new ArgumentNullException(nameof(attributes)); + } + var policyBuilder = new AuthorizationPolicyBuilder(); var any = false; foreach (var authorizeAttribute in attributes.OfType()) diff --git a/src/Microsoft.AspNet.Authorization/AuthorizationPolicyBuilder.cs b/src/Microsoft.AspNet.Authorization/AuthorizationPolicyBuilder.cs index 7cc20d06b3..331317fef6 100644 --- a/src/Microsoft.AspNet.Authorization/AuthorizationPolicyBuilder.cs +++ b/src/Microsoft.AspNet.Authorization/AuthorizationPolicyBuilder.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authorization { @@ -41,43 +40,78 @@ namespace Microsoft.AspNet.Authorization return this; } - public AuthorizationPolicyBuilder Combine([NotNull] AuthorizationPolicy policy) + public AuthorizationPolicyBuilder Combine(AuthorizationPolicy policy) { + if (policy == null) + { + throw new ArgumentNullException(nameof(policy)); + } + AddAuthenticationSchemes(policy.ActiveAuthenticationSchemes.ToArray()); AddRequirements(policy.Requirements.ToArray()); return this; } - public AuthorizationPolicyBuilder RequireClaim([NotNull] string claimType, params string[] requiredValues) + public AuthorizationPolicyBuilder RequireClaim(string claimType, params string[] requiredValues) { + if (claimType == null) + { + throw new ArgumentNullException(nameof(claimType)); + } + return RequireClaim(claimType, (IEnumerable)requiredValues); } - public AuthorizationPolicyBuilder RequireClaim([NotNull] string claimType, IEnumerable requiredValues) + public AuthorizationPolicyBuilder RequireClaim(string claimType, IEnumerable requiredValues) { + if (claimType == null) + { + throw new ArgumentNullException(nameof(claimType)); + } + Requirements.Add(new ClaimsAuthorizationRequirement(claimType, requiredValues)); return this; } - public AuthorizationPolicyBuilder RequireClaim([NotNull] string claimType) + public AuthorizationPolicyBuilder RequireClaim(string claimType) { + if (claimType == null) + { + throw new ArgumentNullException(nameof(claimType)); + } + Requirements.Add(new ClaimsAuthorizationRequirement(claimType, allowedValues: null)); return this; } - public AuthorizationPolicyBuilder RequireRole([NotNull] params string[] roles) + public AuthorizationPolicyBuilder RequireRole(params string[] roles) { + if (roles == null) + { + throw new ArgumentNullException(nameof(roles)); + } + return RequireRole((IEnumerable)roles); } - public AuthorizationPolicyBuilder RequireRole([NotNull] IEnumerable roles) + public AuthorizationPolicyBuilder RequireRole(IEnumerable roles) { + if (roles == null) + { + throw new ArgumentNullException(nameof(roles)); + } + Requirements.Add(new RolesAuthorizationRequirement(roles)); return this; } - public AuthorizationPolicyBuilder RequireUserName([NotNull] string userName) + public AuthorizationPolicyBuilder RequireUserName(string userName) { + if (userName == null) + { + throw new ArgumentNullException(nameof(userName)); + } + Requirements.Add(new NameAuthorizationRequirement(userName)); return this; } @@ -88,8 +122,13 @@ namespace Microsoft.AspNet.Authorization return this; } - public AuthorizationPolicyBuilder RequireDelegate([NotNull] Action handler) + public AuthorizationPolicyBuilder RequireDelegate(Action handler) { + if (handler == null) + { + throw new ArgumentNullException(nameof(handler)); + } + Requirements.Add(new DelegateRequirement(handler)); return this; } diff --git a/src/Microsoft.AspNet.Authorization/AuthorizationServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authorization/AuthorizationServiceCollectionExtensions.cs index 2d085a7902..4b1015ade6 100644 --- a/src/Microsoft.AspNet.Authorization/AuthorizationServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authorization/AuthorizationServiceCollectionExtensions.cs @@ -4,22 +4,36 @@ using System; using Microsoft.AspNet.Authorization; using Microsoft.Framework.DependencyInjection.Extensions; -using Microsoft.Framework.Internal; namespace Microsoft.Framework.DependencyInjection { public static class AuthorizationServiceCollectionExtensions { - public static IServiceCollection AddAuthorization([NotNull] this IServiceCollection services) + public static IServiceCollection AddAuthorization(this IServiceCollection services) { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + services.AddOptions(); services.TryAdd(ServiceDescriptor.Transient()); services.TryAddEnumerable(ServiceDescriptor.Transient()); return services; } - public static IServiceCollection AddAuthorization([NotNull] this IServiceCollection services, [NotNull] Action configure) + public static IServiceCollection AddAuthorization(this IServiceCollection services, Action configure) { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + + if (configure == null) + { + throw new ArgumentNullException(nameof(configure)); + } + services.Configure(configure); return services.AddAuthorization(); } diff --git a/src/Microsoft.AspNet.Authorization/AuthorizationServiceExtensions.cs b/src/Microsoft.AspNet.Authorization/AuthorizationServiceExtensions.cs index 27b74c4a5b..5ab5b03e73 100644 --- a/src/Microsoft.AspNet.Authorization/AuthorizationServiceExtensions.cs +++ b/src/Microsoft.AspNet.Authorization/AuthorizationServiceExtensions.cs @@ -1,10 +1,10 @@ // 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.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authorization { @@ -17,8 +17,18 @@ namespace Microsoft.AspNet.Authorization /// /// /// - public static Task AuthorizeAsync([NotNull] this IAuthorizationService service, ClaimsPrincipal user, object resource, [NotNull] IAuthorizationRequirement requirement) + public static Task AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, object resource, IAuthorizationRequirement requirement) { + if (service == null) + { + throw new ArgumentNullException(nameof(service)); + } + + if (requirement == null) + { + throw new ArgumentNullException(nameof(requirement)); + } + return service.AuthorizeAsync(user, resource, new IAuthorizationRequirement[] { requirement }); } @@ -30,8 +40,18 @@ namespace Microsoft.AspNet.Authorization /// The resource the policy should be checked with. /// The policy to check against a specific context. /// true when the user fulfills the policy, false otherwise. - public static Task AuthorizeAsync([NotNull] this IAuthorizationService service, ClaimsPrincipal user, object resource, [NotNull] AuthorizationPolicy policy) + public static Task AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, object resource, AuthorizationPolicy policy) { + if (service == null) + { + throw new ArgumentNullException(nameof(service)); + } + + if (policy == null) + { + throw new ArgumentNullException(nameof(policy)); + } + return service.AuthorizeAsync(user, resource, policy.Requirements.ToArray()); } @@ -42,8 +62,18 @@ namespace Microsoft.AspNet.Authorization /// The user to check the policy against. /// The policy to check against a specific context. /// true when the user fulfills the policy, false otherwise. - public static Task AuthorizeAsync([NotNull] this IAuthorizationService service, ClaimsPrincipal user, [NotNull] AuthorizationPolicy policy) + public static Task AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, AuthorizationPolicy policy) { + if (service == null) + { + throw new ArgumentNullException(nameof(service)); + } + + if (policy == null) + { + throw new ArgumentNullException(nameof(policy)); + } + return service.AuthorizeAsync(user, resource: null, policy: policy); } @@ -54,8 +84,18 @@ namespace Microsoft.AspNet.Authorization /// The user to check the policy against. /// The name of the policy to check against a specific context. /// true when the user fulfills the policy, false otherwise. - public static Task AuthorizeAsync([NotNull] this IAuthorizationService service, ClaimsPrincipal user, [NotNull] string policyName) + public static Task AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, string policyName) { + if (service == null) + { + throw new ArgumentNullException(nameof(service)); + } + + if (policyName == null) + { + throw new ArgumentNullException(nameof(policyName)); + } + return service.AuthorizeAsync(user, resource: null, policyName: policyName); } } diff --git a/src/Microsoft.AspNet.Authorization/ClaimsAuthorizationRequirement.cs b/src/Microsoft.AspNet.Authorization/ClaimsAuthorizationRequirement.cs index fa061d28c8..905e74f39a 100644 --- a/src/Microsoft.AspNet.Authorization/ClaimsAuthorizationRequirement.cs +++ b/src/Microsoft.AspNet.Authorization/ClaimsAuthorizationRequirement.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authorization { @@ -12,8 +11,13 @@ namespace Microsoft.AspNet.Authorization // If AllowedValues is null or empty, that means any claim is valid public class ClaimsAuthorizationRequirement : AuthorizationHandler, IAuthorizationRequirement { - public ClaimsAuthorizationRequirement([NotNull] string claimType, IEnumerable allowedValues) + public ClaimsAuthorizationRequirement(string claimType, IEnumerable allowedValues) { + if (claimType == null) + { + throw new ArgumentNullException(nameof(claimType)); + } + ClaimType = claimType; AllowedValues = allowedValues; } diff --git a/src/Microsoft.AspNet.Authorization/DefaultAuthorizationService.cs b/src/Microsoft.AspNet.Authorization/DefaultAuthorizationService.cs index 4095c623e7..b18c92031d 100644 --- a/src/Microsoft.AspNet.Authorization/DefaultAuthorizationService.cs +++ b/src/Microsoft.AspNet.Authorization/DefaultAuthorizationService.cs @@ -1,11 +1,11 @@ // 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.Collections.Generic; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; namespace Microsoft.AspNet.Authorization @@ -21,8 +21,13 @@ namespace Microsoft.AspNet.Authorization _options = options.Value; } - public async Task AuthorizeAsync(ClaimsPrincipal user, object resource, [NotNull] IEnumerable requirements) + public async Task AuthorizeAsync(ClaimsPrincipal user, object resource, IEnumerable requirements) { + if (requirements == null) + { + throw new ArgumentNullException(nameof(requirements)); + } + var authContext = new AuthorizationContext(requirements, user, resource); foreach (var handler in _handlers) { @@ -33,6 +38,11 @@ namespace Microsoft.AspNet.Authorization public Task AuthorizeAsync(ClaimsPrincipal user, object resource, string policyName) { + if (policyName == null) + { + throw new ArgumentNullException(nameof(policyName)); + } + var policy = _options.GetPolicy(policyName); return (policy == null) ? Task.FromResult(false) diff --git a/src/Microsoft.AspNet.Authorization/IAuthorizationService.cs b/src/Microsoft.AspNet.Authorization/IAuthorizationService.cs index 1afa0ae5dd..a9dbe06cdd 100644 --- a/src/Microsoft.AspNet.Authorization/IAuthorizationService.cs +++ b/src/Microsoft.AspNet.Authorization/IAuthorizationService.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authorization { @@ -20,7 +19,7 @@ namespace Microsoft.AspNet.Authorization /// /// /// - Task AuthorizeAsync(ClaimsPrincipal user, object resource, [NotNull] IEnumerable requirements); + Task AuthorizeAsync(ClaimsPrincipal user, object resource, IEnumerable requirements); /// /// Checks if a user meets a specific authorization policy @@ -29,6 +28,6 @@ namespace Microsoft.AspNet.Authorization /// The resource the policy should be checked with. /// The name of the policy to check against a specific context. /// true when the user fulfills the policy, false otherwise. - Task AuthorizeAsync(ClaimsPrincipal user, object resource, [NotNull] string policyName); + Task AuthorizeAsync(ClaimsPrincipal user, object resource, string policyName); } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Authorization/NameAuthorizationRequirement.cs b/src/Microsoft.AspNet.Authorization/NameAuthorizationRequirement.cs index 5798a0efd0..45820e6a9a 100644 --- a/src/Microsoft.AspNet.Authorization/NameAuthorizationRequirement.cs +++ b/src/Microsoft.AspNet.Authorization/NameAuthorizationRequirement.cs @@ -2,9 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using System.Linq; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authorization { @@ -13,8 +11,13 @@ namespace Microsoft.AspNet.Authorization /// public class NameAuthorizationRequirement : AuthorizationHandler, IAuthorizationRequirement { - public NameAuthorizationRequirement([NotNull] string requiredName) + public NameAuthorizationRequirement(string requiredName) { + if (requiredName == null) + { + throw new ArgumentNullException(nameof(requiredName)); + } + RequiredName = requiredName; } diff --git a/src/Microsoft.AspNet.Authorization/RolesAuthorizationRequirement.cs b/src/Microsoft.AspNet.Authorization/RolesAuthorizationRequirement.cs index 8521c43c12..fb8647d75e 100644 --- a/src/Microsoft.AspNet.Authorization/RolesAuthorizationRequirement.cs +++ b/src/Microsoft.AspNet.Authorization/RolesAuthorizationRequirement.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Authorization { @@ -12,8 +11,13 @@ namespace Microsoft.AspNet.Authorization // If AllowedRoles is null or empty, that means any role is valid public class RolesAuthorizationRequirement : AuthorizationHandler, IAuthorizationRequirement { - public RolesAuthorizationRequirement([NotNull] IEnumerable allowedRoles) + public RolesAuthorizationRequirement(IEnumerable allowedRoles) { + if (allowedRoles == null) + { + throw new ArgumentNullException(nameof(allowedRoles)); + } + if (allowedRoles.Count() == 0) { throw new InvalidOperationException(Resources.Exception_RoleRequirementEmpty); diff --git a/src/Microsoft.AspNet.Authorization/project.json b/src/Microsoft.AspNet.Authorization/project.json index 7d2e324d5c..92768710bc 100644 --- a/src/Microsoft.AspNet.Authorization/project.json +++ b/src/Microsoft.AspNet.Authorization/project.json @@ -5,10 +5,12 @@ "type": "git", "url": "git://github.com/aspnet/security" }, + "compilationOptions": { + "warningsAsErrors": true + }, "dependencies": { "Microsoft.AspNet.Http.Features": "1.0.0-*", "Microsoft.Framework.Logging.Abstractions": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.OptionsModel": "1.0.0-*" }, "frameworks": { diff --git a/src/Microsoft.AspNet.CookiePolicy/project.json b/src/Microsoft.AspNet.CookiePolicy/project.json index 6d78e5eb89..252f0867ec 100644 --- a/src/Microsoft.AspNet.CookiePolicy/project.json +++ b/src/Microsoft.AspNet.CookiePolicy/project.json @@ -5,6 +5,9 @@ "type": "git", "url": "git://github.com/aspnet/security" }, + "compilationOptions": { + "warningsAsErrors": true + }, "dependencies": { "Microsoft.AspNet.Http": "1.0.0-*" },