Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-08 23:00:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1244 from joshuaboniface/hotfix-authapi

Browse source 
Hotfix authapi
This commit is contained in:
Joshua M. Boniface 2019-04-18 17:58:54 -04:00 committed by GitHub
parent cde7375049 31ad366aa9
commit 06a1e1f166
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
View file

@ -203,6 +203,7 @@ namespace Emby.Server.Implementations.HttpServer
case DirectoryNotFoundException _:
case FileNotFoundException _:
case ResourceNotFoundException _: return 404;
case MethodNotAllowedException _: return 405;
case RemoteServiceUnavailableException _: return 502;
default: return 500;
}

7
MediaBrowser.Api/UserService.cs
View file

@ -379,10 +379,15 @@ namespace MediaBrowser.Api
throw new ResourceNotFoundException("User not found");
}
if (!string.IsNullOrEmpty(request.Password) && string.IsNullOrEmpty(request.Pw))
{
throw new MethodNotAllowedException("Hashed-only passwords are not valid for this API.");
}
return Post(new AuthenticateUserByName
{
Username = user.Name,
Password = request.Password,
Password = null, // This should always be null
Pw = request.Pw
});
}

24
MediaBrowser.Common/Extensions/ResourceNotFoundException.cs
View file

@ -26,6 +26,30 @@ namespace MediaBrowser.Common.Extensions
}
}
/// <summary>
/// Class MethodNotAllowedException
/// </summary>
public class MethodNotAllowedException : Exception
{
/// <summary>
/// Initializes a new instance of the <see cref="MethodNotAllowedException" /> class.
/// </summary>
public MethodNotAllowedException()
{
}
/// <summary>
/// Initializes a new instance of the <see cref="MethodNotAllowedException" /> class.
/// </summary>
/// <param name="message">The message.</param>
public MethodNotAllowedException(string message)
: base(message)
{
}
}
public class RemoteServiceUnavailableException : Exception
{
public RemoteServiceUnavailableException()