More Fprintf usage

[tofuproxy.git] / httpauth.go

diff --git a/httpauth.go b/httpauth.go
index 025c42d96bbd12cb5622d852fa683026bfcfa779..92eff6e699dc81fa0261438a804ab713525d8499 100644 (file)
--- a/httpauth.go
+++ b/httpauth.go
@@ -1,7 +1,7 @@
 /*
-tofuproxy -- flexible HTTP proxy, TLS terminator, X.509 certificates
-             manager, WARC/Gemini browser
-Copyright (C) 2021 Sergey Matveev <stargrave@stargrave.org>
+tofuproxy -- flexible HTTP/HTTPS proxy, TLS terminator, X.509 TOFU
+             manager, WARC/geminispace browser
+Copyright (C) 2021-2023 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -22,49 +22,16 @@ import (
        "bytes"
        "errors"
        "fmt"
-       "io/ioutil"
-       "log"
-       "os"
        "os/exec"
-       "path/filepath"
        "strings"
 
        ttls "go.stargrave.org/tofuproxy/tls"
 )
 
-func findInNetrc(host string) (string, string) {
-       netrcPath, ok := os.LookupEnv("NETRC")
-       if !ok {
-               netrcPath = filepath.Join(os.Getenv("HOME"), ".netrc")
-       }
-       data, err := ioutil.ReadFile(netrcPath)
-       if err != nil {
-               if os.IsNotExist(err) {
-                       return "", ""
-               }
-               log.Fatalln(err)
-       }
-       var login string
-       var password string
-       for _, line := range strings.Split(string(data), "\n") {
-               if i := strings.Index(line, "#"); i >= 0 {
-                       line = line[:i]
-               }
-               f := strings.Fields(line)
-               if len(f) >= 6 &&
-                       f[0] == "machine" && f[1] == host &&
-                       f[2] == "login" && f[4] == "password" {
-                       login, password = f[3], f[5]
-                       break
-               }
-       }
-       return login, password
-}
-
 func authDialog(host, realm string) (string, string, error) {
        var b bytes.Buffer
        userInit, passInit := findInNetrc(host)
-       b.WriteString(fmt.Sprintf(`
+       fmt.Fprintf(&b, `
 tk_setPalette grey
 wm title . "Unauthorized: %s"
 
@@ -92,7 +59,7 @@ bind . <KeyPress> {switch -exact %%K {
     q {exit 0} ; # reject once
     l login
 }}
-`, realm, userInit, passInit))
+`, strings.ReplaceAll(realm, "\"", ""), userInit, passInit)
        cmd := exec.Command(ttls.CmdWish)
        cmd.Stdin = &b
        out, err := cmd.Output()