X-Git-Url: http://www.git.stargrave.org/?p=tofuproxy.git;a=blobdiff_plain;f=httpauth.go;h=92eff6e699dc81fa0261438a804ab713525d8499;hp=5b454cacb64d495d8bc49c1d1924f9ef4d45e250;hb=HEAD;hpb=aca0f719ffa95e51420a625813f2f4cbf1d5397c

diff --git a/httpauth.go b/httpauth.go
index 5b454ca..8e32452 100644
--- a/httpauth.go
+++ b/httpauth.go
@@ -1,20 +1,18 @@
-/*
-tofuproxy -- flexible HTTP/HTTPS proxy, TLS terminator, X.509 TOFU
-             manager, WARC/geminispace browser
-Copyright (C) 2021 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
-the Free Software Foundation, version 3 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// tofuproxy -- flexible HTTP/HTTPS proxy, TLS terminator, X.509 TOFU
+//              manager, WARC/geminispace browser
+// Copyright (C) 2021-2024 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
+// the Free Software Foundation, version 3 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package tofuproxy
 
@@ -22,49 +20,17 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
 	"os/exec"
-	"path/filepath"
 	"strings"
 
+	"go.cypherpunks.ru/netrc"
 	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(`
+	userInit, passInit := netrc.Find(host)
+	fmt.Fprintf(&b, `
 tk_setPalette grey
 wm title . "Unauthorized: %s"
 
@@ -92,7 +58,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()