mirror of
https://github.com/Radarr/Radarr.git
synced 2024-11-04 10:02:40 +01:00
Fixed: Handling xml responses containing invalid html entities.
fixes #1123
This commit is contained in:
Taloth Saldono
parent
4e84d1a17c
commit
f96f997506
@ -0,0 +1,93 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<rss version="2.0" xmlns:torrent="http://xmlns.ezrss.it/0.1/">
|
||||
<channel>
|
||||
<title>tv torrents RSS feed - KickassTorrents</title>
|
||||
<link>http://kickass.to/</link>
|
||||
<description>tv torrents RSS feed</description>
|
||||
<item>
|
||||
<title>Doctor Strangér.E03.140512.HDTV.H264.720p-iPOP.avi [CTRG]</title>
|
||||
<category>TV</category>
|
||||
<author>http://kickass.to/user/2NE1/</author>
|
||||
<link>http://kickass.to/doctor-stranger-e03-140512-hdtv-h264-720p-ipop-avi-ctrg-t9100648.html</link>
|
||||
<guid>http://kickass.to/doctor-stranger-e03-140512-hdtv-h264-720p-ipop-avi-ctrg-t9100648.html</guid>
|
||||
<pubDate>Mon, 12 May 2014 16:16:49 +0000</pubDate>
|
||||
<torrent:contentLength>1205364736</torrent:contentLength>
|
||||
<torrent:infoHash>208C4F7866612CC88BFEBC7C496FA72C2368D1C0</torrent:infoHash>
|
||||
<torrent:magnetURI><![CDATA[magnet:?xt=urn:btih:208C4F7866612CC88BFEBC7C496FA72C2368D1C0&dn=doctor+stranger+e03+140512+hdtv+h264+720p+ipop+avi+ctrg&tr=udp%3A%2F%2Fopen.demonii.com%3A1337%2Fannounce]]></torrent:magnetURI>
|
||||
<torrent:seeds>206</torrent:seeds>
|
||||
<torrent:peers>311</torrent:peers>
|
||||
<torrent:verified>1</torrent:verified>
|
||||
<torrent:fileName>doctor.stranger.e03.140512.hdtv.h264.720p.ipop.avi.ctrg.torrent</torrent:fileName>
|
||||
<enclosure url="http://torcache.net/torrent/208C4F7866612CC88BFEBC7C496FA72C2368D1C0.torrent?title=%5Bkickass.to%5Ddoctor.stranger.e03.140512.hdtv.h264.720p.ipop.avi.ctrg" length="1205364736" type="application/x-bittorrent" />
|
||||
</item>
|
||||
<item>
|
||||
<title>Triangle.E03.140512.HDTV.XViD-iPOP.avi [CTRG]</title>
|
||||
<category>TV</category>
|
||||
<author>http://kickass.to/user/2NE1/</author>
|
||||
<link>http://kickass.to/triangle-e03-140512-hdtv-xvid-ipop-avi-ctrg-t9100647.html</link>
|
||||
<guid>http://kickass.to/triangle-e03-140512-hdtv-xvid-ipop-avi-ctrg-t9100647.html</guid>
|
||||
<pubDate>Mon, 12 May 2014 16:16:31 +0000</pubDate>
|
||||
<torrent:contentLength>677543936</torrent:contentLength>
|
||||
<torrent:infoHash>BF22A53C9889A7D325F2A3D904E566B7DF4074EB</torrent:infoHash>
|
||||
<torrent:magnetURI><![CDATA[magnet:?xt=urn:btih:BF22A53C9889A7D325F2A3D904E566B7DF4074EB&dn=triangle+e03+140512+hdtv+xvid+ipop+avi+ctrg&tr=udp%3A%2F%2Fopen.demonii.com%3A1337%2Fannounce]]></torrent:magnetURI>
|
||||
<torrent:seeds>242</torrent:seeds>
|
||||
<torrent:peers>374</torrent:peers>
|
||||
<torrent:verified>1</torrent:verified>
|
||||
<torrent:fileName>triangle.e03.140512.hdtv.xvid.ipop.avi.ctrg.torrent</torrent:fileName>
|
||||
<enclosure url="http://torcache.net/torrent/BF22A53C9889A7D325F2A3D904E566B7DF4074EB.torrent?title=%5Bkickass.to%5Dtriangle.e03.140512.hdtv.xvid.ipop.avi.ctrg" length="677543936" type="application/x-bittorrent" />
|
||||
</item>
|
||||
<item>
|
||||
<title>Triangle.E03.140512.HDTV.H264.720p-iPOP.avi [CTRG]</title>
|
||||
<category>TV</category>
|
||||
<author>http://kickass.to/user/2NE1/</author>
|
||||
<link>http://kickass.to/triangle-e03-140512-hdtv-h264-720p-ipop-avi-ctrg-t9100646.html</link>
|
||||
<guid>http://kickass.to/triangle-e03-140512-hdtv-h264-720p-ipop-avi-ctrg-t9100646.html</guid>
|
||||
<pubDate>Mon, 12 May 2014 16:16:10 +0000</pubDate>
|
||||
<torrent:contentLength>1196869632</torrent:contentLength>
|
||||
<torrent:infoHash>8427BFB8884B8228364EBB9B3EA7D8B77E03A7BC</torrent:infoHash>
|
||||
<torrent:magnetURI><![CDATA[magnet:?xt=urn:btih:8427BFB8884B8228364EBB9B3EA7D8B77E03A7BC&dn=triangle+e03+140512+hdtv+h264+720p+ipop+avi+ctrg&tr=udp%3A%2F%2Fopen.demonii.com%3A1337%2Fannounce]]></torrent:magnetURI>
|
||||
<torrent:seeds>177</torrent:seeds>
|
||||
<torrent:peers>268</torrent:peers>
|
||||
<torrent:verified>1</torrent:verified>
|
||||
<torrent:fileName>triangle.e03.140512.hdtv.h264.720p.ipop.avi.ctrg.torrent</torrent:fileName>
|
||||
<enclosure url="http://torcache.net/torrent/8427BFB8884B8228364EBB9B3EA7D8B77E03A7BC.torrent?title=%5Bkickass.to%5Dtriangle.e03.140512.hdtv.h264.720p.ipop.avi.ctrg" length="1196869632" type="application/x-bittorrent" />
|
||||
</item>
|
||||
<item>
|
||||
<title>Triangle.E03.140512.HDTV.X264.720p-BarosG_.avi [CTRG]</title>
|
||||
<category>TV</category>
|
||||
<author>http://kickass.to/user/2NE1/</author>
|
||||
<link>http://kickass.to/triangle-e03-140512-hdtv-x264-720p-barosg-avi-ctrg-t9100644.html</link>
|
||||
<guid>http://kickass.to/triangle-e03-140512-hdtv-x264-720p-barosg-avi-ctrg-t9100644.html</guid>
|
||||
<pubDate>Mon, 12 May 2014 16:15:52 +0000</pubDate>
|
||||
<torrent:contentLength>1418906266</torrent:contentLength>
|
||||
<torrent:infoHash>5556B773893DB55287ECEC581E850B853163DB11</torrent:infoHash>
|
||||
<torrent:magnetURI><![CDATA[magnet:?xt=urn:btih:5556B773893DB55287ECEC581E850B853163DB11&dn=triangle+e03+140512+hdtv+x264+720p+barosg+avi+ctrg&tr=udp%3A%2F%2Fopen.demonii.com%3A1337%2Fannounce]]></torrent:magnetURI>
|
||||
<torrent:seeds>522</torrent:seeds>
|
||||
<torrent:peers>785</torrent:peers>
|
||||
<torrent:verified>1</torrent:verified>
|
||||
<torrent:fileName>triangle.e03.140512.hdtv.x264.720p.barosg.avi.ctrg.torrent</torrent:fileName>
|
||||
<enclosure url="http://torcache.net/torrent/5556B773893DB55287ECEC581E850B853163DB11.torrent?title=%5Bkickass.to%5Dtriangle.e03.140512.hdtv.x264.720p.barosg.avi.ctrg" length="1418906266" type="application/x-bittorrent" />
|
||||
</item>
|
||||
<item>
|
||||
<title>Battlestar Galactica 1978 Dvd3 e09 e10 e11 e12 [NL] [FR] [ENG] Sub</title>
|
||||
<description>
|
||||
<![CDATA[In een afgelegen zonnestelsel leeft een mensenras op twaalf koloniewerelden. Ze zijn al eeuwen in oorlog met de Cylons, gevechtsrobots die ooit werden gemaakt door een allang verdwenen buitenaards reptielachtig ras. Met de hulp van de menselijke verrader Baltar zijn de Cylons erin geslaagd de mensheid vrijwel uit te roeien. Slechts een oorlogsschip kan aan de vernietiging ontkomen: de Battlestar Galactica van commandant Adama.
|
||||
|
||||
Met een vloot burgerschepen vol vluchtelingen vlucht de Galactica voor de Cylons. Adama besluit op zoek te gaan naar de legendarische 13e en laatste kolonie, genaamd Aarde. Tijdens de lange en gevaarlijke reis worden ze voortdurend bedreigd door de achtervolgende Cylons en andere gevaren.]]>
|
||||
</description>
|
||||
<category>TV</category>
|
||||
<author>http://kickass.to/user/hendriknl/</author>
|
||||
<link>http://kickass.to/battlestar-galactica-1978-dvd3-e09-e10-e11-e12-nl-fr-eng-sub-t9100642.html</link>
|
||||
<guid>http://kickass.to/battlestar-galactica-1978-dvd3-e09-e10-e11-e12-nl-fr-eng-sub-t9100642.html</guid>
|
||||
<pubDate>Mon, 12 May 2014 16:15:46 +0000</pubDate>
|
||||
<torrent:contentLength>4680841216</torrent:contentLength>
|
||||
<torrent:infoHash>3D293CAFEDAC595F6E55F9C284DD76862FE254F6</torrent:infoHash>
|
||||
<torrent:magnetURI><![CDATA[magnet:?xt=urn:btih:3D293CAFEDAC595F6E55F9C284DD76862FE254F6&dn=battlestar+galactica+1978+dvd3+e09+e10+e11+e12+nl+fr+eng+sub&tr=udp%3A%2F%2Fopen.demonii.com%3A1337%2Fannounce]]></torrent:magnetURI>
|
||||
<torrent:seeds>2</torrent:seeds>
|
||||
<torrent:peers>5</torrent:peers>
|
||||
<torrent:verified>0</torrent:verified>
|
||||
<torrent:fileName>battlestar.galactica.1978.dvd3.e09.e10.e11.e12.nl.fr.eng.sub.torrent</torrent:fileName>
|
||||
<enclosure url="http://torcache.net/torrent/3D293CAFEDAC595F6E55F9C284DD76862FE254F6.torrent?title=%5Bkickass.to%5Dbattlestar.galactica.1978.dvd3.e09.e10.e11.e12.nl.fr.eng.sub" length="4680841216" type="application/x-bittorrent" />
|
||||
</item>
|
||||
</channel>
|
||||
</rss>
|
||||
@ -154,5 +154,20 @@ public void should_not_set_seeders_to_null_if_older_than_12_hours()
|
||||
torrentInfo.Peers.Should().Be(0);
|
||||
torrentInfo.Seeders.Should().Be(0);
|
||||
}
|
||||
|
||||
|
||||
[Test]
|
||||
public void should_handle_xml_with_html_accents()
|
||||
{
|
||||
var recentFeed = ReadAllText(@"Files/Indexers/KickassTorrents/KickassTorrents_accents.xml");
|
||||
|
||||
Mocker.GetMock<IHttpClient>()
|
||||
.Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
|
||||
.Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
|
||||
|
||||
var releases = Subject.FetchRecent();
|
||||
|
||||
releases.Should().HaveCount(5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -403,6 +403,9 @@
|
||||
<Content Include="Files\emptyfile.txt">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Files\Indexers\KickassTorrents\KickassTorrents_accents.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Files\Indexers\relative_urls.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Xml;
|
||||
using System.Xml.Linq;
|
||||
@ -16,6 +17,8 @@ namespace NzbDrone.Core.Indexers
|
||||
{
|
||||
public class RssParser : IParseIndexerResponse
|
||||
{
|
||||
private static readonly Regex ReplaceEntities = new Regex("&[a-z]+;", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||
|
||||
protected readonly Logger _logger;
|
||||
|
||||
// Use the 'guid' element content as InfoUrl.
|
||||
@ -71,7 +74,10 @@ protected virtual XDocument LoadXmlDocument(IndexerResponse indexerResponse)
|
||||
{
|
||||
try
|
||||
{
|
||||
using (var xmlTextReader = XmlReader.Create(new StringReader(indexerResponse.Content), new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore, IgnoreComments = true }))
|
||||
var content = indexerResponse.Content;
|
||||
content = ReplaceEntities.Replace(content, ReplaceEntity);
|
||||
|
||||
using (var xmlTextReader = XmlReader.Create(new StringReader(content), new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore, IgnoreComments = true }))
|
||||
{
|
||||
return XDocument.Load(xmlTextReader);
|
||||
}
|
||||
@ -88,6 +94,19 @@ protected virtual XDocument LoadXmlDocument(IndexerResponse indexerResponse)
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual string ReplaceEntity(Match match)
|
||||
{
|
||||
try
|
||||
{
|
||||
var character = WebUtility.HtmlDecode(match.Value);
|
||||
return string.Concat("&#", (int)character[0], ";");
|
||||
}
|
||||
catch
|
||||
{
|
||||
return match.Value;
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual ReleaseInfo CreateNewReleaseInfo()
|
||||
{
|
||||
return new ReleaseInfo();
|
||||
@ -95,7 +114,7 @@ protected virtual ReleaseInfo CreateNewReleaseInfo()
|
||||
|
||||
protected virtual bool PreProcess(IndexerResponse indexerResponse)
|
||||
{
|
||||
if (indexerResponse.HttpResponse.StatusCode != System.Net.HttpStatusCode.OK)
|
||||
if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
|
||||
{
|
||||
throw new IndexerException(indexerResponse, "Indexer API call resulted in an unexpected StatusCode [{0}]", indexerResponse.HttpResponse.StatusCode);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user