github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 05:57:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rollback changes in IUserManager

Browse source
This commit is contained in:
David Ullmer 2022-07-04 19:10:37 +02:00
parent f9d26ea1bc
commit 81e535fc62
No known key found for this signature in database
GPG key ID: 4AEABE3359D5883C
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Jellyfin.Api/Controllers/UserController.cs
View file

@ -256,7 +256,7 @@ namespace Jellyfin.Api.Controllers
/// <response code="404">User not found.</response>
/// <returns>A <see cref="NoContentResult"/> indicating success or a <see cref="ForbidResult"/> or a <see cref="NotFoundResult"/> on failure.</returns>
[HttpPost("{userId}/Password")]
[Authorize(Policy = Policies.IgnoreParentalControl)]
[Authorize(Policy = Policies.DefaultAuthorization)]
[ProducesResponseType(StatusCodes.Status204NoContent)]
[ProducesResponseType(StatusCodes.Status403Forbidden)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
@ -282,15 +282,14 @@ namespace Jellyfin.Api.Controllers
}
else
{
if (HttpContext.User.IsInRole(UserRoles.Administrator))
if (!HttpContext.User.IsInRole(UserRoles.Administrator))
{
var success = await _userManager.AuthenticateUser(
user.Username,
request.CurrentPw,
request.CurrentPw,
HttpContext.GetNormalizedRemoteIp().ToString(),
false,
ignoreParentalSchedule: true).ConfigureAwait(false);
false).ConfigureAwait(false);
if (success == null)
{

5
Jellyfin.Server.Implementations/Users/UserManager.cs
View file

@ -382,8 +382,7 @@ namespace Jellyfin.Server.Implementations.Users
string password,
string passwordSha1,
string remoteEndPoint,
bool isUserSession,
bool ignoreParentalSchedule = false)
bool isUserSession)
{
if (string.IsNullOrWhiteSpace(username))
{
@ -459,7 +458,7 @@ namespace Jellyfin.Server.Implementations.Users
throw new SecurityException("Forbidden.");
}
if (!ignoreParentalSchedule && !user.IsParentalScheduleAllowed())
if (!user.IsParentalScheduleAllowed())
{
_logger.LogInformation(
"Authentication request for {UserName} is not allowed at this time due parental restrictions (IP: {IP}).",

3
MediaBrowser.Controller/Library/IUserManager.cs
View file

@ -138,9 +138,8 @@ namespace MediaBrowser.Controller.Library
/// <param name="passwordSha1">Hash of password.</param>
/// <param name="remoteEndPoint">Remove endpoint to use.</param>
/// <param name="isUserSession">Specifies if a user session.</param>
/// <param name="ignoreParentalSchedule">Ignore parental control schedule during authentication.</param>
/// <returns>User wrapped in awaitable task.</returns>
Task<User> AuthenticateUser(string username, string password, string passwordSha1, string remoteEndPoint, bool isUserSession, bool ignoreParentalSchedule = false);
Task<User> AuthenticateUser(string username, string password, string passwordSha1, string remoteEndPoint, bool isUserSession);
/// <summary>
/// Starts the forgot password process.