Changeset 23 in code for trunk/morty.go

Timestamp:

Oct 30, 2016, 4:54:54 PM (9 years ago)

Author:

asciimoo

Message:

[mod] proxification refactor

File:

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

trunk/morty.go

@@ -104 +104 @@
 type RequestConfig struct {
         Key     []byte
-        baseURL *url.URL
+        BaseURL *url.URL
 }
 
@@ -197 +197 @@
                         loc := resp.Header.Peek("Location")
                         if loc != nil {
-                                url, err := proxifyURI(&RequestConfig{p.Key, parsedURI}, string(loc))
+                                rc := &RequestConfig{Key: p.Key, BaseURL: parsedURI}
+                                url, err := rc.ProxifyURI(string(loc))
                                 if err == nil {
                                         ctx.SetStatusCode(resp.StatusCode())
@@ -241 +242 @@
         switch {
         case bytes.Contains(contentType, []byte("css")):
-                sanitizeCSS(&RequestConfig{p.Key, parsedURI}, ctx, responseBody)
+                sanitizeCSS(&RequestConfig{Key: p.Key, BaseURL: parsedURI}, ctx, responseBody)
         case bytes.Contains(contentType, []byte("html")):
-                sanitizeHTML(&RequestConfig{p.Key, parsedURI}, ctx, responseBody)
+                sanitizeHTML(&RequestConfig{Key: p.Key, BaseURL: parsedURI}, ctx, responseBody)
         default:
                 ctx.Write(responseBody)
@@ -291 +292 @@
                 urlEnd := s[5]
 
-                if uri, err := proxifyURI(rc, string(css[urlStart:urlEnd])); err == nil {
+                if uri, err := rc.ProxifyURI(string(css[urlStart:urlEnd])); err == nil {
                         out.Write(css[startIndex:urlStart])
                         out.Write([]byte(uri))
@@ -383 +384 @@
                                                 if bytes.Equal(attr[0], []byte("action")) {
                                                         formURL, _ = url.Parse(string(attr[1]))
-                                                        mergeURIs(rc.baseURL, formURL)
+                                                        mergeURIs(rc.BaseURL, formURL)
                                                         break
                                                 }
                                         }
                                         if formURL == nil {
-                                                formURL = rc.baseURL
+                                                formURL = rc.BaseURL
                                         }
                                         urlStr := formURL.String()
@@ -404 +405 @@
                                 switch string(tag) {
                                 case "body":
-                                        fmt.Fprintf(out, HTML_BODY_EXTENSION, rc.baseURL.String())
+                                        fmt.Fprintf(out, HTML_BODY_EXTENSION, rc.BaseURL.String())
                                 case "style":
                                         state = STATE_DEFAULT
@@ -493 +494 @@
         if bytes.Equal(http_equiv, []byte("refresh")) && urlIndex != -1 {
                 contentUrl := content[urlIndex+4:]
-                if uri, err := proxifyURI(rc, string(contentUrl)); err == nil {
+                if uri, err := rc.ProxifyURI(string(contentUrl)); err == nil {
                         fmt.Fprintf(out, ` http-equiv="refresh" content="%surl=%s"`, content[:urlIndex], uri)
                 }
@@ -515 +516 @@
         switch string(attrName) {
         case "src", "href", "action":
-                if uri, err := proxifyURI(rc, string(attrValue)); err == nil {
+                if uri, err := rc.ProxifyURI(string(attrValue)); err == nil {
                         fmt.Fprintf(out, " %s=\"%s\"", attrName, uri)
                 } else {
@@ -539 +540 @@
 }
 
-func proxifyURI(rc *RequestConfig, uri string) (string, error) {
+func (rc *RequestConfig) ProxifyURI(uri string) (string, error) {
         // TODO check malicious data: - e.g. data:script
         if strings.HasPrefix(uri, "data:") {
@@ -553 +554 @@
                 return "", err
         }
-        mergeURIs(rc.baseURL, u)
+        mergeURIs(rc.BaseURL, u)
 
         uri = u.String()