Merge branch 'vnext' of github.com:pazof/yavsc into vnext
This commit is contained in:
commit
c27a477614
1 changed files with 160 additions and 180 deletions
|
|
@ -1,33 +1,31 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Security.Claims;
|
using System.Security.Claims;
|
||||||
|
using Google.Apis.Auth.OAuth2.Responses;
|
||||||
|
using Google.Apis.Util.Store;
|
||||||
using Microsoft.AspNet.Authentication;
|
using Microsoft.AspNet.Authentication;
|
||||||
using Microsoft.AspNet.Authentication.Cookies;
|
using Microsoft.AspNet.Authentication.Cookies;
|
||||||
using Microsoft.AspNet.Authentication.Facebook;
|
using Microsoft.AspNet.Authentication.Facebook;
|
||||||
using Microsoft.AspNet.Authentication.Twitter;
|
|
||||||
using Microsoft.AspNet.Authentication.JwtBearer;
|
using Microsoft.AspNet.Authentication.JwtBearer;
|
||||||
using Microsoft.AspNet.Authentication.OAuth;
|
using Microsoft.AspNet.Authentication.OAuth;
|
||||||
|
using Microsoft.AspNet.Authentication.Twitter;
|
||||||
using Microsoft.AspNet.Builder;
|
using Microsoft.AspNet.Builder;
|
||||||
using Microsoft.AspNet.Http;
|
using Microsoft.AspNet.Http;
|
||||||
using Microsoft.AspNet.Identity;
|
using Microsoft.AspNet.Identity;
|
||||||
using Microsoft.AspNet.Identity.EntityFramework;
|
using Microsoft.AspNet.Identity.EntityFramework;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using Microsoft.Extensions.OptionsModel;
|
using Microsoft.Extensions.OptionsModel;
|
||||||
using Microsoft.Extensions.WebEncoders;
|
using Microsoft.Extensions.WebEncoders;
|
||||||
using OAuth.AspNet.AuthServer;
|
using OAuth.AspNet.AuthServer;
|
||||||
using OAuth.AspNet.Tokens;
|
using OAuth.AspNet.Tokens;
|
||||||
using Google.Apis.Util.Store;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Google.Apis.Auth.OAuth2.Responses;
|
|
||||||
|
|
||||||
namespace Yavsc
|
namespace Yavsc {
|
||||||
{
|
|
||||||
using Auth;
|
using Auth;
|
||||||
using Extensions;
|
using Extensions;
|
||||||
using Models;
|
|
||||||
using Helpers.Google;
|
using Helpers.Google;
|
||||||
|
using Models;
|
||||||
|
|
||||||
public partial class Startup
|
public partial class Startup {
|
||||||
{
|
|
||||||
public static CookieAuthenticationOptions ExternalCookieAppOptions { get; private set; }
|
public static CookieAuthenticationOptions ExternalCookieAppOptions { get; private set; }
|
||||||
|
|
||||||
public static IdentityOptions IdentityAppOptions { get; set; }
|
public static IdentityOptions IdentityAppOptions { get; set; }
|
||||||
|
|
@ -36,193 +34,175 @@ namespace Yavsc
|
||||||
public static TwitterOptions TwitterAppOptions { get; private set; }
|
public static TwitterOptions TwitterAppOptions { get; private set; }
|
||||||
public static OAuthAuthorizationServerOptions OAuthServerAppOptions { get; private set; }
|
public static OAuthAuthorizationServerOptions OAuthServerAppOptions { get; private set; }
|
||||||
|
|
||||||
|
|
||||||
public static YavscGoogleOptions YavscGoogleAppOptions { get; private set; }
|
public static YavscGoogleOptions YavscGoogleAppOptions { get; private set; }
|
||||||
public static MonoDataProtectionProvider ProtectionProvider { get; private set; }
|
public static MonoDataProtectionProvider ProtectionProvider { get; private set; }
|
||||||
|
|
||||||
// public static CookieAuthenticationOptions BearerCookieOptions { get; private set; }
|
// public static CookieAuthenticationOptions BearerCookieOptions { get; private set; }
|
||||||
|
|
||||||
private void ConfigureOAuthServices(IServiceCollection services)
|
private void ConfigureOAuthServices (IServiceCollection services) {
|
||||||
{
|
services.Configure<SharedAuthenticationOptions> (options => options.SignInScheme = Constants.ApplicationAuthenticationSheme);
|
||||||
services.Configure<SharedAuthenticationOptions>(options => options.SignInScheme = Constants.ApplicationAuthenticationSheme);
|
|
||||||
|
|
||||||
services.Add(ServiceDescriptor.Singleton(typeof(IOptions<OAuth2AppSettings>), typeof(OptionsManager<OAuth2AppSettings>)));
|
services.Add (ServiceDescriptor.Singleton (typeof (IOptions<OAuth2AppSettings>), typeof (OptionsManager<OAuth2AppSettings>)));
|
||||||
// used by the YavscGoogleOAuth middelware (TODO drop it)
|
// used by the YavscGoogleOAuth middelware (TODO drop it)
|
||||||
services.AddTransient<Microsoft.Extensions.WebEncoders.UrlEncoder, UrlEncoder>();
|
services.AddTransient<Microsoft.Extensions.WebEncoders.UrlEncoder, UrlEncoder> ();
|
||||||
|
|
||||||
services.AddAuthentication(options =>
|
services.AddAuthentication (options => {
|
||||||
{
|
|
||||||
options.SignInScheme = Constants.ExternalAuthenticationSheme;
|
options.SignInScheme = Constants.ExternalAuthenticationSheme;
|
||||||
});
|
});
|
||||||
|
|
||||||
ProtectionProvider = new MonoDataProtectionProvider(Configuration["Site:Title"]); ;
|
ProtectionProvider = new MonoDataProtectionProvider (Configuration["Site:Title"]);;
|
||||||
services.AddInstance<MonoDataProtectionProvider>
|
services.AddInstance<MonoDataProtectionProvider>
|
||||||
(ProtectionProvider);
|
(ProtectionProvider);
|
||||||
|
|
||||||
services.AddIdentity<ApplicationUser, IdentityRole>(
|
services.AddIdentity<ApplicationUser, IdentityRole> (
|
||||||
option =>
|
option => {
|
||||||
{
|
IdentityAppOptions = option;
|
||||||
IdentityAppOptions = option;
|
option.User.AllowedUserNameCharacters += " ";
|
||||||
option.User.AllowedUserNameCharacters += " ";
|
option.User.RequireUniqueEmail = true;
|
||||||
option.User.RequireUniqueEmail = true;
|
// option.Cookies.ApplicationCookieAuthenticationScheme = Constants.ApplicationAuthenticationSheme;
|
||||||
// option.Cookies.ApplicationCookieAuthenticationScheme = Constants.ApplicationAuthenticationSheme;
|
option.Cookies.ApplicationCookie.LoginPath = "/signin";
|
||||||
option.Cookies.ApplicationCookie.LoginPath = "/signin";
|
// option.Cookies.ApplicationCookie.AuthenticationScheme = Constants.ApplicationAuthenticationSheme;
|
||||||
// option.Cookies.ApplicationCookie.AuthenticationScheme = Constants.ApplicationAuthenticationSheme;
|
/*
|
||||||
/*
|
option.Cookies.ApplicationCookie.DataProtectionProvider = protector;
|
||||||
option.Cookies.ApplicationCookie.DataProtectionProvider = protector;
|
option.Cookies.ApplicationCookie.LoginPath = new PathString(Constants.LoginPath.Substring(1));
|
||||||
option.Cookies.ApplicationCookie.LoginPath = new PathString(Constants.LoginPath.Substring(1));
|
option.Cookies.ApplicationCookie.AccessDeniedPath = new PathString(Constants.AccessDeniedPath.Substring(1));
|
||||||
option.Cookies.ApplicationCookie.AccessDeniedPath = new PathString(Constants.AccessDeniedPath.Substring(1));
|
option.Cookies.ApplicationCookie.AutomaticAuthenticate = true;
|
||||||
option.Cookies.ApplicationCookie.AutomaticAuthenticate = true;
|
option.Cookies.ApplicationCookie.AuthenticationScheme = Constants.ApplicationAuthenticationSheme;
|
||||||
option.Cookies.ApplicationCookie.AuthenticationScheme = Constants.ApplicationAuthenticationSheme;
|
option.Cookies.ApplicationCookieAuthenticationScheme = Constants.ApplicationAuthenticationSheme;
|
||||||
option.Cookies.ApplicationCookieAuthenticationScheme = Constants.ApplicationAuthenticationSheme;
|
option.Cookies.TwoFactorRememberMeCookie.ExpireTimeSpan = TimeSpan.FromDays(30);
|
||||||
option.Cookies.TwoFactorRememberMeCookie.ExpireTimeSpan = TimeSpan.FromDays(30);
|
option.Cookies.TwoFactorRememberMeCookie.DataProtectionProvider = protector;
|
||||||
option.Cookies.TwoFactorRememberMeCookie.DataProtectionProvider = protector;
|
option.Cookies.ExternalCookieAuthenticationScheme = Constants.ExternalAuthenticationSheme;
|
||||||
option.Cookies.ExternalCookieAuthenticationScheme = Constants.ExternalAuthenticationSheme;
|
option.Cookies.ExternalCookie.AutomaticAuthenticate = true;
|
||||||
option.Cookies.ExternalCookie.AutomaticAuthenticate = true;
|
option.Cookies.ExternalCookie.AuthenticationScheme = Constants.ExternalAuthenticationSheme;
|
||||||
option.Cookies.ExternalCookie.AuthenticationScheme = Constants.ExternalAuthenticationSheme;
|
option.Cookies.ExternalCookie.DataProtectionProvider = protector;
|
||||||
option.Cookies.ExternalCookie.DataProtectionProvider = protector;
|
*/
|
||||||
*/
|
}
|
||||||
}
|
).AddEntityFrameworkStores<ApplicationDbContext> ()
|
||||||
).AddEntityFrameworkStores<ApplicationDbContext>()
|
.AddTokenProvider<EmailTokenProvider<ApplicationUser>> (Constants.DefaultFactor)
|
||||||
.AddTokenProvider<EmailTokenProvider<ApplicationUser>>(Constants.DefaultFactor)
|
// .AddTokenProvider<UserTokenProvider>(Constants.DefaultFactor)
|
||||||
// .AddTokenProvider<UserTokenProvider>(Constants.DefaultFactor)
|
|
||||||
// .AddTokenProvider<UserTokenProvider>(Constants.SMSFactor)
|
// .AddTokenProvider<UserTokenProvider>(Constants.SMSFactor)
|
||||||
// .AddTokenProvider<UserTokenProvider>(Constants.EMailFactor)
|
// .AddTokenProvider<UserTokenProvider>(Constants.EMailFactor)
|
||||||
// .AddTokenProvider<UserTokenProvider>(Constants.AppFactor)
|
// .AddTokenProvider<UserTokenProvider>(Constants.AppFactor)
|
||||||
// .AddDefaultTokenProviders()
|
// .AddDefaultTokenProviders()
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
private void ConfigureOAuthApp(IApplicationBuilder app,
|
private void ConfigureOAuthApp (IApplicationBuilder app,
|
||||||
SiteSettings settingsOptions, ILogger logger)
|
SiteSettings settingsOptions, ILogger logger) {
|
||||||
{
|
|
||||||
|
|
||||||
app.UseIdentity();
|
app.UseIdentity ();
|
||||||
app.UseWhen(context => context.Request.Path.StartsWithSegments("/api"),
|
app.UseWhen (context => context.Request.Path.StartsWithSegments ("/api"),
|
||||||
branch =>
|
branch => {
|
||||||
{
|
branch.UseJwtBearerAuthentication (
|
||||||
branch.UseJwtBearerAuthentication(
|
options => {
|
||||||
options =>
|
options.AuthenticationScheme = JwtBearerDefaults.AuthenticationScheme;
|
||||||
{
|
options.AutomaticAuthenticate = true;
|
||||||
options.AuthenticationScheme = JwtBearerDefaults.AuthenticationScheme;
|
options.SecurityTokenValidators.Clear ();
|
||||||
options.AutomaticAuthenticate = true;
|
options.SecurityTokenValidators.Add (new TicketDataFormatTokenValidator (
|
||||||
options.SecurityTokenValidators.Clear();
|
ProtectionProvider
|
||||||
options.SecurityTokenValidators.Add(new TicketDataFormatTokenValidator(
|
));
|
||||||
ProtectionProvider
|
}
|
||||||
));
|
);
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
});
|
});
|
||||||
app.UseWhen(context => !context.Request.Path.StartsWithSegments("/api"),
|
app.UseWhen (context => !context.Request.Path.StartsWithSegments ("/api"),
|
||||||
branch =>
|
branch => {
|
||||||
{
|
// External authentication shared cookie:
|
||||||
// External authentication shared cookie:
|
branch.UseCookieAuthentication (options => {
|
||||||
branch.UseCookieAuthentication(options =>
|
ExternalCookieAppOptions = options;
|
||||||
{
|
options.AuthenticationScheme = Constants.ExternalAuthenticationSheme;
|
||||||
ExternalCookieAppOptions = options;
|
options.AutomaticAuthenticate = true;
|
||||||
options.AuthenticationScheme = Constants.ExternalAuthenticationSheme;
|
options.ExpireTimeSpan = TimeSpan.FromMinutes (5);
|
||||||
options.AutomaticAuthenticate = true;
|
options.LoginPath = new PathString (Constants.LoginPath.Substring (1));
|
||||||
options.ExpireTimeSpan = TimeSpan.FromMinutes(5);
|
// TODO implement an access denied page
|
||||||
options.LoginPath = new PathString(Constants.LoginPath.Substring(1));
|
options.AccessDeniedPath = new PathString (Constants.LoginPath.Substring (1));
|
||||||
// TODO implement an access denied page
|
});
|
||||||
options.AccessDeniedPath = new PathString(Constants.LoginPath.Substring(1));
|
|
||||||
});
|
|
||||||
|
|
||||||
|
YavscGoogleAppOptions = new YavscGoogleOptions {
|
||||||
|
ClientId = GoogleWebClientConfiguration["web:client_id"],
|
||||||
|
ClientSecret = GoogleWebClientConfiguration["web:client_secret"],
|
||||||
|
AccessType = "offline",
|
||||||
|
Scope = {
|
||||||
|
"profile",
|
||||||
|
"https://www.googleapis.com/auth/plus.login",
|
||||||
|
"https://www.googleapis.com/auth/admin.directory.resource.calendar",
|
||||||
|
"https://www.googleapis.com/auth/calendar",
|
||||||
|
"https://www.googleapis.com/auth/calendar.events"
|
||||||
|
},
|
||||||
|
SaveTokensAsClaims = true,
|
||||||
|
UserInformationEndpoint = "https://www.googleapis.com/plus/v1/people/me",
|
||||||
|
Events = new OAuthEvents {
|
||||||
|
OnCreatingTicket = async context => {
|
||||||
|
using (var serviceScope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory> ()
|
||||||
|
.CreateScope ()) {
|
||||||
|
var gcontext = context as GoogleOAuthCreatingTicketContext;
|
||||||
|
context.Identity.AddClaim (new Claim (YavscClaimTypes.GoogleUserId, gcontext.GoogleUserId));
|
||||||
|
var dbContext = serviceScope.ServiceProvider.GetService<ApplicationDbContext> ();
|
||||||
|
|
||||||
|
var store = serviceScope.ServiceProvider.GetService<IDataStore> ();
|
||||||
|
await store.StoreAsync (gcontext.GoogleUserId, new TokenResponse {
|
||||||
|
AccessToken = gcontext.TokenResponse.AccessToken,
|
||||||
|
RefreshToken = gcontext.TokenResponse.RefreshToken,
|
||||||
|
TokenType = gcontext.TokenResponse.TokenType,
|
||||||
|
ExpiresInSeconds = int.Parse (gcontext.TokenResponse.ExpiresIn),
|
||||||
|
IssuedUtc = DateTime.Now
|
||||||
|
});
|
||||||
|
await dbContext.StoreTokenAsync (gcontext.GoogleUserId,
|
||||||
|
gcontext.TokenResponse.Response,
|
||||||
|
gcontext.TokenResponse.AccessToken,
|
||||||
|
gcontext.TokenResponse.TokenType,
|
||||||
|
gcontext.TokenResponse.RefreshToken,
|
||||||
|
gcontext.TokenResponse.ExpiresIn);
|
||||||
|
|
||||||
YavscGoogleAppOptions = new YavscGoogleOptions
|
}
|
||||||
{
|
}
|
||||||
ClientId = GoogleWebClientConfiguration ["web:client_id"],
|
}
|
||||||
ClientSecret = GoogleWebClientConfiguration ["web:client_secret"],
|
};
|
||||||
AccessType = "offline",
|
|
||||||
Scope = { "profile", "https://www.googleapis.com/auth/plus.login",
|
|
||||||
"https://www.googleapis.com/auth/admin.directory.resource.calendar",
|
|
||||||
"https://www.googleapis.com/auth/calendar",
|
|
||||||
"https://www.googleapis.com/auth/calendar.events"},
|
|
||||||
SaveTokensAsClaims = true,
|
|
||||||
UserInformationEndpoint = "https://www.googleapis.com/plus/v1/people/me",
|
|
||||||
Events = new OAuthEvents
|
|
||||||
{
|
|
||||||
OnCreatingTicket = async context =>
|
|
||||||
{
|
|
||||||
using (var serviceScope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>()
|
|
||||||
.CreateScope())
|
|
||||||
{
|
|
||||||
var gcontext = context as GoogleOAuthCreatingTicketContext;
|
|
||||||
context.Identity.AddClaim(new Claim(YavscClaimTypes.GoogleUserId, gcontext.GoogleUserId));
|
|
||||||
var dbContext = serviceScope.ServiceProvider.GetService<ApplicationDbContext>();
|
|
||||||
|
|
||||||
var store = serviceScope.ServiceProvider.GetService<IDataStore>();
|
branch.UseMiddleware<Yavsc.Auth.GoogleMiddleware> (YavscGoogleAppOptions);
|
||||||
await store.StoreAsync(gcontext.GoogleUserId, new TokenResponse {
|
/* FIXME 403
|
||||||
AccessToken = gcontext.TokenResponse.AccessToken,
|
|
||||||
RefreshToken = gcontext.TokenResponse.RefreshToken,
|
|
||||||
TokenType = gcontext.TokenResponse.TokenType,
|
|
||||||
ExpiresInSeconds = int.Parse(gcontext.TokenResponse.ExpiresIn),
|
|
||||||
IssuedUtc = DateTime.Now
|
|
||||||
});
|
|
||||||
await dbContext.StoreTokenAsync (gcontext.GoogleUserId,
|
|
||||||
gcontext.TokenResponse.Response,
|
|
||||||
gcontext.TokenResponse.AccessToken,
|
|
||||||
gcontext.TokenResponse.TokenType,
|
|
||||||
gcontext.TokenResponse.RefreshToken,
|
|
||||||
gcontext.TokenResponse.ExpiresIn);
|
|
||||||
|
|
||||||
}
|
branch.UseTwitterAuthentication(options=>
|
||||||
}
|
{
|
||||||
}
|
TwitterAppOptions = options;
|
||||||
};
|
options.ConsumerKey = Configuration["Authentication:Twitter:ClientId"];
|
||||||
|
options.ConsumerSecret = Configuration["Authentication:Twitter:ClientSecret"];
|
||||||
|
}); */
|
||||||
|
|
||||||
branch.UseMiddleware<Yavsc.Auth.GoogleMiddleware>(YavscGoogleAppOptions);
|
branch.UseOAuthAuthorizationServer (
|
||||||
/* FIXME 403
|
|
||||||
|
|
||||||
branch.UseTwitterAuthentication(options=>
|
options => {
|
||||||
{
|
OAuthServerAppOptions = options;
|
||||||
TwitterAppOptions = options;
|
options.AuthorizeEndpointPath = new PathString (Constants.AuthorizePath.Substring (1));
|
||||||
options.ConsumerKey = Configuration["Authentication:Twitter:ClientId"];
|
options.TokenEndpointPath = new PathString (Constants.TokenPath.Substring (1));
|
||||||
options.ConsumerSecret = Configuration["Authentication:Twitter:ClientSecret"];
|
options.ApplicationCanDisplayErrors = true;
|
||||||
}); */
|
options.AllowInsecureHttp = true;
|
||||||
|
options.AuthenticationScheme = OAuthDefaults.AuthenticationType;
|
||||||
|
options.TokenDataProtector = ProtectionProvider.CreateProtector ("Bearer protection");
|
||||||
|
|
||||||
|
options.Provider = new OAuthAuthorizationServerProvider {
|
||||||
|
OnValidateClientRedirectUri = ValidateClientRedirectUri,
|
||||||
|
OnValidateClientAuthentication = ValidateClientAuthentication,
|
||||||
|
OnGrantResourceOwnerCredentials = GrantResourceOwnerCredentials,
|
||||||
|
OnGrantClientCredentials = GrantClientCredetails
|
||||||
|
};
|
||||||
|
|
||||||
branch.UseOAuthAuthorizationServer(
|
options.AuthorizationCodeProvider = new AuthenticationTokenProvider {
|
||||||
|
OnCreate = CreateAuthenticationCode,
|
||||||
|
OnReceive = ReceiveAuthenticationCode,
|
||||||
|
};
|
||||||
|
|
||||||
options =>
|
options.RefreshTokenProvider = new AuthenticationTokenProvider {
|
||||||
{
|
OnCreate = CreateRefreshToken,
|
||||||
OAuthServerAppOptions = options;
|
OnReceive = ReceiveRefreshToken,
|
||||||
options.AuthorizeEndpointPath = new PathString(Constants.AuthorizePath.Substring(1));
|
};
|
||||||
options.TokenEndpointPath = new PathString(Constants.TokenPath.Substring(1));
|
|
||||||
options.ApplicationCanDisplayErrors = true;
|
|
||||||
options.AllowInsecureHttp = true;
|
|
||||||
options.AuthenticationScheme = OAuthDefaults.AuthenticationType;
|
|
||||||
options.TokenDataProtector = ProtectionProvider.CreateProtector("Bearer protection");
|
|
||||||
|
|
||||||
options.Provider = new OAuthAuthorizationServerProvider
|
options.AutomaticAuthenticate = true;
|
||||||
{
|
options.AutomaticChallenge = true;
|
||||||
OnValidateClientRedirectUri = ValidateClientRedirectUri,
|
}
|
||||||
OnValidateClientAuthentication = ValidateClientAuthentication,
|
);
|
||||||
OnGrantResourceOwnerCredentials = GrantResourceOwnerCredentials,
|
});
|
||||||
OnGrantClientCredentials = GrantClientCredetails
|
|
||||||
};
|
|
||||||
|
|
||||||
options.AuthorizationCodeProvider = new AuthenticationTokenProvider
|
|
||||||
{
|
|
||||||
OnCreate = CreateAuthenticationCode,
|
|
||||||
OnReceive = ReceiveAuthenticationCode,
|
|
||||||
};
|
|
||||||
|
|
||||||
options.RefreshTokenProvider = new AuthenticationTokenProvider
|
|
||||||
{
|
|
||||||
OnCreate = CreateRefreshToken,
|
|
||||||
OnReceive = ReceiveRefreshToken,
|
|
||||||
};
|
|
||||||
|
|
||||||
options.AutomaticAuthenticate = true;
|
|
||||||
options.AutomaticChallenge = true;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
Environment.SetEnvironmentVariable ("GOOGLE_APPLICATION_CREDENTIALS", "google-secret.json");
|
|
||||||
|
|
||||||
|
Environment.SetEnvironmentVariable ("GOOGLE_APPLICATION_CREDENTIALS", "google-secret.json");
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue