From 7dacc999f8c0bb2554ddae7a256928b4c499403b Mon Sep 17 00:00:00 2001 From: Ryan Martinsen Date: Thu, 18 Dec 2014 14:59:39 -0500 Subject: [PATCH] Add ability to canonify URLs in rendered XML output. --- hugolib/site.go | 12 +++++++++++- transform/absurl.go | 25 +++++++++++++++++++++++++ transform/chain_test.go | 14 ++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/hugolib/site.go b/hugolib/site.go index 6ff64b48e..172ac8d30 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -1195,7 +1195,17 @@ func (s *Site) layoutExists(layouts ...string) bool { func (s *Site) renderXML(name string, d interface{}, layouts ...string) (io.Reader, error) { renderBuffer := s.NewXMLBuffer() err := s.render(name, d, renderBuffer, layouts...) - return renderBuffer, err + + var outBuffer = new(bytes.Buffer) + + absURLInXML, err := transform.AbsURLInXML(viper.GetString("BaseUrl")) + if err != nil { + return nil, err + } + + transformer := transform.NewChain(absURLInXML...) + transformer.Apply(outBuffer, renderBuffer) + return outBuffer, err } func (s *Site) renderPage(name string, d interface{}, layouts ...string) (io.Reader, error) { diff --git a/transform/absurl.go b/transform/absurl.go index 6fb1cb4a1..0a0cd7239 100644 --- a/transform/absurl.go +++ b/transform/absurl.go @@ -31,6 +31,31 @@ func AbsURL(absURL string) (trs []link, err error) { return } +func AbsURLInXML(absURL string) (trs []link, err error) { + var baseURL *url.URL + + if baseURL, err = url.Parse(absURL); err != nil { + return + } + + base := strings.TrimRight(baseURL.String(), "/") + + var ( + srcedq = []byte(" src="" + base + "/") + hrefedq = []byte(" href="" + base + "/") + srcesq = []byte(" src='" + base + "/") + hrefesq = []byte(" href='" + base + "/") + ) + trs = append(trs, func(content []byte) []byte { + content = guardReplace(content, []byte(" src="//"), []byte(" src="/"), srcedq) + content = guardReplace(content, []byte(" src='//"), []byte(" src='/"), srcesq) + content = guardReplace(content, []byte(" href="//"), []byte(" href="/"), hrefedq) + content = guardReplace(content, []byte(" href='//"), []byte(" href='/"), hrefesq) + return content + }) + return +} + func guardReplace(content, guard, match, replace []byte) []byte { if !bytes.Contains(content, guard) { content = bytes.Replace(content, match, replace, -1) diff --git a/transform/chain_test.go b/transform/chain_test.go index 94135f6d7..936a6a1ad 100644 --- a/transform/chain_test.go +++ b/transform/chain_test.go @@ -9,10 +9,18 @@ const H5_JS_CONTENT_ABS_URL_WITH_NAV = "
content foobar. Follow up
" +const H5_XML_CONTENT_ABS_URL = "<p><a href="/foobar">foobar</a></p> <p>A video: <iframe src='/foo'></iframe></p>" + +const CORRECT_OUTPUT_SRC_HREF_IN_XML = "<p><a href="http://xml/foobar">foobar</a></p> <p>A video: <iframe src='http://xml/foo'></iframe></p>" + var two_chain_tests = []test{ {H5_JS_CONTENT_ABS_URL_WITH_NAV, CORRECT_OUTPUT_SRC_HREF_WITH_NAV}, } +var xml_abs_url_tests = []test{ + {H5_XML_CONTENT_ABS_URL, CORRECT_OUTPUT_SRC_HREF_IN_XML}, +} + func TestChainZeroTransformers(t *testing.T) { tr := NewChain() in := new(bytes.Buffer) @@ -31,3 +39,9 @@ func BenchmarkChain(b *testing.B) { apply(b.Errorf, tr, two_chain_tests) } } + +func TestXMLAbsUrl(t *testing.T) { + absURLInXML, _ := AbsURLInXML("http://xml") + tr := NewChain(absURLInXML...) + apply(t.Errorf, tr, xml_abs_url_tests) +}