Changeset 56 in code

Timestamp:

Nov 29, 2016, 1:52:16 PM (9 years ago)

Author:

alex

Message:

[fix] ignore all comments (quick fix about the privacy issue with IE conditional comments)

File:

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

trunk/morty.go

@@ -500 +500 @@
                                 }
 
-                        case html.DoctypeToken, html.CommentToken:
+                        case html.CommentToken:
+                                // ignore comment. TODO : parse IE conditional comment
+
+                        case html.DoctypeToken:
                                 out.Write(decoder.Raw())
                         }
@@ -629 +632 @@
                 return "", nil
         }
-
         // TODO check malicious data: - e.g. data:script
         if strings.HasPrefix(uri, "data:") {
@@ -635 +637 @@
         }
 
-        // parse the uri
+        if len(uri) > 0 && uri[0] == '#' {
+                return uri, nil
+        }
+
         u, err := url.Parse(uri)
         if err != nil {
                 return "", err
         }
-
-        // get the fragment (with the prefix "#")
-        fragment := ""
-        if len(u.Fragment) > 0 {
-                fragment = "#" + u.Fragment
-        }
-
-        // reset the fragment: it is not included in the mortyurl
-        u.Fragment = ""
-
-        // merge the URI with the document URI
         u = mergeURIs(rc.BaseURL, u)
 
-        // simple internal link ?
-        // some web pages describe the whole link https://same:auth@same.host/same.path?same.query#new.fragment
-        if u.Scheme == rc.BaseURL.Scheme &&
-                (rc.BaseURL.User == nil || (u.User != nil && u.User.String() == rc.BaseURL.User.String())) &&
-                u.Host == rc.BaseURL.Host &&
-                u.Path == rc.BaseURL.Path &&
-                u.RawQuery == rc.BaseURL.RawQuery {
-                // the fragment is the only difference between the document URI and the uri parameter
-                return fragment, nil
-        }
-
-        // return full URI and fragment (if not empty)
         uri = u.String()
 
         if rc.Key == nil {
-                return fmt.Sprintf("./?mortyurl=%s%s", url.QueryEscape(uri), fragment), nil
-        }
-        return fmt.Sprintf("./?mortyhash=%s&mortyurl=%s%s", hash(uri, rc.Key), url.QueryEscape(uri), fragment), nil
+                return fmt.Sprintf("./?mortyurl=%s", url.QueryEscape(uri)), nil
+        }
+
+        return fmt.Sprintf("./?mortyhash=%s&mortyurl=%s", hash(uri, rc.Key), url.QueryEscape(uri)), nil
 }