mirror of https://github.com/jellyfin/jellyfin.git
update local pin feature
This commit is contained in:
parent
e700aff047
commit
ad8b43cc3d
|
@ -1,9 +1,14 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Common.Extensions;
|
using MediaBrowser.Common.Extensions;
|
||||||
|
using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Controller.Net;
|
using MediaBrowser.Controller.Net;
|
||||||
|
using MediaBrowser.Controller.Session;
|
||||||
using MediaBrowser.Model.Connect;
|
using MediaBrowser.Model.Connect;
|
||||||
|
using MediaBrowser.Model.Dto;
|
||||||
|
using MediaBrowser.Model.Session;
|
||||||
using ServiceStack;
|
using ServiceStack;
|
||||||
|
|
||||||
namespace MediaBrowser.Api
|
namespace MediaBrowser.Api
|
||||||
|
@ -13,6 +18,8 @@ namespace MediaBrowser.Api
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "DeviceId", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
[ApiMember(Name = "DeviceId", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
||||||
public string DeviceId { get; set; }
|
public string DeviceId { get; set; }
|
||||||
|
[ApiMember(Name = "AppName", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
||||||
|
public string AppName { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
[Route("/Auth/Pin", "GET", Summary = "Gets pin status")]
|
[Route("/Auth/Pin", "GET", Summary = "Gets pin status")]
|
||||||
|
@ -35,7 +42,7 @@ namespace MediaBrowser.Api
|
||||||
|
|
||||||
[Route("/Auth/Pin/Validate", "POST", Summary = "Validates a pin")]
|
[Route("/Auth/Pin/Validate", "POST", Summary = "Validates a pin")]
|
||||||
[Authenticated]
|
[Authenticated]
|
||||||
public class ValidatePinRequest : IReturnVoid
|
public class ValidatePinRequest : IReturn<SessionInfoDto>
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "Pin", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
[ApiMember(Name = "Pin", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
||||||
public string Pin { get; set; }
|
public string Pin { get; set; }
|
||||||
|
@ -43,10 +50,27 @@ namespace MediaBrowser.Api
|
||||||
|
|
||||||
public class PinLoginService : BaseApiService
|
public class PinLoginService : BaseApiService
|
||||||
{
|
{
|
||||||
private readonly ConcurrentDictionary<string, MyPinStatus> _activeRequests = new ConcurrentDictionary<string, MyPinStatus>(StringComparer.OrdinalIgnoreCase);
|
private static readonly ConcurrentDictionary<string, MyPinStatus> _activeRequests = new ConcurrentDictionary<string, MyPinStatus>(StringComparer.OrdinalIgnoreCase);
|
||||||
|
private readonly ISessionManager _sessionManager;
|
||||||
|
private readonly IUserManager _userManager;
|
||||||
|
|
||||||
|
public PinLoginService(ISessionManager sessionManager, IUserManager userManager)
|
||||||
|
{
|
||||||
|
_sessionManager = sessionManager;
|
||||||
|
_userManager = userManager;
|
||||||
|
}
|
||||||
|
|
||||||
public object Post(CreatePinRequest request)
|
public object Post(CreatePinRequest request)
|
||||||
{
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(request.DeviceId))
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException("DeviceId");
|
||||||
|
}
|
||||||
|
if (string.IsNullOrWhiteSpace(request.AppName))
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException("AppName");
|
||||||
|
}
|
||||||
|
|
||||||
var pin = GetNewPin();
|
var pin = GetNewPin();
|
||||||
|
|
||||||
var value = new MyPinStatus
|
var value = new MyPinStatus
|
||||||
|
@ -55,7 +79,8 @@ namespace MediaBrowser.Api
|
||||||
IsConfirmed = false,
|
IsConfirmed = false,
|
||||||
IsExpired = false,
|
IsExpired = false,
|
||||||
Pin = pin,
|
Pin = pin,
|
||||||
DeviceId = request.DeviceId
|
DeviceId = request.DeviceId,
|
||||||
|
AppName = request.AppName
|
||||||
};
|
};
|
||||||
|
|
||||||
_activeRequests.AddOrUpdate(pin, value, (k, v) => value);
|
_activeRequests.AddOrUpdate(pin, value, (k, v) => value);
|
||||||
|
@ -75,6 +100,7 @@ namespace MediaBrowser.Api
|
||||||
|
|
||||||
if (!_activeRequests.TryGetValue(request.Pin, out status))
|
if (!_activeRequests.TryGetValue(request.Pin, out status))
|
||||||
{
|
{
|
||||||
|
Logger.Debug("Pin {0} not found.", request.Pin);
|
||||||
throw new ResourceNotFoundException();
|
throw new ResourceNotFoundException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -88,12 +114,13 @@ namespace MediaBrowser.Api
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public object Post(ExchangePinRequest request)
|
public async Task<object> Post(ExchangePinRequest request)
|
||||||
{
|
{
|
||||||
MyPinStatus status;
|
MyPinStatus status;
|
||||||
|
|
||||||
if (!_activeRequests.TryGetValue(request.Pin, out status))
|
if (!_activeRequests.TryGetValue(request.Pin, out status))
|
||||||
{
|
{
|
||||||
|
Logger.Debug("Pin {0} not found.", request.Pin);
|
||||||
throw new ResourceNotFoundException();
|
throw new ResourceNotFoundException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,14 +131,24 @@ namespace MediaBrowser.Api
|
||||||
throw new ResourceNotFoundException();
|
throw new ResourceNotFoundException();
|
||||||
}
|
}
|
||||||
|
|
||||||
return ToOptimizedResult(new PinExchangeResult
|
var auth = AuthorizationContext.GetAuthorizationInfo(Request);
|
||||||
|
var user = _userManager.GetUserById(status.UserId);
|
||||||
|
|
||||||
|
var result = await _sessionManager.CreateNewSession(new AuthenticationRequest
|
||||||
{
|
{
|
||||||
// TODO: Add access token
|
App = auth.Client,
|
||||||
UserId = status.UserId
|
AppVersion = auth.Version,
|
||||||
});
|
DeviceId = auth.DeviceId,
|
||||||
|
DeviceName = auth.Device,
|
||||||
|
RemoteEndPoint = Request.RemoteIp,
|
||||||
|
Username = user.Name
|
||||||
|
|
||||||
|
}).ConfigureAwait(false);
|
||||||
|
|
||||||
|
return ToOptimizedResult(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Post(ValidatePinRequest request)
|
public object Post(ValidatePinRequest request)
|
||||||
{
|
{
|
||||||
MyPinStatus status;
|
MyPinStatus status;
|
||||||
|
|
||||||
|
@ -124,12 +161,18 @@ namespace MediaBrowser.Api
|
||||||
|
|
||||||
status.IsConfirmed = true;
|
status.IsConfirmed = true;
|
||||||
status.UserId = AuthorizationContext.GetAuthorizationInfo(Request).UserId;
|
status.UserId = AuthorizationContext.GetAuthorizationInfo(Request).UserId;
|
||||||
|
|
||||||
|
return ToOptimizedResult(new ValidatePinResult
|
||||||
|
{
|
||||||
|
AppName = status.AppName
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void EnsureValid(string requestedDeviceId, MyPinStatus status)
|
private void EnsureValid(string requestedDeviceId, MyPinStatus status)
|
||||||
{
|
{
|
||||||
if (!string.Equals(requestedDeviceId, status.DeviceId, StringComparison.OrdinalIgnoreCase))
|
if (!string.Equals(requestedDeviceId, status.DeviceId, StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
|
Logger.Debug("Pin device Id's do not match. requestedDeviceId: {0}, status.DeviceId: {1}", requestedDeviceId, status.DeviceId);
|
||||||
throw new ResourceNotFoundException();
|
throw new ResourceNotFoundException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -145,6 +188,7 @@ namespace MediaBrowser.Api
|
||||||
|
|
||||||
if (status.IsExpired)
|
if (status.IsExpired)
|
||||||
{
|
{
|
||||||
|
Logger.Debug("Pin {0} is expired", status.Pin);
|
||||||
throw new ResourceNotFoundException();
|
throw new ResourceNotFoundException();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -163,16 +207,7 @@ namespace MediaBrowser.Api
|
||||||
|
|
||||||
private string GetNewPinInternal()
|
private string GetNewPinInternal()
|
||||||
{
|
{
|
||||||
var length = 5;
|
return new Random().Next(10000, 99999).ToString(CultureInfo.InvariantCulture);
|
||||||
var pin = string.Empty;
|
|
||||||
|
|
||||||
while (pin.Length < length)
|
|
||||||
{
|
|
||||||
var digit = new Random().Next(0, 9);
|
|
||||||
pin += digit.ToString(CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
|
|
||||||
return pin;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IsPinActive(string pin)
|
private bool IsPinActive(string pin)
|
||||||
|
@ -181,15 +216,15 @@ namespace MediaBrowser.Api
|
||||||
|
|
||||||
if (!_activeRequests.TryGetValue(pin, out status))
|
if (!_activeRequests.TryGetValue(pin, out status))
|
||||||
{
|
{
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (status.IsExpired)
|
if (status.IsExpired)
|
||||||
{
|
{
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class MyPinStatus : PinStatusResult
|
public class MyPinStatus : PinStatusResult
|
||||||
|
@ -197,6 +232,12 @@ namespace MediaBrowser.Api
|
||||||
public DateTime CreationTimeUtc { get; set; }
|
public DateTime CreationTimeUtc { get; set; }
|
||||||
public string DeviceId { get; set; }
|
public string DeviceId { get; set; }
|
||||||
public string UserId { get; set; }
|
public string UserId { get; set; }
|
||||||
|
public string AppName { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class ValidatePinResult
|
||||||
|
{
|
||||||
|
public string AppName { get; set; }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -415,23 +415,6 @@ namespace MediaBrowser.Api
|
||||||
{
|
{
|
||||||
var auth = AuthorizationContext.GetAuthorizationInfo(Request);
|
var auth = AuthorizationContext.GetAuthorizationInfo(Request);
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(auth.Client))
|
|
||||||
{
|
|
||||||
auth.Client = "Unknown app";
|
|
||||||
}
|
|
||||||
if (string.IsNullOrWhiteSpace(auth.Device))
|
|
||||||
{
|
|
||||||
auth.Device = "Unknown device";
|
|
||||||
}
|
|
||||||
if (string.IsNullOrWhiteSpace(auth.Version))
|
|
||||||
{
|
|
||||||
auth.Version = "Unknown version";
|
|
||||||
}
|
|
||||||
if (string.IsNullOrWhiteSpace(auth.DeviceId))
|
|
||||||
{
|
|
||||||
auth.DeviceId = "Unknown device id";
|
|
||||||
}
|
|
||||||
|
|
||||||
var result = await _sessionMananger.AuthenticateNewSession(new AuthenticationRequest
|
var result = await _sessionMananger.AuthenticateNewSession(new AuthenticationRequest
|
||||||
{
|
{
|
||||||
App = auth.Client,
|
App = auth.Client,
|
||||||
|
|
|
@ -250,6 +250,13 @@ namespace MediaBrowser.Controller.Session
|
||||||
/// <returns>Task{SessionInfo}.</returns>
|
/// <returns>Task{SessionInfo}.</returns>
|
||||||
Task<AuthenticationResult> AuthenticateNewSession(AuthenticationRequest request);
|
Task<AuthenticationResult> AuthenticateNewSession(AuthenticationRequest request);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Creates the new session.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="request">The request.</param>
|
||||||
|
/// <returns>Task<AuthenticationResult>.</returns>
|
||||||
|
Task<AuthenticationResult> CreateNewSession(AuthenticationRequest request);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reports the capabilities.
|
/// Reports the capabilities.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -348,6 +348,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (string.Equals(localPath, "/emby/pin", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
httpRes.RedirectToUrl("web/pin.html");
|
||||||
|
return Task.FromResult(true);
|
||||||
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(GlobalResponse))
|
if (!string.IsNullOrWhiteSpace(GlobalResponse))
|
||||||
{
|
{
|
||||||
httpRes.StatusCode = 503;
|
httpRes.StatusCode = 503;
|
||||||
|
|
|
@ -143,7 +143,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
|
||||||
{
|
{
|
||||||
audioChannels = audioStream.Channels ?? audioChannels;
|
audioChannels = audioStream.Channels ?? audioChannels;
|
||||||
}
|
}
|
||||||
return "-codec:a:0 aac -strict experimental -ab 320000 -ac " + audioChannels.ToString(CultureInfo.InvariantCulture);
|
return "-codec:a:0 aac -strict experimental -ab 320000";
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool EncodeVideo(MediaSourceInfo mediaSource)
|
private bool EncodeVideo(MediaSourceInfo mediaSource)
|
||||||
|
|
|
@ -1278,7 +1278,17 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="request">The request.</param>
|
/// <param name="request">The request.</param>
|
||||||
/// <returns>Task{SessionInfo}.</returns>
|
/// <returns>Task{SessionInfo}.</returns>
|
||||||
public async Task<AuthenticationResult> AuthenticateNewSession(AuthenticationRequest request)
|
public Task<AuthenticationResult> AuthenticateNewSession(AuthenticationRequest request)
|
||||||
|
{
|
||||||
|
return AuthenticateNewSessionInternal(request, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<AuthenticationResult> CreateNewSession(AuthenticationRequest request)
|
||||||
|
{
|
||||||
|
return AuthenticateNewSessionInternal(request, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<AuthenticationResult> AuthenticateNewSessionInternal(AuthenticationRequest request, bool enforcePassword)
|
||||||
{
|
{
|
||||||
var user = _userManager.Users
|
var user = _userManager.Users
|
||||||
.FirstOrDefault(i => string.Equals(request.Username, i.Name, StringComparison.OrdinalIgnoreCase));
|
.FirstOrDefault(i => string.Equals(request.Username, i.Name, StringComparison.OrdinalIgnoreCase));
|
||||||
|
@ -1291,13 +1301,16 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var result = await _userManager.AuthenticateUser(request.Username, request.PasswordSha1, request.PasswordMd5, request.RemoteEndPoint).ConfigureAwait(false);
|
if (enforcePassword)
|
||||||
|
|
||||||
if (!result)
|
|
||||||
{
|
{
|
||||||
EventHelper.FireEventIfNotNull(AuthenticationFailed, this, new GenericEventArgs<AuthenticationRequest>(request), _logger);
|
var result = await _userManager.AuthenticateUser(request.Username, request.PasswordSha1, request.PasswordMd5, request.RemoteEndPoint).ConfigureAwait(false);
|
||||||
|
|
||||||
throw new SecurityException("Invalid user or password entered.");
|
if (!result)
|
||||||
|
{
|
||||||
|
EventHelper.FireEventIfNotNull(AuthenticationFailed, this, new GenericEventArgs<AuthenticationRequest>(request), _logger);
|
||||||
|
|
||||||
|
throw new SecurityException("Invalid user or password entered.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var token = await GetAuthorizationToken(user.Id.ToString("N"), request.DeviceId, request.App, request.AppVersion, request.DeviceName).ConfigureAwait(false);
|
var token = await GetAuthorizationToken(user.Id.ToString("N"), request.DeviceId, request.App, request.AppVersion, request.DeviceName).ConfigureAwait(false);
|
||||||
|
@ -1320,7 +1333,8 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
ServerId = _appHost.SystemId
|
ServerId = _appHost.SystemId
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private async Task<string> GetAuthorizationToken(string userId, string deviceId, string app, string appVersion, string deviceName)
|
private async Task<string> GetAuthorizationToken(string userId, string deviceId, string app, string appVersion, string deviceName)
|
||||||
{
|
{
|
||||||
var existing = _authRepo.Get(new AuthenticationInfoQuery
|
var existing = _authRepo.Get(new AuthenticationInfoQuery
|
||||||
|
|
|
@ -275,6 +275,9 @@
|
||||||
<Content Include="dashboard-ui\mysyncsettings.html">
|
<Content Include="dashboard-ui\mysyncsettings.html">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="dashboard-ui\pin.html">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="dashboard-ui\robots.txt">
|
<Content Include="dashboard-ui\robots.txt">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
@ -317,6 +320,9 @@
|
||||||
<Content Include="dashboard-ui\scripts\autoorganizesmart.js">
|
<Content Include="dashboard-ui\scripts\autoorganizesmart.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="dashboard-ui\scripts\pin.js">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="dashboard-ui\scripts\searchmenu.js">
|
<Content Include="dashboard-ui\scripts\searchmenu.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
|
Loading…
Reference in New Issue