Changeset 13 in code for trunk

Timestamp:

Oct 27, 2016, 2:16:10 PM (9 years ago)

Author:

asciimoo

Message:

[fix] exclude dns-prefetch and preloaded scripts - fixes #4

File:

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

trunk/morty.go

@@ -47 +47 @@
         []byte("align"),
         []byte("alt"),
+        []byte("as"),
         []byte("autocomplete"),
         []byte("charset"),
@@ -329 +330 @@
                                 }
                                 var attrs [][][]byte
-                                fmt.Fprintf(out, "<%s", tag)
                                 if hasAttrs {
                                         for {
@@ -338 +338 @@
                                                 }
                                         }
+                                }
+                                if bytes.Equal(tag, []byte("link")) {
+                                        sanitizeLinkTag(rc, out, attrs)
+                                        break
+                                }
+
+                                fmt.Fprintf(out, "<%s", tag)
+
+                                if hasAttrs {
                                         if bytes.Equal(tag, []byte("meta")) {
                                                 sanitizeMetaAttrs(rc, out, attrs)
@@ -344 +353 @@
                                         }
                                 }
+
                                 if token == html.SelfClosingTagToken {
                                         fmt.Fprintf(out, " />")
@@ -352 +362 @@
                                         }
                                 }
+
                                 if bytes.Equal(tag, []byte("form")) {
                                         var formURL *url.URL
@@ -421 +432 @@
 }
 
+func sanitizeLinkTag(rc *RequestConfig, out io.Writer, attrs [][][]byte) {
+        exclude := false
+        for _, attr := range attrs {
+                attrName := attr[0]
+                attrValue := attr[1]
+                if bytes.Equal(attrName, []byte("rel")) {
+                        if bytes.Equal(attrValue, []byte("dns-prefetch")) {
+                                exclude = true
+                                break
+                        }
+                }
+                if bytes.Equal(attrName, []byte("as")) {
+                        if bytes.Equal(attrValue, []byte("script")) {
+                                exclude = true
+                                break
+                        }
+                }
+        }
+
+        if !exclude {
+                out.Write([]byte("<link"))
+                for _, attr := range attrs {
+                        sanitizeAttr(rc, out, attr[0], attr[1])
+                }
+                out.Write([]byte(">"))
+        }
+}
+
 func sanitizeMetaAttrs(rc *RequestConfig, out io.Writer, attrs [][][]byte) {
         var http_equiv []byte