Changeset 140 in code for trunk/morty.go

Timestamp:

Apr 20, 2023, 6:12:13 AM (2 years ago)

Author:

Izuru Yakumo

Message:

Incorporate most of the open pull requests found on GitHub

Signed-off-by: Izuru Yakumo <yakumo.izuru@…>

File:

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

trunk/morty.go

@@ -66 +66 @@
         contenttype.NewFilterEquals("image", "x-ms-bmp", ""),
         contenttype.NewFilterEquals("image", "x-icon", ""),
+        contenttype.NewFilterEquals("image", "svg", "xml"),
         // fonts
         contenttype.NewFilterEquals("application", "font-otf", ""),
@@ -196 +197 @@
         BaseURL     string
         HasMortyKey bool
+        URLParamName string
 }
 
@@ -201 +203 @@
         BaseURL   string
         MortyHash string
+        URLParamName string
+        HashParamName string
+}
+type HTMLMainPageFormParam struct {
+        URLParamName string
 }
 
 var HTML_FORM_EXTENSION *template.Template
 var HTML_BODY_EXTENSION *template.Template
+var HTML_MAIN_PAGE_FORM *template.Template
 var HTML_HEAD_CONTENT_TYPE string = `<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -261 +269 @@
     <label for="mortytoggle">hide</label>
     <span><a href="/">Morty Proxy</a></span>
-    <input type="url" value="{{.BaseURL}}" name="mortyurl" {{if .HasMortyKey }}readonly="true"{{end}} />
+    <input type="url" value="{{.BaseURL}}" name="{{.URLParamName}}" {{if .HasMortyKey }}readonly="true"{{end}} />
     This is a <a href="https://github.com/asciimoo/morty">proxified and sanitized</a> view of the page, visit <a href="{{.BaseURL}}" rel="noreferrer">original site</a>.
   </form>
@@ -281 +289 @@
                 panic(err)
         }
+        HTML_MAIN_PAGE_FORM, err = template.New("html_main_page_form").Parse(`
+        <form action="post">
+        Visit url: <input placeholder="https://url.." name="{{.URLParamName}}" autofocus />
+        <input type="submit" value="go" />
+        </form>`)
+        if err != nil {
+                panic(err)
+        }
 }
 
@@ -289 +305 @@
         }
 
-        requestHash := popRequestParam(ctx, []byte("mortyhash"))
-
-        requestURI := popRequestParam(ctx, []byte("mortyurl"))
+        requestHash := popRequestParam(ctx, []byte(cfg.HashParameter))
+
+        requestURI := popRequestParam(ctx, []byte(cfg.UrlParameter))
 
         if requestURI == nil {
@@ -301 +317 @@
                 if !verifyRequestURI(requestURI, requestHash, p.Key) {
                         // HTTP status code 403 : Forbidden
-                        p.serveMainPage(ctx, 403, errors.New(`invalid "mortyhash" parameter`))
+                        error_message := fmt.Sprintf(`invalid "%s" parameter. hint: Hash URL Parameter`, cfg.HashParameter)
+                        p.serveMainPage(ctx, 403, errors.New(error_message))
                         return
                 }
@@ -352 +369 @@
 
         req.SetRequestURI(requestURIStr)
-        req.Header.SetUserAgentBytes([]byte("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0"))
+        req.Header.SetUserAgentBytes([]byte("Mozilla/5.0 (Windows NT 1.0; Win64; x64; rv:112.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36"))
 
         resp := fasthttp.AcquireResponse()
@@ -488 +505 @@
                 sanitizeHTML(rc, ctx, responseBody)
                 if !rc.BodyInjected {
-                        p := HTMLBodyExtParam{rc.BaseURL.String(), false}
+                        p := HTMLBodyExtParam{rc.BaseURL.String(), false, cfg.UrlParameter}
                         if len(rc.Key) > 0 {
                                 p.HasMortyKey = true
@@ -699 +716 @@
                                                 key = hash(urlStr, rc.Key)
                                         }
-                                        err := HTML_FORM_EXTENSION.Execute(out, HTMLFormExtParam{urlStr, key})
+                                        err := HTML_FORM_EXTENSION.Execute(out, HTMLFormExtParam{urlStr, key, cfg.UrlParameter, cfg.HashParameter})
                                         if err != nil {
                                                 if cfg.Debug {
@@ -712 +729 @@
                                 switch string(tag) {
                                 case "body":
-                                        p := HTMLBodyExtParam{rc.BaseURL.String(), false}
+                                        p := HTMLBodyExtParam{rc.BaseURL.String(), false, cfg.UrlParameter}
                                         if len(rc.Key) > 0 {
                                                 p.HasMortyKey = true
@@ -983 +1000 @@
 
         if rc.Key == nil {
-                return fmt.Sprintf("./?mortyurl=%s%s", url.QueryEscape(morty_uri), fragment), nil
-        }
-        return fmt.Sprintf("./?mortyhash=%s&mortyurl=%s%s", hash(morty_uri, rc.Key), url.QueryEscape(morty_uri), fragment), nil
+                return fmt.Sprintf("./?%s=%s%s", cfg.UrlParameter, url.QueryEscape(morty_uri), fragment), nil
+        }
+        return fmt.Sprintf("./?%s=%s&%s=%s%s", cfg.HashParameter, hash(morty_uri, rc.Key), cfg.UrlParameter, url.QueryEscape(morty_uri), fragment), nil
 }
 
@@ -1043 +1060 @@
         }
         if p.Key == nil {
-                ctx.Write([]byte(`
-                <form action="post">
-                Visit url: <input placeholder="https://url.." name="mortyurl" autofocus />
-                <input type="submit" value="go" />
-                </form>`))
+                p := HTMLMainPageFormParam{cfg.UrlParameter}
+                err := HTML_MAIN_PAGE_FORM.Execute(ctx, p)
+                if err != nil {
+                        if cfg.Debug {
+                                fmt.Println("failed to inject main page form", err)
+                        }
+                }
         } else {
                 ctx.Write([]byte(`<h3>Warning! This instance does not support direct URL opening.</h3>`))
@@ -1064 +1083 @@
         proxy := flag.String("proxy", "", "Use the specified HTTP proxy (ie: '[user:pass@]hostname:port'). Overrides -socks5, -ipv6.")
         socks5 := flag.String("socks5", "", "Use a SOCKS5 proxy (ie: 'hostname:port'). Overrides -ipv6.")
+        urlParameter := flag.String("urlparam", cfg.UrlParameter, "user-defined requesting string URL parameter name (ie: '/?url=...' or '/?u=...')")
+        hashParameter := flag.String("hashparam", cfg.HashParameter, "user-defined requesting string HASH parameter name (ie: '/?hash=...' or '/?h=...')")
         version := flag.Bool("version", false, "Show version")
         flag.Parse()
@@ -1073 +1094 @@
         cfg.RequestTimeout = *requestTimeout
         cfg.FollowRedirect = *followRedirect
+        cfg.UrlParameter = *urlParameter
+        cfg.HashParameter = *hashParameter
 
         if *version {