Another refactor

[tofuproxy.git] / verify.go

diff --git a/verify.go b/verify.go
index f6844cd997f7fd13a3198eb488ca6ff102ba6e01..b2eb606ab40691cf4ce1b2571a6334bb207d81cd 100644 (file)
--- a/verify.go
+++ b/verify.go
@@ -1,4 +1,5 @@
 /*
+tofuproxy -- HTTP proxy with TLS certificates management
 Copyright (C) 2021 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
@@ -14,7 +15,7 @@ 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 main
+package tofuproxy
 
 import (
        "bytes"
@@ -31,17 +32,19 @@ import (
        "sync"
 
        "go.cypherpunks.ru/ucspi"
+       "go.stargrave.org/tofuproxy/fifos"
 )
 
 var (
        CmdCerttool = "certtool"
-       CmdWish     = "wish8.7"
+       CmdWish     = "wish8.6"
 
-       certs     *string
+       Certs     string
        accepted  = make(map[string]string)
        acceptedM sync.RWMutex
        rejected  = make(map[string]string)
        rejectedM sync.RWMutex
+       VerifyM   sync.Mutex
 )
 
 func spkiHash(cert *x509.Certificate) string {
@@ -103,6 +106,8 @@ func verifyCert(
                }
        }
        certTheirHash := spkiHash(certTheir)
+       VerifyM.Lock()
+       defer VerifyM.Unlock()
        acceptedM.RLock()
        certOurHash := accepted[host]
        acceptedM.RUnlock()
@@ -118,18 +123,18 @@ func verifyCert(
        daneExists, daneMatched := dane(host, certTheir)
        if daneExists {
                if daneMatched {
-                       sinkCert <- fmt.Sprintf("DANE\t%s\tmatched", host)
+                       fifos.SinkDANE <- fmt.Sprintf("%s\tmatched", host)
                } else {
-                       sinkErr <- fmt.Sprintf("DANE\t%s\tnot matched", host)
+                       fifos.SinkDANE <- fmt.Sprintf("%s\tNOT matched", host)
                }
        }
-       fn := filepath.Join(*certs, host)
+       fn := filepath.Join(Certs, host)
        certsOur, _, err := ucspi.CertPoolFromFile(fn)
        if err == nil || dialErr != nil || (daneExists && !daneMatched) {
                if certsOur != nil && certTheirHash == spkiHash(certsOur[0]) {
                        acceptedAdd(host, certTheirHash)
                        if bytes.Compare(certsOur[0].Raw, rawCerts[0]) != 0 {
-                               sinkCert <- fmt.Sprintf("Refresh\t%s\t%s", host, certTheirHash)
+                               fifos.SinkCert <- fmt.Sprintf("Refresh\t%s\t%s", host, certTheirHash)
                                goto CertUpdate
                        }
                        return nil
@@ -149,7 +154,7 @@ $tErr configure -wrap word -height 5
                        if daneMatched {
                                b.WriteString("label .lDANE -bg green -text \"DANE matched\"\n")
                        } else {
-                               b.WriteString("label .lDANE -bg red -text \"DANE not matched!\"\n")
+                               b.WriteString("label .lDANE -bg red -text \"DANE NOT matched\"\n")
                        }
                        b.WriteString("grid .lDANE\n")
                }
@@ -198,32 +203,32 @@ grid columnconfigure . 0 -weight 1
                err = cmd.Run()
                exitError, ok := err.(*exec.ExitError)
                if !ok {
-                       sinkCert <- fmt.Sprintf("DENY\t%s\t%s", host, certTheirHash)
+                       fifos.SinkCert <- fmt.Sprintf("DENY\t%s\t%s", host, certTheirHash)
                        return ErrRejected{host}
                }
                switch exitError.ExitCode() {
                case 10:
-                       sinkCert <- fmt.Sprintf("ADD\t%s\t%s", host, certTheirHash)
+                       fifos.SinkCert <- fmt.Sprintf("ADD\t%s\t%s", host, certTheirHash)
                        goto CertUpdate
                case 11:
-                       sinkCert <- fmt.Sprintf("ONCE\t%s\t%s", host, certTheirHash)
+                       fifos.SinkCert <- fmt.Sprintf("ONCE\t%s\t%s", host, certTheirHash)
                        acceptedAdd(host, certTheirHash)
                        return nil
                case 12:
                        rejectedAdd(host, certTheirHash)
                        fallthrough
                default:
-                       sinkCert <- fmt.Sprintf("DENY\t%s\t%s", host, certTheirHash)
+                       fifos.SinkCert <- fmt.Sprintf("DENY\t%s\t%s", host, certTheirHash)
                        return ErrRejected{host}
                }
        } else {
                if !os.IsNotExist(err) {
                        return err
                }
-               sinkCert <- fmt.Sprintf("TOFU\t%s\t%s", host, certTheirHash)
+               fifos.SinkCert <- fmt.Sprintf("TOFU\t%s\t%s", host, certTheirHash)
        }
 CertUpdate:
-       tmp, err := os.CreateTemp(*certs, "")
+       tmp, err := os.CreateTemp(Certs, "")
        if err != nil {
                log.Fatalln(err)
        }