Changeset 51 in code for trunk/morty.go

Timestamp:

Nov 29, 2016, 10:35:59 AM (9 years ago)

Author:

alex

Message:

[fix] URI fragment are not encoded in the mortyurl but are encoded as usual fragment so the browser can use them.

File:

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

trunk/morty.go

@@ -285 +285 @@
         }
 
-        if bytes.Contains(contentType, []byte("xhtml")) {
-                ctx.SetContentType("text/html; charset=UTF-8")
-        } else {
-                ctx.SetContentType(fmt.Sprintf("%s; charset=UTF-8", contentInfo[0]))
-        }
+        ctx.SetContentType(fmt.Sprintf("%s; charset=UTF-8", contentInfo[0]))
 
         switch {
@@ -629 +625 @@
                 return "", nil
         }
+
         // TODO check malicious data: - e.g. data:script
         if strings.HasPrefix(uri, "data:") {
@@ -634 +631 @@
         }
 
-        if len(uri) > 0 && uri[0] == '#' {
-                return uri, nil
-        }
-
+        // parse the uri
         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 &&
+                ((u.User == nil && rc.BaseURL.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", url.QueryEscape(uri)), nil
-        }
-
-        return fmt.Sprintf("./?mortyhash=%s&mortyurl=%s", hash(uri, rc.Key), url.QueryEscape(uri)), 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
 }