No redo, refactor project building, simplify it

[tofuproxy.git] / cmd / tofuproxy / main.go

diff --git a/cmd/tofuproxy/main.go b/cmd/tofuproxy/main.go
index b3f2a14b76decaa0efd99952d7bff9d0d9c2a3a9..ddfa4771d74b910cd82e38855300311b866a7f3c 100644 (file)
--- a/cmd/tofuproxy/main.go
+++ b/cmd/tofuproxy/main.go
@@ -1,7 +1,7 @@
 /*
 tofuproxy -- flexible HTTP/HTTPS proxy, TLS terminator, X.509 TOFU
              manager, WARC/geminispace browser
-Copyright (C) 2021 Sergey Matveev <stargrave@stargrave.org>
+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
@@ -29,11 +29,13 @@ import (
        "go.stargrave.org/tofuproxy/fifos"
        "go.stargrave.org/tofuproxy/rounds"
        ttls "go.stargrave.org/tofuproxy/tls"
+       "go.stargrave.org/tofuproxy/warc"
 )
 
 func main() {
+       ai := flag.String("ai", "eddsa", "ecdsa|eddsa (ECDSA-256 or EdDSA algorithm)")
        crtPath := flag.String("cert", "cert.pem", "Path to server X.509 certificate")
-       prvPath := flag.String("key", "prv.pem", "Path to server PKCS#8 private key")
+       prvPath := flag.String("key", "cert.pem", "Path to server PKCS#8 private key")
        bind := flag.String("bind", "[::1]:8080", "Bind address")
        certs := flag.String("certs", "./certs", "Directory with pinned certificates")
        ccerts := flag.String("ccerts", "./ccerts", "Directory with client certificates")
@@ -41,6 +43,7 @@ func main() {
        fifosDir := flag.String("fifos", "fifos", "Directory with FIFOs")
        notai := flag.Bool("notai", false, "Do not prepend TAI64N to logs")
        warcOnly := flag.Bool("warc-only", false, "Server only WARC URIs")
+       unzstdPath := flag.String("unzstd", "cmd/zstd/unzstd", "Path to unzstd utility")
        flag.Parse()
        log.SetFlags(log.Lshortfile)
 
@@ -61,7 +64,9 @@ func main() {
        ttls.DNSSrv = *dnsSrv
        tofuproxy.CACert = caCert
        tofuproxy.CAPrv = caPrv
+       tofuproxy.X509Algo = *ai
        rounds.WARCOnly = *warcOnly
+       warc.UnZSTDPath = *unzstdPath
 
        ln, err := net.Listen("tcp", *bind)
        if err != nil {