Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: API Authentication issues with Apache Basic Auth

This commit is contained in:
Mark McDowall 2014-01-24 08:35:05 -08:00
parent 6b90a3a1eb
commit 8292d4d267
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/NzbDrone.Api/Authentication/EnableStatelessAuthInNancy.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.Linq;
using Nancy; using Nancy;
using Nancy.Bootstrapper; using Nancy.Bootstrapper;
using NzbDrone.Api.Extensions; using NzbDrone.Api.Extensions;
@ -33,7 +34,9 @@ namespace NzbDrone.Api.Authentication
return response; return response;
} }
var apiKey = context.Request.Headers.Authorization; var authorizationHeader = context.Request.Headers.Authorization;
var apiKeyHeader = context.Request.Headers["X-Api-Key"].FirstOrDefault();
var apiKey = String.IsNullOrWhiteSpace(apiKeyHeader) ? authorizationHeader : apiKeyHeader;
if (context.Request.IsApiRequest() && !ValidApiKey(apiKey) && !_authenticationService.IsAuthenticated(context)) if (context.Request.IsApiRequest() && !ValidApiKey(apiKey) && !_authenticationService.IsAuthenticated(context))
{ {

2
src/UI/Mixins/jquery.ajax.js
View File

@ -25,7 +25,7 @@ define(
if (xhr) { if (xhr) {
xhr.headers = xhr.headers || {}; xhr.headers = xhr.headers || {};
xhr.headers.Authorization = window.NzbDrone.ApiKey; xhr.headers['X-Api-Key'] = window.NzbDrone.ApiKey;
} }
return original.apply(this, arguments); return original.apply(this, arguments);