Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-06-01 04:34:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prioritize auth header compared to auth cookie

Browse Source
This commit is contained in:
Zoe Roux 2024-03-09 15:40:55 +01:00
parent 92bfbf662b
commit 8f7320c298
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
back/src/Kyoo.Authentication/AuthenticationModule.cs
View File

@ -29,6 +29,7 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Primitives;
using Microsoft.IdentityModel.Tokens; using Microsoft.IdentityModel.Tokens;
namespace Kyoo.Authentication namespace Kyoo.Authentication
@ -69,12 +70,8 @@ namespace Kyoo.Authentication
PermissionOption options = PermissionOption options =
new() new()
{ {
Default = _configuration Default = _configuration.GetValue("UNLOGGED_PERMISSIONS", "")!.Split(',').Where(x => x.Length > 0).ToArray(),
.GetValue("UNLOGGED_PERMISSIONS", "overall.read,overall.play")! NewUser = _configuration.GetValue("DEFAULT_PERMISSIONS", "overall.read,overall.play")!.Split(','),
.Split(','),
NewUser = _configuration
.GetValue("DEFAULT_PERMISSIONS", "overall.read,overall.play")!
.Split(','),
RequireVerification = _configuration.GetValue( RequireVerification = _configuration.GetValue(
"REQUIRE_ACCOUNT_VERIFICATION", "REQUIRE_ACCOUNT_VERIFICATION",
true true
@ -141,7 +138,6 @@ namespace Kyoo.Authentication
new AuthenticationOption() { Secret = secret, Permissions = options, } new AuthenticationOption() { Secret = secret, Permissions = options, }
); );
// TODO handle direct-videos with bearers (probably add a cookie and a app.Use to translate that for videos)
services services
.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) .AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
.AddJwtBearer(options => .AddJwtBearer(options =>
@ -150,6 +146,18 @@ namespace Kyoo.Authentication
{ {
OnMessageReceived = (ctx) => OnMessageReceived = (ctx) =>
{ {
string prefix = "Bearer ";
if (
ctx.Request.Headers.TryGetValue(
"Authorization",
out StringValues val
)
&& val.ToString() is string auth
&& auth.StartsWith(prefix)
)
{
ctx.Token ??= auth[prefix.Length..];
}
ctx.Token ??= ctx.Request.Cookies["X-Bearer"]; ctx.Token ??= ctx.Request.Cookies["X-Bearer"];
return Task.CompletedTask; return Task.CompletedTask;
} }

4
front/packages/models/src/login.ts
View File

@ -33,7 +33,7 @@ export const login = async (
action: "register" | "login", action: "register" | "login",
{ apiUrl, ...body }: { username: string; password: string; email?: string; apiUrl?: string }, { apiUrl, ...body }: { username: string; password: string; email?: string; apiUrl?: string },
): Promise<Result<Account, string>> => { ): Promise<Result<Account, string>> => {
apiUrl ??= getCurrentApiUrl()!; if (!apiUrl || apiUrl.length === 0) apiUrl = getCurrentApiUrl()!;
try { try {
const controller = new AbortController(); const controller = new AbortController();
setTimeout(() => controller.abort(), 5_000); setTimeout(() => controller.abort(), 5_000);
@ -63,7 +63,7 @@ export const login = async (
}; };
export const oidcLogin = async (provider: string, code: string, apiUrl?: string) => { export const oidcLogin = async (provider: string, code: string, apiUrl?: string) => {
apiUrl ??= getCurrentApiUrl()!; if (!apiUrl || apiUrl.length === 0) apiUrl = getCurrentApiUrl()!;
try { try {
const token = await queryFn( const token = await queryFn(
{ {

2
front/packages/models/src/query.tsx
View File

@ -50,7 +50,7 @@ export const queryFn = async <Parser extends z.ZodTypeAny>(
type?: Parser, type?: Parser,
token?: string | null, token?: string | null,
): Promise<z.infer<Parser>> => { ): Promise<z.infer<Parser>> => {
const url = context.apiUrl ?? getCurrentApiUrl(); const url = context.apiUrl && context.apiUrl.length > 0 ? context.apiUrl : getCurrentApiUrl();
lastUsedUrl = url!; lastUsedUrl = url!;
if (token === undefined && context.authenticated !== false) token = await getToken(); if (token === undefined && context.authenticated !== false) token = await getToken();