Changeset 92 in code for trunk/morty.go

Timestamp:

Jul 2, 2019, 4:20:01 PM (6 years ago)

Author:

alex

Message:

Dockerfile : Various modifications

• the key is base64 encoded /!\ break compatibility, see searx project PR #1629
• make sure to use golang:1.12-alpine to build morty to support TLS 1.3 (from morty to external)

File:

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

trunk/morty.go

@@ -976 +976 @@
         default_key := os.Getenv("MORTY_KEY")
         listen := flag.String("listen", default_listen_addr, "Listen address")
-        key := flag.String("key", default_key, "HMAC url validation key (hexadecimal encoded) - leave blank to disable validation")
+        key := flag.String("key", default_key, "HMAC url validation key (base64 encoded) - leave blank to disable validation")
         ipv6 := flag.Bool("ipv6", false, "Allow IPv6 HTTP requests")
         version := flag.Bool("version", false, "Show version")
@@ -994 +994 @@
 
         if *key != "" {
-                p.Key = []byte(*key)
+                var err error
+                p.Key, err = base64.StdEncoding.DecodeString(*key)
+                if (err != nil) {
+                   log.Fatal("Error parsing -key", err.Error())
+                   os.Exit(1)
+                }
         }