From 76dfe257f1bf2376f02a08bbf78a422d19f8ca84 Mon Sep 17 00:00:00 2001
From: Adnan Maolood <me@adnano.co>
Date: Mon, 9 Nov 2020 09:28:44 -0500
Subject: [PATCH] Remove (*KnownHosts).LoadDefault function

---
 client.go |  2 +-
 tofu.go   | 52 +---------------------------------------------------
 2 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/client.go b/client.go
index 3d41936..efae786 100644
--- a/client.go
+++ b/client.go
@@ -47,7 +47,7 @@ type Client struct {
 	// the request of a server.
 	// If CreateCertificate is nil or the returned error is not nil,
 	// the request will not be sent again and the response will be returned.
-	CreateCertificate func(hostname, path string) (tls.Certificate, error)
+	CreateCertificate func(scope, path string) (tls.Certificate, error)
 
 	// TrustCertificate is called to determine whether the client
 	// should trust a certificate it has not seen before.
diff --git a/tofu.go b/tofu.go
index e890fb9..4d87e48 100644
--- a/tofu.go
+++ b/tofu.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
 )
@@ -28,28 +27,9 @@ type KnownHosts struct {
 	file  *os.File
 }
 
-// LoadDefault loads the known hosts from the default known hosts path, which is
-// $XDG_DATA_HOME/gemini/known_hosts.
-// It creates the path and any of its parent directories if they do not exist.
-// KnownHosts will append to the file whenever a certificate is added.
-func (k *KnownHosts) LoadDefault() error {
-	path, err := defaultKnownHostsPath()
-	if err != nil {
-		return err
-	}
-	return k.Load(path)
-}
-
 // Load loads the known hosts from the provided path.
-// It creates the path and any of its parent directories if they do not exist.
-// KnownHosts will append to the file whenever a certificate is added.
+// New known hosts will be appended to the file.
 func (k *KnownHosts) Load(path string) error {
-	if dir := filepath.Dir(path); dir != "." {
-		err := os.MkdirAll(dir, 0755)
-		if err != nil {
-			return err
-		}
-	}
 	f, err := os.OpenFile(path, os.O_CREATE|os.O_RDONLY, 0644)
 	if err != nil {
 		return err
@@ -71,12 +51,6 @@ func (k *KnownHosts) Add(hostname string, cert *x509.Certificate) {
 	k.add(hostname, cert, true)
 }
 
-// AddTemporary adds a certificate to the list of known hosts
-// without writing it to the known hosts file.
-func (k *KnownHosts) AddTemporary(hostname string, cert *x509.Certificate) {
-	k.add(hostname, cert, false)
-}
-
 func (k *KnownHosts) add(hostname string, cert *x509.Certificate, write bool) {
 	if k.hosts == nil {
 		k.hosts = map[string]Fingerprint{}
@@ -164,27 +138,3 @@ func NewFingerprint(cert *x509.Certificate) Fingerprint {
 		Expires:   cert.NotAfter.Unix(),
 	}
 }
-
-// defaultKnownHostsPath returns the default known_hosts path.
-// The default path is $XDG_DATA_HOME/gemini/known_hosts
-func defaultKnownHostsPath() (string, error) {
-	dataDir, err := userDataDir()
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(dataDir, "gemini", "known_hosts"), nil
-}
-
-// userDataDir returns the user data directory.
-func userDataDir() (string, error) {
-	dataDir, ok := os.LookupEnv("XDG_DATA_HOME")
-	if ok {
-		return dataDir, nil
-	}
-
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(home, ".local", "share"), nil
-}