alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-18 10:32:49 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #3187 from jellyfin/revert-2492-fix-api-private-data-leak

Browse Source 
Revert "Fix emby/user/public API leaking sensitive data"
This commit is contained in:
Joshua M. Boniface
2020-05-26 19:57:24 -04:00
committed by GitHub
parent 9c00226f11 0be3dfe7c5
commit b33fa06efa
4 changed files with 11 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Emby.Server.Implementations/Library/UserManager.cs
View File

@@ -608,31 +608,6 @@ namespace Emby.Server.Implementations.Library
return dto;
}
public PublicUserDto GetPublicUserDto(User user, string remoteEndPoint = null)
{
if (user == null)
{
throw new ArgumentNullException(nameof(user));
}
IAuthenticationProvider authenticationProvider = GetAuthenticationProvider(user);
bool hasConfiguredPassword = authenticationProvider.HasPassword(user);
bool hasConfiguredEasyPassword = !string.IsNullOrEmpty(authenticationProvider.GetEasyPasswordHash(user));
bool hasPassword = user.Configuration.EnableLocalPassword &&
!string.IsNullOrEmpty(remoteEndPoint) &&
_networkManager.IsInLocalNetwork(remoteEndPoint) ? hasConfiguredEasyPassword : hasConfiguredPassword;
PublicUserDto dto = new PublicUserDto
{
Name = user.Name,
HasPassword = hasPassword,
HasConfiguredPassword = hasConfiguredPassword,
};
return dto;
}
public UserDto GetOfflineUserDto(User user)
{
var dto = GetUserDto(user);