mirror/Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett synced 2025-02-24 23:22:46 +00:00
Code Issues Releases Wiki Activity

attempt to fix blackhole dirs with reverse proxies

Browse source
This commit is contained in:
kaso17 2017-07-14 08:18:36 +02:00
parent 82f330f4af
commit 6e2087d5dc
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Jackett/Controllers/AdminController.cs
View file

@ -475,9 +475,10 @@ namespace Jackett.Controllers
foreach (var result in results) foreach (var result in results)
{ {
var link = result.Link; var link = result.Link;
result.Link = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "dl", result.Title + ".torrent"); var file = StringUtil.MakeValidFileName(result.Title, '_', false) + ".torrent";
result.Link = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "dl", file);
if (result.Link != null && result.Link.Scheme != "magnet" && !string.IsNullOrWhiteSpace(Engine.Server.Config.BlackholeDir)) if (result.Link != null && result.Link.Scheme != "magnet" && !string.IsNullOrWhiteSpace(Engine.Server.Config.BlackholeDir))
result.BlackholeLink = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "bh", string.Empty); result.BlackholeLink = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "bh", file);
} }
} }

10
src/Jackett/Controllers/BlackholeController.cs
View file

@ -1,4 +1,5 @@
using Jackett.Services; using Jackett.Services;
using Jackett.Utils;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NLog; using NLog;
using System; using System;
@ -31,7 +32,7 @@ namespace Jackett.Controllers
} }
[HttpGet] [HttpGet]
public async Task<IHttpActionResult> Blackhole(string indexerID, string path, string apikey) public async Task<IHttpActionResult> Blackhole(string indexerID, string path, string apikey, string file)
{ {
var jsonReply = new JObject(); var jsonReply = new JObject();
@ -60,7 +61,12 @@ namespace Jackett.Controllers
throw new Exception("Blackhole directory does not exist: " + Engine.Server.Config.BlackholeDir); throw new Exception("Blackhole directory does not exist: " + Engine.Server.Config.BlackholeDir);
} }
var fileName = DateTime.Now.Ticks + ".torrent"; var fileName = DateTime.Now.Ticks.ToString() + "-" + StringUtil.MakeValidFileName(indexer.DisplayName, '_', false);
if (string.IsNullOrWhiteSpace(file))
fileName += ".torrent";
else
fileName += "-"+StringUtil.MakeValidFileName(file, '_', false); // call MakeValidFileName() again to avoid any possibility of path traversal attacks
File.WriteAllBytes(Path.Combine(Engine.Server.Config.BlackholeDir, fileName), downloadBytes); File.WriteAllBytes(Path.Combine(Engine.Server.Config.BlackholeDir, fileName), downloadBytes);
jsonReply["result"] = "success"; jsonReply["result"] = "success";
} }

10
src/Jackett/Controllers/DownloadController.cs
View file

@ -11,6 +11,7 @@ using System.Threading.Tasks;
using System.Web; using System.Web;
using System.Web.Http; using System.Web.Http;
using MonoTorrent.BEncoding; using MonoTorrent.BEncoding;
using Jackett.Utils;
namespace Jackett.Controllers namespace Jackett.Controllers
{ {
@ -54,19 +55,12 @@ namespace Jackett.Controllers
var torrentDictionary = BEncodedDictionary.DecodeTorrent(downloadBytes); var torrentDictionary = BEncodedDictionary.DecodeTorrent(downloadBytes);
downloadBytes = torrentDictionary.Encode(); downloadBytes = torrentDictionary.Encode();
char[] invalidChars = System.IO.Path.GetInvalidFileNameChars();
for (int i = 0; i < file.Count(); i++)
if (invalidChars.Contains(file[i]))
{
file = file.Remove(i, 1).Insert(i, " ");
}
var result = new HttpResponseMessage(HttpStatusCode.OK); var result = new HttpResponseMessage(HttpStatusCode.OK);
result.Content = new ByteArrayContent(downloadBytes); result.Content = new ByteArrayContent(downloadBytes);
result.Content.Headers.ContentType = new MediaTypeHeaderValue("application/x-bittorrent"); result.Content.Headers.ContentType = new MediaTypeHeaderValue("application/x-bittorrent");
result.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment") result.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment")
{ {
FileName = file FileName = StringUtil.MakeValidFileName(file, '_', false) // call MakeValidFileName again to avoid any kind of injection attack
}; };
return result; return result;
} }