diff options
| author |  Frédéric Guillot <fred@miniflux.net> | 2019-09-18 22:27:25 -0700 |
|---|---|---|
| committer | Frédéric Guillot <fred@miniflux.net> | 2019-09-18 22:45:56 -0700 |
| commit | 36d773223481dd42d31499b3ea73e6999ff9f58e (patch) | |
| tree | a122e207303b2fa33b334dbe19e57a508a955a25 /reader/opml | |
| parent | ca48f7612ada5d64d1097c40321a919eb28eb2bf (diff) | |
Disable strict XML parsing
This change should improve parsing of broken XML feeds.
See https://golang.org/pkg/encoding/xml/#Decoder
Diffstat (limited to 'reader/opml')
| -rw-r--r-- | reader/opml/parser.go | 1 | ||||
| -rw-r--r-- | reader/opml/parser_test.go | 34 |
2 files changed, 35 insertions, 0 deletions
diff --git a/reader/opml/parser.go b/reader/opml/parser.go index 1bdec20..97974bb 100644 --- a/reader/opml/parser.go +++ b/reader/opml/parser.go @@ -17,6 +17,7 @@ func Parse(data io.Reader) (SubcriptionList, *errors.LocalizedError) { feeds := new(opml) decoder := xml.NewDecoder(data) decoder.Entity = xml.HTMLEntity + decoder.Strict = false decoder.CharsetReader = encoding.CharsetReader err := decoder.Decode(feeds) diff --git a/reader/opml/parser_test.go b/reader/opml/parser_test.go index f6ce634..6c09db8 100644 --- a/reader/opml/parser_test.go +++ b/reader/opml/parser_test.go @@ -193,6 +193,40 @@ func TestParseOpmlVersion1WithoutOuterOutline(t *testing.T) { } } } + +func TestParseOpmlWithInvalidCharacterEntity(t *testing.T) { + data := `<?xml version="1.0"?> + <opml version="1.0"> + <head> + <title>mySubscriptions.opml</title> + </head> + <body> + <outline title="Feed 1"> + <outline type="rss" title="Feed 1" xmlUrl="http://example.org/feed1/a&b" htmlUrl="http://example.org/c&d"></outline> + </outline> + </body> + </opml> + ` + + var expected SubcriptionList + expected = append(expected, &Subcription{Title: "Feed 1", FeedURL: "http://example.org/feed1/a&b", SiteURL: "http://example.org/c&d", CategoryName: ""}) + + subscriptions, err := Parse(bytes.NewBufferString(data)) + if err != nil { + t.Error(err) + } + + if len(subscriptions) != 1 { + t.Errorf("Wrong number of subscriptions: %d instead of %d", len(subscriptions), 1) + } + + for i := 0; i < len(subscriptions); i++ { + if !subscriptions[i].Equals(expected[i]) { + t.Errorf(`Subscription are different: "%v" vs "%v"`, subscriptions[i], expected[i]) + } + } +} + func TestParseInvalidXML(t *testing.T) { data := `garbage` _, err := Parse(bytes.NewBufferString(data)) |