open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated plugin security

Browse Source
pull/702/head
LukePulverenti 11 years ago
parent a11e00b8d5
commit 9cdda84b06
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File

2
MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
Unescape View File

@ -69,7 +69,7 @@ namespace MediaBrowser.Common.Implementations.Security
_kernel = kernel;
_httpClient = httpClient;
_jsonSerializer = jsonSerializer;
//MBRegistration.Init(appPaths);
MBRegistration.Init(appPaths);
}
/// <summary>

11
MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
Unescape View File

@ -6,6 +6,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Model.Logging;
@ -16,8 +17,10 @@ namespace MediaBrowser.Controller.Providers.Music
{
public class LastfmArtistProvider : LastfmBaseArtistProvider
{
public LastfmArtistProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager)
: base(jsonSerializer, httpClient, logManager)
internal readonly SemaphoreSlim LastfmResourcePool = new SemaphoreSlim(5, 5);
public LastfmArtistProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager, IServerConfigurationManager configurationManager)
: base(jsonSerializer, httpClient, logManager, configurationManager)
{
}
@ -30,7 +33,7 @@ namespace MediaBrowser.Controller.Providers.Music
try
{
using (var json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
using (var json = await HttpClient.Get(url, LastfmResourcePool, cancellationToken).ConfigureAwait(false))
{
searchResult = JsonSerializer.DeserializeFromStream<LastfmArtistSearchResults>(json);
}
@ -61,7 +64,7 @@ namespace MediaBrowser.Controller.Providers.Music
try
{
using (var json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.Lastfm, cancellationToken).ConfigureAwait(false))
using (var json = await HttpClient.Get(url, LastfmResourcePool, cancellationToken).ConfigureAwait(false))
{
result = JsonSerializer.DeserializeFromStream<LastfmGetArtistResult>(json);
}

5
MediaBrowser.Controller/Providers/Music/LastfmBaseArtistProvider.cs
Unescape View File

@ -5,6 +5,7 @@ using System.Net;
using System.Text;
using System.Threading.Tasks;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
@ -14,8 +15,8 @@ namespace MediaBrowser.Controller.Providers.Music
{
public abstract class LastfmBaseArtistProvider : LastfmBaseProvider
{
protected LastfmBaseArtistProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager)
: base(jsonSerializer, httpClient, logManager)
protected LastfmBaseArtistProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager, IServerConfigurationManager configurationManager)
: base(jsonSerializer, httpClient, logManager, configurationManager)
{
LocalMetaFileName = "MBArtist.json";
}

4
Nuget/MediaBrowser.Common.Internal.nuspec
Unescape View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Common.Internal</id>
<version>3.0.26</version>
<version>3.0.28</version>
<title>MediaBrowser.Common.Internal</title>
<authors>Luke</authors>
<owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption.</description>
<copyright>Copyright © Media Browser 2013</copyright>
<dependencies>
<dependency id="MediaBrowser.Common" version="3.0.26" />
<dependency id="MediaBrowser.Common" version="3.0.28" />
<dependency id="NLog" version="2.0.0.2000" />
<dependency id="ServiceStack" version="3.9.37" />
<dependency id="ServiceStack.Api.Swagger" version="3.9.35" />

2
Nuget/MediaBrowser.Common.nuspec
Unescape View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Common</id>
<version>3.0.26</version>
<version>3.0.28</version>
<title>MediaBrowser.Common</title>
<authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners>

4
Nuget/MediaBrowser.Server.Core.nuspec
Unescape View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Server.Core</id>
<version>3.0.26</version>
<version>3.0.28</version>
<title>Media Browser.Server.Core</title>
<authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains core components required to build plugins for Media Browser Server.</description>
<copyright>Copyright © Media Browser 2013</copyright>
<dependencies>
<dependency id="MediaBrowser.Common" version="3.0.26" />
<dependency id="MediaBrowser.Common" version="3.0.28" />
</dependencies>
</metadata>
<files>

Write Preview
Loading…
Cancel
Save