yakumo.izuru/yukari
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25 from dalf/cssurl

Browse Source 
Fix #13 : some URL in CSS are not proxifed

git-svn-id: file:///srv/svn/repo/yukari/trunk@28 f3bd38d9-da89-464d-a02a-eb04e43141b5
This commit is contained in:
asciimoo 2016-11-22 09:10:52 +00:00
parent afebd341aa
commit 4422698257
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
morty.go
View File

@ -11,7 +11,6 @@ import (
"io"
"log"
"net/url"
"path"
"regexp"
"strings"
"time"
@ -382,7 +381,7 @@ func sanitizeHTML(rc *RequestConfig, out io.Writer, htmlDoc []byte) {
for _, attr := range attrs {
if bytes.Equal(attr[0], []byte("action")) {
formURL, _ = url.Parse(string(attr[1]))
mergeURIs(rc.BaseURL, formURL)
formURL = mergeURIs(rc.BaseURL, formURL)
break
}
}
@ -526,19 +525,15 @@ func sanitizeAttr(rc *RequestConfig, out io.Writer, attrName, attrValue, escaped
}
}
func mergeURIs(u1, u2 *url.URL) {
if u2.Scheme == "" || u2.Scheme == "//" {
u2.Scheme = u1.Scheme
}
if u2.Host == "" && u1.Path != "" {
u2.Host = u1.Host
if len(u2.Path) == 0 || u2.Path[0] != '/' {
u2.Path = path.Join(u1.Path[:strings.LastIndexByte(u1.Path, byte('/'))], u2.Path)
}
}
func mergeURIs(u1, u2 *url.URL) (*url.URL) {
return u1.ResolveReference(u2)
}
func (rc *RequestConfig) ProxifyURI(uri string) (string, error) {
// remove javascript protocol
if strings.HasPrefix(uri, "javascript:") {
return "", nil
}
// TODO check malicious data: - e.g. data:script
if strings.HasPrefix(uri, "data:") {
return uri, nil
@ -552,7 +547,7 @@ func (rc *RequestConfig) ProxifyURI(uri string) (string, error) {
if err != nil {
return "", err
}
mergeURIs(rc.BaseURL, u)
u = mergeURIs(rc.BaseURL, u)
uri = u.String()