Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-08-11 09:13:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5892 from crobibero/password-obsolete

Browse Source
This commit is contained in:
Bond-009 2021-04-23 10:17:49 +02:00 committed by GitHub
commit 1a54338e38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Session/SessionManager.cs
View File

@ -1485,7 +1485,7 @@ namespace Emby.Server.Implementations.Session
user = await _userManager.AuthenticateUser( user = await _userManager.AuthenticateUser(
request.Username, request.Username,
request.Password, request.Password,
request.PasswordSha1, null,
request.RemoteEndPoint, request.RemoteEndPoint,
true).ConfigureAwait(false); true).ConfigureAwait(false);
} }

3
Jellyfin.Api/Controllers/UserController.cs
View File

@ -177,11 +177,9 @@ namespace Jellyfin.Api.Controllers
return StatusCode(StatusCodes.Status403Forbidden, "Only sha1 password is not allowed."); return StatusCode(StatusCodes.Status403Forbidden, "Only sha1 password is not allowed.");
} }
// Password should always be null
AuthenticateUserByName request = new AuthenticateUserByName AuthenticateUserByName request = new AuthenticateUserByName
{ {
Username = user.Username, Username = user.Username,
Password = null,
Pw = pw Pw = pw
}; };
return await AuthenticateUserByName(request).ConfigureAwait(false); return await AuthenticateUserByName(request).ConfigureAwait(false);
@ -208,7 +206,6 @@ namespace Jellyfin.Api.Controllers
DeviceId = auth.DeviceId, DeviceId = auth.DeviceId,
DeviceName = auth.Device, DeviceName = auth.Device,
Password = request.Pw, Password = request.Pw,
PasswordSha1 = request.Password,
RemoteEndPoint = HttpContext.GetNormalizedRemoteIp().ToString(), RemoteEndPoint = HttpContext.GetNormalizedRemoteIp().ToString(),
Username = request.Username Username = request.Username
}).ConfigureAwait(false); }).ConfigureAwait(false);

5
Jellyfin.Api/Models/UserDtos/AuthenticateUserByName.cs
View File

@ -1,4 +1,6 @@
namespace Jellyfin.Api.Models.UserDtos using System;
namespace Jellyfin.Api.Models.UserDtos
{ {
/// <summary> /// <summary>
/// The authenticate user by name request body. /// The authenticate user by name request body.
@ -18,6 +20,7 @@
/// <summary> /// <summary>
/// Gets or sets the sha1-hashed password. /// Gets or sets the sha1-hashed password.
/// </summary> /// </summary>
[Obsolete("Send password using pw field")]
public string? Password { get; set; } public string? Password { get; set; }
} }
} }

1
MediaBrowser.Controller/Session/AuthenticationRequest.cs
View File

@ -12,6 +12,7 @@ namespace MediaBrowser.Controller.Session
public string Password { get; set; } public string Password { get; set; }
[Obsolete("Send full password in Password field")]
public string PasswordSha1 { get; set; } public string PasswordSha1 { get; set; }
public string App { get; set; } public string App { get; set; }