Changeset 28 in code for trunk/morty.go

Timestamp:

Nov 22, 2016, 9:10:52 AM (9 years ago)

Author:

asciimoo

Message:

Merge pull request #25 from dalf/cssurl

Fix #13 : some URL in CSS are not proxifed

File:

• trunk/morty.go (modified) (4 diffs)

trunk/morty.go

@@ -12 +12 @@
         "log"
         "net/url"
-        "path"
         "regexp"
         "strings"
@@ -383 +382 @@
                                                 if bytes.Equal(attr[0], []byte("action")) {
                                                         formURL, _ = url.Parse(string(attr[1]))
-                                                        mergeURIs(rc.BaseURL, formURL)
+                                                        formURL = mergeURIs(rc.BaseURL, formURL)
                                                         break
                                                 }
@@ -527 +526 @@
 }
 
-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:") {
@@ -553 +548 @@
                 return "", err
         }
-        mergeURIs(rc.BaseURL, u)
+        u = mergeURIs(rc.BaseURL, u)
 
         uri = u.String()