Add version string

Add `lib.Version` to get updated at build time.
Add --version flags to cashier and cashierd
Send client version in the signing request
Send server version in http response headers and in signing response
Set version at build time

2 files changed, 22 insertions, 8 deletions

diff --git a/cmd/cashier/main.go b/cmd/cashier/main.go
index 1ee9455..54fad82 100644
--- a/cmd/cashier/main.go
+++ b/cmd/cashier/main.go
@@ -13,23 +13,29 @@ import (
 	"time"
 
 	"github.com/nsheridan/cashier/client"
+	"github.com/nsheridan/cashier/lib"
 	"github.com/pkg/browser"
 	"github.com/spf13/pflag"
 	"golang.org/x/crypto/ssh/agent"
 )
 
 var (
-	u, _             = user.Current()
-	cfg              = pflag.String("config", path.Join(u.HomeDir, ".cashier.conf"), "Path to config file")
-	ca               = pflag.String("ca", "http://localhost:10000", "CA server")
-	keysize          = pflag.Int("key_size", 0, "Size of key to generate. Ignored for ed25519 keys. (default 2048 for rsa keys, 256 for ecdsa keys)")
-	validity         = pflag.Duration("validity", time.Hour*24, "Key lifetime. May be overridden by the CA at signing time")
-	keytype          = pflag.String("key_type", "", "Type of private key to generate - rsa, ecdsa or ed25519. (default \"rsa\")")
-	publicFilePrefix = pflag.String("key_file_prefix", "", "Prefix for filename for public key and cert (optional, no default)")
+	u, _    = user.Current()
+	cfg     = pflag.String("config", path.Join(u.HomeDir, ".cashier.conf"), "Path to config file")
+	_       = pflag.String("ca", "http://localhost:10000", "CA server")
+	_       = pflag.Int("key_size", 0, "Size of key to generate. Ignored for ed25519 keys. (default 2048 for rsa keys, 256 for ecdsa keys)")
+	_       = pflag.Duration("validity", time.Hour*24, "Key lifetime. May be overridden by the CA at signing time")
+	_       = pflag.String("key_type", "", "Type of private key to generate - rsa, ecdsa or ed25519. (default \"rsa\")")
+	_       = pflag.String("key_file_prefix", "", "Prefix for filename for public key and cert (optional, no default)")
+	version = pflag.Bool("version", false, "Print version and exit")
 )
 
 func main() {
 	pflag.Parse()
+	if *version {
+		fmt.Printf("%s\n", lib.Version)
+		os.Exit(0)
+	}
 	log.SetPrefix("cashier: ")
 	log.SetFlags(0)
 	var err error
diff --git a/cmd/cashierd/main.go b/cmd/cashierd/main.go
index 2e378bc..5b0b390 100644
--- a/cmd/cashierd/main.go
+++ b/cmd/cashierd/main.go
@@ -2,8 +2,11 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"log"
+	"os"
 
+	"github.com/nsheridan/cashier/lib"
 	"github.com/nsheridan/cashier/server"
 	"github.com/nsheridan/cashier/server/config"
 	"github.com/nsheridan/cashier/server/wkfs/vaultfs"
@@ -11,11 +14,16 @@ import (
 )
 
 var (
-	cfg = flag.String("config_file", "cashierd.conf", "Path to configuration file.")
+	cfg     = flag.String("config_file", "cashierd.conf", "Path to configuration file.")
+	version = flag.Bool("version", false, "Print version and exit")
 )
 
 func main() {
 	flag.Parse()
+	if *version {
+		fmt.Printf("%s\n", lib.Version)
+		os.Exit(0)
+	}
 	conf, err := config.ReadConfig(*cfg)
 	if err != nil {
 		log.Fatal(err)