Luke Pulverenti пре 10 година
родитељ
комит
b889c31f56

+ 24 - 1
MediaBrowser.Api/LiveTv/LiveTvService.cs

@@ -20,6 +20,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Channels", "GET", Summary = "Gets available live tv channels.")]
     [Route("/LiveTv/Channels", "GET", Summary = "Gets available live tv channels.")]
+    [Authenticated]
     public class GetChannels : IReturn<QueryResult<ChannelInfoDto>>
     public class GetChannels : IReturn<QueryResult<ChannelInfoDto>>
     {
     {
         [ApiMember(Name = "Type", Description = "Optional filter by channel type.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         [ApiMember(Name = "Type", Description = "Optional filter by channel type.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
@@ -56,6 +57,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Channels/{Id}", "GET", Summary = "Gets a live tv channel")]
     [Route("/LiveTv/Channels/{Id}", "GET", Summary = "Gets a live tv channel")]
+    [Authenticated]
     public class GetChannel : IReturn<ChannelInfoDto>
     public class GetChannel : IReturn<ChannelInfoDto>
     {
     {
         /// <summary>
         /// <summary>
@@ -70,6 +72,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Recordings", "GET", Summary = "Gets live tv recordings")]
     [Route("/LiveTv/Recordings", "GET", Summary = "Gets live tv recordings")]
+    [Authenticated]
     public class GetRecordings : IReturn<QueryResult<RecordingInfoDto>>
     public class GetRecordings : IReturn<QueryResult<RecordingInfoDto>>
     {
     {
         [ApiMember(Name = "ChannelId", Description = "Optional filter by channel id.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         [ApiMember(Name = "ChannelId", Description = "Optional filter by channel id.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
@@ -98,6 +101,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Recordings/Groups", "GET", Summary = "Gets live tv recording groups")]
     [Route("/LiveTv/Recordings/Groups", "GET", Summary = "Gets live tv recording groups")]
+    [Authenticated]
     public class GetRecordingGroups : IReturn<QueryResult<RecordingGroupDto>>
     public class GetRecordingGroups : IReturn<QueryResult<RecordingGroupDto>>
     {
     {
         [ApiMember(Name = "UserId", Description = "Optional filter by user and attach user data.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         [ApiMember(Name = "UserId", Description = "Optional filter by user and attach user data.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
@@ -105,6 +109,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Recordings/{Id}", "GET", Summary = "Gets a live tv recording")]
     [Route("/LiveTv/Recordings/{Id}", "GET", Summary = "Gets a live tv recording")]
+    [Authenticated]
     public class GetRecording : IReturn<RecordingInfoDto>
     public class GetRecording : IReturn<RecordingInfoDto>
     {
     {
         [ApiMember(Name = "Id", Description = "Recording Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
         [ApiMember(Name = "Id", Description = "Recording Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
@@ -115,6 +120,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Tuners/{Id}/Reset", "POST", Summary = "Resets a tv tuner")]
     [Route("/LiveTv/Tuners/{Id}/Reset", "POST", Summary = "Resets a tv tuner")]
+    [Authenticated]
     public class ResetTuner : IReturnVoid
     public class ResetTuner : IReturnVoid
     {
     {
         [ApiMember(Name = "Id", Description = "Tuner Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
         [ApiMember(Name = "Id", Description = "Tuner Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
@@ -122,6 +128,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Timers/{Id}", "GET", Summary = "Gets a live tv timer")]
     [Route("/LiveTv/Timers/{Id}", "GET", Summary = "Gets a live tv timer")]
+    [Authenticated]
     public class GetTimer : IReturn<TimerInfoDto>
     public class GetTimer : IReturn<TimerInfoDto>
     {
     {
         [ApiMember(Name = "Id", Description = "Timer Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
         [ApiMember(Name = "Id", Description = "Timer Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
@@ -129,6 +136,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Timers/Defaults", "GET", Summary = "Gets default values for a new timer")]
     [Route("/LiveTv/Timers/Defaults", "GET", Summary = "Gets default values for a new timer")]
+    [Authenticated]
     public class GetDefaultTimer : IReturn<SeriesTimerInfoDto>
     public class GetDefaultTimer : IReturn<SeriesTimerInfoDto>
     {
     {
         [ApiMember(Name = "ProgramId", Description = "Optional, to attach default values based on a program.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         [ApiMember(Name = "ProgramId", Description = "Optional, to attach default values based on a program.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
@@ -136,6 +144,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Timers", "GET", Summary = "Gets live tv timers")]
     [Route("/LiveTv/Timers", "GET", Summary = "Gets live tv timers")]
+    [Authenticated]
     public class GetTimers : IReturn<QueryResult<TimerInfoDto>>
     public class GetTimers : IReturn<QueryResult<TimerInfoDto>>
     {
     {
         [ApiMember(Name = "ChannelId", Description = "Optional filter by channel id.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         [ApiMember(Name = "ChannelId", Description = "Optional filter by channel id.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
@@ -146,6 +155,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Programs", "GET,POST", Summary = "Gets available live tv epgs..")]
     [Route("/LiveTv/Programs", "GET,POST", Summary = "Gets available live tv epgs..")]
+    [Authenticated]
     public class GetPrograms : IReturn<QueryResult<ProgramInfoDto>>
     public class GetPrograms : IReturn<QueryResult<ProgramInfoDto>>
     {
     {
         [ApiMember(Name = "ChannelIds", Description = "The channels to return guide information for.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET,POST")]
         [ApiMember(Name = "ChannelIds", Description = "The channels to return guide information for.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET,POST")]
@@ -168,6 +178,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Programs/Recommended", "GET", Summary = "Gets available live tv epgs..")]
     [Route("/LiveTv/Programs/Recommended", "GET", Summary = "Gets available live tv epgs..")]
+    [Authenticated]
     public class GetRecommendedPrograms : IReturn<QueryResult<ProgramInfoDto>>
     public class GetRecommendedPrograms : IReturn<QueryResult<ProgramInfoDto>>
     {
     {
         [ApiMember(Name = "UserId", Description = "Optional filter by user id.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET,POST")]
         [ApiMember(Name = "UserId", Description = "Optional filter by user id.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET,POST")]
@@ -184,6 +195,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Programs/{Id}", "GET", Summary = "Gets a live tv program")]
     [Route("/LiveTv/Programs/{Id}", "GET", Summary = "Gets a live tv program")]
+    [Authenticated]
     public class GetProgram : IReturn<ProgramInfoDto>
     public class GetProgram : IReturn<ProgramInfoDto>
     {
     {
         [ApiMember(Name = "Id", Description = "Program Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
         [ApiMember(Name = "Id", Description = "Program Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
@@ -195,6 +207,7 @@ namespace MediaBrowser.Api.LiveTv
 
 
 
 
     [Route("/LiveTv/Recordings/{Id}", "DELETE", Summary = "Deletes a live tv recording")]
     [Route("/LiveTv/Recordings/{Id}", "DELETE", Summary = "Deletes a live tv recording")]
+    [Authenticated]
     public class DeleteRecording : IReturnVoid
     public class DeleteRecording : IReturnVoid
     {
     {
         [ApiMember(Name = "Id", Description = "Recording Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
         [ApiMember(Name = "Id", Description = "Recording Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
@@ -202,6 +215,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Timers/{Id}", "DELETE", Summary = "Cancels a live tv timer")]
     [Route("/LiveTv/Timers/{Id}", "DELETE", Summary = "Cancels a live tv timer")]
+    [Authenticated]
     public class CancelTimer : IReturnVoid
     public class CancelTimer : IReturnVoid
     {
     {
         [ApiMember(Name = "Id", Description = "Timer Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
         [ApiMember(Name = "Id", Description = "Timer Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
@@ -209,16 +223,19 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/Timers/{Id}", "POST", Summary = "Updates a live tv timer")]
     [Route("/LiveTv/Timers/{Id}", "POST", Summary = "Updates a live tv timer")]
+    [Authenticated]
     public class UpdateTimer : TimerInfoDto, IReturnVoid
     public class UpdateTimer : TimerInfoDto, IReturnVoid
     {
     {
     }
     }
 
 
     [Route("/LiveTv/Timers", "POST", Summary = "Creates a live tv timer")]
     [Route("/LiveTv/Timers", "POST", Summary = "Creates a live tv timer")]
+    [Authenticated]
     public class CreateTimer : TimerInfoDto, IReturnVoid
     public class CreateTimer : TimerInfoDto, IReturnVoid
     {
     {
     }
     }
 
 
     [Route("/LiveTv/SeriesTimers/{Id}", "GET", Summary = "Gets a live tv series timer")]
     [Route("/LiveTv/SeriesTimers/{Id}", "GET", Summary = "Gets a live tv series timer")]
+    [Authenticated]
     public class GetSeriesTimer : IReturn<TimerInfoDto>
     public class GetSeriesTimer : IReturn<TimerInfoDto>
     {
     {
         [ApiMember(Name = "Id", Description = "Timer Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
         [ApiMember(Name = "Id", Description = "Timer Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
@@ -226,6 +243,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/SeriesTimers", "GET", Summary = "Gets live tv series timers")]
     [Route("/LiveTv/SeriesTimers", "GET", Summary = "Gets live tv series timers")]
+    [Authenticated]
     public class GetSeriesTimers : IReturn<QueryResult<SeriesTimerInfoDto>>
     public class GetSeriesTimers : IReturn<QueryResult<SeriesTimerInfoDto>>
     {
     {
         [ApiMember(Name = "SortBy", Description = "Optional. Sort by SortName or Priority", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET,POST")]
         [ApiMember(Name = "SortBy", Description = "Optional. Sort by SortName or Priority", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET,POST")]
@@ -236,6 +254,7 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/SeriesTimers/{Id}", "DELETE", Summary = "Cancels a live tv series timer")]
     [Route("/LiveTv/SeriesTimers/{Id}", "DELETE", Summary = "Cancels a live tv series timer")]
+    [Authenticated]
     public class CancelSeriesTimer : IReturnVoid
     public class CancelSeriesTimer : IReturnVoid
     {
     {
         [ApiMember(Name = "Id", Description = "Timer Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
         [ApiMember(Name = "Id", Description = "Timer Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
@@ -243,16 +262,19 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/SeriesTimers/{Id}", "POST", Summary = "Updates a live tv series timer")]
     [Route("/LiveTv/SeriesTimers/{Id}", "POST", Summary = "Updates a live tv series timer")]
+    [Authenticated]
     public class UpdateSeriesTimer : SeriesTimerInfoDto, IReturnVoid
     public class UpdateSeriesTimer : SeriesTimerInfoDto, IReturnVoid
     {
     {
     }
     }
 
 
     [Route("/LiveTv/SeriesTimers", "POST", Summary = "Creates a live tv series timer")]
     [Route("/LiveTv/SeriesTimers", "POST", Summary = "Creates a live tv series timer")]
+    [Authenticated]
     public class CreateSeriesTimer : SeriesTimerInfoDto, IReturnVoid
     public class CreateSeriesTimer : SeriesTimerInfoDto, IReturnVoid
     {
     {
     }
     }
 
 
     [Route("/LiveTv/Recordings/Groups/{Id}", "GET", Summary = "Gets a recording group")]
     [Route("/LiveTv/Recordings/Groups/{Id}", "GET", Summary = "Gets a recording group")]
+    [Authenticated]
     public class GetRecordingGroup : IReturn<RecordingGroupDto>
     public class GetRecordingGroup : IReturn<RecordingGroupDto>
     {
     {
         [ApiMember(Name = "Id", Description = "Recording group Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
         [ApiMember(Name = "Id", Description = "Recording group Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
@@ -260,18 +282,19 @@ namespace MediaBrowser.Api.LiveTv
     }
     }
 
 
     [Route("/LiveTv/GuideInfo", "GET", Summary = "Gets guide info")]
     [Route("/LiveTv/GuideInfo", "GET", Summary = "Gets guide info")]
+    [Authenticated]
     public class GetGuideInfo : IReturn<GuideInfo>
     public class GetGuideInfo : IReturn<GuideInfo>
     {
     {
     }
     }
 
 
     [Route("/LiveTv/Folder", "GET", Summary = "Gets the users live tv folder, along with configured images")]
     [Route("/LiveTv/Folder", "GET", Summary = "Gets the users live tv folder, along with configured images")]
+    [Authenticated]
     public class GetLiveTvFolder : IReturn<BaseItemDto>
     public class GetLiveTvFolder : IReturn<BaseItemDto>
     {
     {
         [ApiMember(Name = "UserId", Description = "Optional attach user data.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         [ApiMember(Name = "UserId", Description = "Optional attach user data.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         public string UserId { get; set; }
         public string UserId { get; set; }
     }
     }
 
 
-    [Authenticated]
     public class LiveTvService : BaseApiService
     public class LiveTvService : BaseApiService
     {
     {
         private readonly ILiveTvManager _liveTvManager;
         private readonly ILiveTvManager _liveTvManager;

+ 2 - 1
MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs

@@ -65,7 +65,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
 
 
             if (!allowLocal || !req.IsLocal)
             if (!allowLocal || !req.IsLocal)
             {
             {
-                if (!_config.Configuration.InsecureApps2.Contains(auth.Client ?? string.Empty, StringComparer.OrdinalIgnoreCase))
+                if (!string.IsNullOrWhiteSpace(auth.Token) ||
+                    !_config.Configuration.InsecureApps2.Contains(auth.Client ?? string.Empty, StringComparer.OrdinalIgnoreCase))
                 {
                 {
                     SessionManager.ValidateSecurityToken(auth.Token);
                     SessionManager.ValidateSecurityToken(auth.Token);
                 }
                 }