From e75c539dace032eff56ef29b2d90429a2012c682 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Wed, 24 Jun 2020 13:31:01 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Use=20domain=20from=20URL=20for?=
 =?UTF-8?q?=20TOFU,=20not=20from=20cert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md       |  1 +
 client/client.go   |  8 ++++----
 client/tofu.go     | 28 ++++++++++++----------------
 display/private.go |  4 ++--
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fa4571..fc0dc0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Disabling color in config affects UI elements (#16)
 - Keep bold for headings even with color disabled
 - Don't make whole link text bold when color is disabled
+- Get domain from URL for TOFU, not from certificate
 
 
 ## [1.0.0] - 2020-06-18
diff --git a/client/client.go b/client/client.go
index c223ea7..e9a4fdf 100644
--- a/client/client.go
+++ b/client/client.go
@@ -10,15 +10,15 @@ import (
 // Fetch returns response data and an error.
 // The error text is human friendly and should be displayed.
 func Fetch(u string) (*gemini.Response, error) {
-	resp, err := gemini.Fetch(u)
+	res, err := gemini.Fetch(u)
 	if err != nil {
 		return nil, err
 	}
 
 	parsed, _ := url.Parse(u)
-	ok := handleTofu(resp.Cert, parsed.Port())
+	ok := handleTofu(parsed.Hostname(), parsed.Port(), res.Cert)
 	if !ok {
-		return resp, ErrTofu
+		return res, ErrTofu
 	}
-	return resp, err
+	return res, err
 }
diff --git a/client/tofu.go b/client/tofu.go
index 19c25bf..d930717 100644
--- a/client/tofu.go
+++ b/client/tofu.go
@@ -62,17 +62,14 @@ func certID(cert *x509.Certificate) string {
 // origCertID uses cert.Raw, which was used in v1.0.0 of the app.
 func origCertID(cert *x509.Certificate) string {
 	h := sha256.New()
-	h.Write(cert.Raw) // Better than cert.Raw, see #7
+	h.Write(cert.Raw)
 	return fmt.Sprintf("%X", h.Sum(nil))
 }
 
-func saveTofuEntry(cert *x509.Certificate, port string) {
-	tofuStore.Set(idKey(cert.Subject.CommonName, port), certID(cert))
-	tofuStore.Set(expiryKey(cert.Subject.CommonName, port), cert.NotAfter.UTC())
-	err := tofuStore.WriteConfig()
-	if err != nil {
-		panic(err)
-	}
+func saveTofuEntry(domain, port string, cert *x509.Certificate) {
+	tofuStore.Set(idKey(domain, port), certID(cert))
+	tofuStore.Set(expiryKey(domain, port), cert.NotAfter.UTC())
+	tofuStore.WriteConfig()
 }
 
 // handleTofu is the abstracted interface for taking care of TOFU.
@@ -80,17 +77,17 @@ func saveTofuEntry(cert *x509.Certificate, port string) {
 // It returns a bool indicating if the cert is valid according to
 // the TOFU database.
 // If false is returned, the connection should not go ahead.
-func handleTofu(cert *x509.Certificate, port string) bool {
-	id, expiry, err := loadTofuEntry(cert.Subject.CommonName, port)
+func handleTofu(domain, port string, cert *x509.Certificate) bool {
+	id, expiry, err := loadTofuEntry(domain, port)
 	if err != nil {
 		// Cert isn't in database or data is malformed
 		// So it can't be checked and anything is valid
-		saveTofuEntry(cert, port)
+		saveTofuEntry(domain, port, cert)
 		return true
 	}
 	if time.Now().After(expiry) {
 		// Old cert expired, so anything is valid
-		saveTofuEntry(cert, port)
+		saveTofuEntry(domain, port, cert)
 		return true
 	}
 	if certID(cert) == id {
@@ -99,7 +96,7 @@ func handleTofu(cert *x509.Certificate, port string) bool {
 	}
 	if origCertID(cert) == id {
 		// Valid but uses old ID type
-		saveTofuEntry(cert, port)
+		saveTofuEntry(domain, port, cert)
 		return true
 	}
 	return false
@@ -107,7 +104,6 @@ func handleTofu(cert *x509.Certificate, port string) bool {
 
 // ResetTofuEntry forces the cert passed to be valid, overwriting any previous TOFU entry.
 // The port string can be empty, to indicate port 1965.
-func ResetTofuEntry(cert *x509.Certificate, port string) {
-	tofuStore.Set(idKey(cert.Subject.CommonName, port), "")
-	tofuStore.WriteConfig()
+func ResetTofuEntry(domain, port string, cert *x509.Certificate) {
+	saveTofuEntry(domain, port, cert)
 }
diff --git a/display/private.go b/display/private.go
index 692f7e8..d246335 100644
--- a/display/private.go
+++ b/display/private.go
@@ -228,8 +228,8 @@ func handleURL(u string) (string, bool) {
 	if err == client.ErrTofu {
 		if Tofu(parsed.Host) {
 			// They want to continue anyway
-			client.ResetTofuEntry(res.Cert, parsed.Port())
-			// Response can be used further down
+			client.ResetTofuEntry(parsed.Hostname(), parsed.Port(), res.Cert)
+			// Response can be used further down, no need to reload
 		} else {
 			// They don't want to continue
 			// Set the bar back to original URL