diff --git a/.goreleaser.yml b/.goreleaser.yml index 830e61c..45d4646 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -2,12 +2,14 @@ project_name: traefik-certs-dumper builds: - binary: traefik-certs-dumper + ldflags: + - -s -w -X github.com/ldez/traefik-certs-dumper/cmd.version={{.Version}} -X github.com/ldez/traefik-certs-dumper/cmd.commit={{.ShortCommit}} -X github.com/ldez/traefik-certs-dumper/cmd.date={{.Date}} env: - GO111MODULE=on goos: - - windows - - darwin - linux + - darwin + - windows - freebsd - openbsd goarch: diff --git a/Makefile b/Makefile index 8f91d03..00be093 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ clean: build: clean @echo Version: $(VERSION) $(BUILD_DATE) - go build -v -ldflags '-X "main.version=${VERSION}" -X "main.commit=${SHA}" -X "main.date=${BUILD_DATE}"' + go build -v -ldflags '-X "github.com/ldez/traefik-certs-dumper/cmd.version=${VERSION}" -X "github.com/ldez/traefik-certs-dumper/cmd.commit=${SHA}" -X "github.com/ldez/traefik-certs-dumper/cmd.date=${BUILD_DATE}"' checks: golangci-lint run diff --git a/cmd/boltdb.go b/cmd/boltdb.go new file mode 100644 index 0000000..8f5c976 --- /dev/null +++ b/cmd/boltdb.go @@ -0,0 +1,31 @@ +package cmd + +import ( + "fmt" + + "github.com/spf13/cobra" +) + +// boltdbCmd represents the boltdb command +var boltdbCmd = &cobra.Command{ + Use: "boltdb", + Short: "TODO", + Long: `TODO`, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("boltdb called") + }, +} + +func init() { + kvCmd.AddCommand(boltdbCmd) + + // Here you will define your flags and configuration settings. + + // Cobra supports Persistent Flags which will work for this command + // and all subcommands, e.g.: + // boltdbCmd.PersistentFlags().String("foo", "", "A help for foo") + + // Cobra supports local flags which will only run when this command + // is called directly, e.g.: + // boltdbCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") +} diff --git a/cmd/consul.go b/cmd/consul.go new file mode 100644 index 0000000..231cd69 --- /dev/null +++ b/cmd/consul.go @@ -0,0 +1,31 @@ +package cmd + +import ( + "fmt" + + "github.com/spf13/cobra" +) + +// consulCmd represents the consul command +var consulCmd = &cobra.Command{ + Use: "consul", + Short: "TODO", + Long: `TODO`, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("consul called") + }, +} + +func init() { + kvCmd.AddCommand(consulCmd) + + // Here you will define your flags and configuration settings. + + // Cobra supports Persistent Flags which will work for this command + // and all subcommands, e.g.: + // consulCmd.PersistentFlags().String("foo", "", "A help for foo") + + // Cobra supports local flags which will only run when this command + // is called directly, e.g.: + // consulCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") +} diff --git a/cmd/etcd.go b/cmd/etcd.go new file mode 100644 index 0000000..4dcc1b6 --- /dev/null +++ b/cmd/etcd.go @@ -0,0 +1,31 @@ +package cmd + +import ( + "fmt" + + "github.com/spf13/cobra" +) + +// etcdCmd represents the etcd command +var etcdCmd = &cobra.Command{ + Use: "etcd", + Short: "TODO", + Long: `TODO`, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("etcd called") + }, +} + +func init() { + kvCmd.AddCommand(etcdCmd) + + // Here you will define your flags and configuration settings. + + // Cobra supports Persistent Flags which will work for this command + // and all subcommands, e.g.: + // etcdCmd.PersistentFlags().String("foo", "", "A help for foo") + + // Cobra supports local flags which will only run when this command + // is called directly, e.g.: + // etcdCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") +} diff --git a/cmd/file.go b/cmd/file.go new file mode 100644 index 0000000..74c4af2 --- /dev/null +++ b/cmd/file.go @@ -0,0 +1,45 @@ +package cmd + +import ( + "strconv" + + "github.com/ldez/traefik-certs-dumper/dumper" + "github.com/ldez/traefik-certs-dumper/dumper/file" + "github.com/spf13/cobra" +) + +// fileCmd represents the file command +var fileCmd = &cobra.Command{ + Use: "file", + Short: `Dump the content of the "acme.json" file.`, + Long: `Dump the content of the "acme.json" file from Traefik to certificates.`, + RunE: func(cmd *cobra.Command, _ []string) error { + acmeFile := cmd.Flag("source").Value.String() + dumpPath := cmd.Flag("dest").Value.String() + + crtInfo := dumper.FileInfo{ + Name: cmd.Flag("crt-name").Value.String(), + Ext: cmd.Flag("crt-ext").Value.String(), + } + + keyInfo := dumper.FileInfo{ + Name: cmd.Flag("key-name").Value.String(), + Ext: cmd.Flag("key-ext").Value.String(), + } + + subDir, _ := strconv.ParseBool(cmd.Flag("domain-subdir").Value.String()) + + err := file.Dump(acmeFile, dumpPath, crtInfo, keyInfo, subDir) + if err != nil { + return err + } + + return dumper.Tree(dumpPath, "") + }, +} + +func init() { + rootCmd.AddCommand(fileCmd) + + fileCmd.Flags().String("source", "./acme.json", "Path to 'acme.json' file.") +} diff --git a/cmd/kv.go b/cmd/kv.go new file mode 100644 index 0000000..a0f8147 --- /dev/null +++ b/cmd/kv.go @@ -0,0 +1,28 @@ +// Copyright © 2019 ldez + +package cmd + +import ( + "github.com/spf13/cobra" +) + +// kvCmd represents the kv command +var kvCmd = &cobra.Command{ + Use: "kv", + Short: "TODO", + Long: `TODO`, +} + +func init() { + rootCmd.AddCommand(kvCmd) + + // Here you will define your flags and configuration settings. + + // Cobra supports Persistent Flags which will work for this command + // and all subcommands, e.g.: + // kvCmd.PersistentFlags().String("foo", "", "A help for foo") + + // Cobra supports local flags which will only run when this command + // is called directly, e.g.: + // kvCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") +} diff --git a/cmd/root.go b/cmd/root.go new file mode 100644 index 0000000..5632bd2 --- /dev/null +++ b/cmd/root.go @@ -0,0 +1,84 @@ +package cmd + +import ( + "fmt" + "os" + "strconv" + + homedir "github.com/mitchellh/go-homedir" + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +var cfgFile string + +// rootCmd represents the base command when called without any subcommands +var rootCmd = &cobra.Command{ + Use: "traefik-certs-dumper", + Short: "Dump Let's Encrypt certificates from Traefik", + Long: `TODO`, + PersistentPreRunE: func(cmd *cobra.Command, args []string) error { + if cmd.Name() == "version" { + return nil + } + + crtExt := cmd.Flag("crt-ext").Value.String() + keyExt := cmd.Flag("key-ext").Value.String() + + subDir, _ := strconv.ParseBool(cmd.Flag("domain-subdir").Value.String()) + if !subDir { + if crtExt == keyExt { + return fmt.Errorf("--crt-ext (%q) and --key-ext (%q) are identical, in this case --domain-subdir is required", crtExt, keyExt) + } + } + return nil + }, +} + +// Execute adds all child commands to the root command and sets flags appropriately. +// This is called by main.main(). It only needs to happen once to the rootCmd. +func Execute() { + if err := rootCmd.Execute(); err != nil { + fmt.Println(err) + os.Exit(1) + } +} + +func init() { + cobra.OnInitialize(initConfig) + + rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.traefik-certs-dumper.yaml)") + + rootCmd.PersistentFlags().String("dest", "./dump", "Path to store the dump content.") + rootCmd.PersistentFlags().String("crt-ext", ".crt", "The file extension of the generated certificates.") + rootCmd.PersistentFlags().String("crt-name", "certificate", "The file name (without extension) of the generated certificates.") + rootCmd.PersistentFlags().String("key-ext", ".key", "The file extension of the generated private keys.") + rootCmd.PersistentFlags().String("key-name", "privatekey", "The file name (without extension) of the generated private keys.") + rootCmd.PersistentFlags().Bool("domain-subdir", false, "Use domain as sub-directory.") +} + +// initConfig reads in config file and ENV variables if set. +func initConfig() { + if cfgFile != "" { + // Use config file from the flag. + viper.SetConfigFile(cfgFile) + } else { + // Find home directory. + home, err := homedir.Dir() + if err != nil { + fmt.Println(err) + os.Exit(1) + } + + // Search config in home directory with name ".traefik-certs-dumper" (without extension). + viper.AddConfigPath(home) + viper.SetConfigName(".traefik-certs-dumper") + } + + viper.AutomaticEnv() // read in environment variables that match + + // If a config file is found, read it in. + if err := viper.ReadInConfig(); err == nil { + fmt.Println("Using config file:", viper.ConfigFileUsed()) + } +} diff --git a/version.go b/cmd/version.go similarity index 56% rename from version.go rename to cmd/version.go index a101709..2b2b4a8 100644 --- a/version.go +++ b/cmd/version.go @@ -1,8 +1,10 @@ -package main +package cmd import ( "fmt" "runtime" + + "github.com/spf13/cobra" ) var ( @@ -11,6 +13,19 @@ var ( date = "I don't remember exactly" ) +// versionCmd represents the version command +var versionCmd = &cobra.Command{ + Use: "version", + Short: "Display version", + Run: func(cmd *cobra.Command, args []string) { + displayVersion(rootCmd.Name()) + }, +} + +func init() { + rootCmd.AddCommand(versionCmd) +} + func displayVersion(name string) { fmt.Printf(name+`: version : %s diff --git a/cmd/zookeeper.go b/cmd/zookeeper.go new file mode 100644 index 0000000..d53ede3 --- /dev/null +++ b/cmd/zookeeper.go @@ -0,0 +1,31 @@ +package cmd + +import ( + "fmt" + + "github.com/spf13/cobra" +) + +// zookeeperCmd represents the zookeeper command +var zookeeperCmd = &cobra.Command{ + Use: "zookeeper", + Short: "TODO", + Long: `TODO`, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("zookeeper called") + }, +} + +func init() { + kvCmd.AddCommand(zookeeperCmd) + + // Here you will define your flags and configuration settings. + + // Cobra supports Persistent Flags which will work for this command + // and all subcommands, e.g.: + // zookeeperCmd.PersistentFlags().String("foo", "", "A help for foo") + + // Cobra supports local flags which will only run when this command + // is called directly, e.g.: + // zookeeperCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") +} diff --git a/dumper.go b/dumper/dumper.go similarity index 53% rename from dumper.go rename to dumper/dumper.go index be31822..579b428 100644 --- a/dumper.go +++ b/dumper/dumper.go @@ -1,14 +1,12 @@ -package main +package dumper import ( - "encoding/json" "encoding/pem" "io/ioutil" "os" "path/filepath" - "github.com/xenolf/lego/certcrypto" - "github.com/xenolf/lego/registration" + "github.com/go-acme/lego/certcrypto" ) const ( @@ -16,67 +14,28 @@ const ( keysSubDir = "private" ) -// StoredData represents the data managed by the Store -type StoredData struct { - Account *Account - Certificates []*Certificate - HTTPChallenges map[string]map[string][]byte - TLSChallenges map[string]*Certificate -} - -// Certificate is a struct which contains all data needed from an ACME certificate -type Certificate struct { - Domain Domain - Certificate []byte - Key []byte -} - -// Domain holds a domain name with SANs -type Domain struct { - Main string - SANs []string -} - -// Account is used to store lets encrypt registration info -type Account struct { - Email string - Registration *registration.Resource - PrivateKey []byte - KeyType certcrypto.KeyType -} - -type fileInfo struct { +type FileInfo struct { Name string Ext string } -func dump(acmeFile, dumpPath string, crtInfo, keyInfo fileInfo, domainSubDir bool) error { - f, err := os.Open(acmeFile) - if err != nil { - return err - } - - data := StoredData{} - if err = json.NewDecoder(f).Decode(&data); err != nil { - return err - } - - if err = os.RemoveAll(dumpPath); err != nil { +func Dump(data *StoredData, dumpPath string, crtInfo, keyInfo FileInfo, domainSubDir bool) error { + if err := os.RemoveAll(dumpPath); err != nil { return err } if !domainSubDir { - if err = os.MkdirAll(filepath.Join(dumpPath, certsSubDir), 0755); err != nil { + if err := os.MkdirAll(filepath.Join(dumpPath, certsSubDir), 0755); err != nil { return err } } - if err = os.MkdirAll(filepath.Join(dumpPath, keysSubDir), 0755); err != nil { + if err := os.MkdirAll(filepath.Join(dumpPath, keysSubDir), 0755); err != nil { return err } privateKeyPem := extractPEMPrivateKey(data.Account) - err = ioutil.WriteFile(filepath.Join(dumpPath, keysSubDir, "letsencrypt"+keyInfo.Ext), privateKeyPem, 0666) + err := ioutil.WriteFile(filepath.Join(dumpPath, keysSubDir, "letsencrypt"+keyInfo.Ext), privateKeyPem, 0666) if err != nil { return err } @@ -96,7 +55,7 @@ func dump(acmeFile, dumpPath string, crtInfo, keyInfo fileInfo, domainSubDir boo return nil } -func writeCert(dumpPath string, cert *Certificate, info fileInfo, domainSubDir bool) error { +func writeCert(dumpPath string, cert *Certificate, info FileInfo, domainSubDir bool) error { certPath := filepath.Join(dumpPath, certsSubDir, cert.Domain.Main+info.Ext) if domainSubDir { certPath = filepath.Join(dumpPath, cert.Domain.Main, info.Name+info.Ext) @@ -108,7 +67,7 @@ func writeCert(dumpPath string, cert *Certificate, info fileInfo, domainSubDir b return ioutil.WriteFile(certPath, cert.Certificate, 0666) } -func writeKey(dumpPath string, cert *Certificate, info fileInfo, domainSubDir bool) error { +func writeKey(dumpPath string, cert *Certificate, info FileInfo, domainSubDir bool) error { keyPath := filepath.Join(dumpPath, keysSubDir, cert.Domain.Main+info.Ext) if domainSubDir { keyPath = filepath.Join(dumpPath, cert.Domain.Main, info.Name+info.Ext) diff --git a/dumper/file/file.go b/dumper/file/file.go new file mode 100644 index 0000000..bc74bd3 --- /dev/null +++ b/dumper/file/file.go @@ -0,0 +1,31 @@ +package file + +import ( + "encoding/json" + "os" + + "github.com/ldez/traefik-certs-dumper/dumper" +) + +func Dump(acmeFile, dumpPath string, crtInfo, keyInfo dumper.FileInfo, domainSubDir bool) error { + data, err := readFile(acmeFile) + if err != nil { + return err + } + + return dumper.Dump(data, dumpPath, crtInfo, keyInfo, domainSubDir) +} + +func readFile(acmeFile string) (*dumper.StoredData, error) { + source, err := os.Open(acmeFile) + if err != nil { + return nil, err + } + + data := &dumper.StoredData{} + if err = json.NewDecoder(source).Decode(data); err != nil { + return nil, err + } + + return data, nil +} diff --git a/dumper/info.go b/dumper/info.go new file mode 100644 index 0000000..be08892 --- /dev/null +++ b/dumper/info.go @@ -0,0 +1,81 @@ +package dumper + +import ( + "fmt" + "io/ioutil" + "os" + "path/filepath" + + "github.com/go-acme/lego/certcrypto" + "github.com/go-acme/lego/registration" +) + +// StoredData represents the data managed by the Store +type StoredData struct { + Account *Account + Certificates []*Certificate + HTTPChallenges map[string]map[string][]byte + TLSChallenges map[string]*Certificate +} + +// Certificate is a struct which contains all data needed from an ACME certificate +type Certificate struct { + Domain Domain + Certificate []byte + Key []byte +} + +// Domain holds a domain name with SANs +type Domain struct { + Main string + SANs []string +} + +// Account is used to store lets encrypt registration info +type Account struct { + Email string + Registration *registration.Resource + PrivateKey []byte + KeyType certcrypto.KeyType +} + +// FIXME move +func Tree(root, indent string) error { + fi, err := os.Stat(root) + if err != nil { + return fmt.Errorf("could not stat %s: %v", root, err) + } + + fmt.Println(fi.Name()) + if !fi.IsDir() { + return nil + } + + fis, err := ioutil.ReadDir(root) + if err != nil { + return fmt.Errorf("could not read dir %s: %v", root, err) + } + + var names []string + for _, fi := range fis { + if fi.Name()[0] != '.' { + names = append(names, fi.Name()) + } + } + + for i, name := range names { + add := "│ " + if i == len(names)-1 { + fmt.Printf(indent + "└──") + add = " " + } else { + fmt.Printf(indent + "├──") + } + + if err := Tree(filepath.Join(root, name), indent+add); err != nil { + return err + } + } + + return nil +} diff --git a/dumper/kv/kv.go b/dumper/kv/kv.go new file mode 100644 index 0000000..b81f834 --- /dev/null +++ b/dumper/kv/kv.go @@ -0,0 +1 @@ +package kv diff --git a/go.mod b/go.mod index 9ef9c76..62133d1 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,12 @@ module github.com/ldez/traefik-certs-dumper +go 1.12 + require ( github.com/cenkalti/backoff v2.1.1+incompatible // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/go-acme/lego v2.5.0+incompatible + github.com/mitchellh/go-homedir v1.1.0 github.com/spf13/cobra v0.0.3 - github.com/spf13/pflag v1.0.3 // indirect - github.com/xenolf/lego v2.2.0+incompatible - golang.org/x/crypto v0.0.0-20190208162236-193df9c0f06f // indirect - gopkg.in/square/go-jose.v2 v2.2.2 // indirect + github.com/spf13/viper v1.3.2 + gopkg.in/square/go-jose.v2 v2.3.1 // indirect ) diff --git a/go.sum b/go.sum index 945f965..631783b 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,48 @@ +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY= github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/go-acme/lego v2.5.0+incompatible h1:5fNN9yRQfv8ymH3DSsxla+4aYeQt2IgfZqHKVnK8f0s= +github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/xenolf/lego v2.2.0+incompatible h1:r4UAcpgPmX3j0aThoVrRM1FFLcvyy08UyGbIwFU4zoQ= -github.com/xenolf/lego v2.2.0+incompatible/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY= -golang.org/x/crypto v0.0.0-20190208162236-193df9c0f06f h1:ETU2VEl7TnT5bl7IvuKEzTDpplg5wzGYsOCAPhdoEIg= -golang.org/x/crypto v0.0.0-20190208162236-193df9c0f06f/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA= -gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a h1:1n5lsVfiQW3yfsRGu98756EH1YthsFqr/5mxHduZW2A= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/square/go-jose.v2 v2.3.1 h1:SK5KegNXmKmqE342YYN2qPHEnUYeoMiXXl1poUlI+o4= +gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/main.go b/main.go index b629b69..1daecea 100644 --- a/main.go +++ b/main.go @@ -1,126 +1,7 @@ package main -import ( - "fmt" - "io/ioutil" - "os" - "path/filepath" - "strconv" - - "github.com/spf13/cobra" -) +import "github.com/ldez/traefik-certs-dumper/cmd" func main() { - var rootCmd = &cobra.Command{ - Use: "traefik-certs-dumper", - Short: "Dump Let's Encrypt certificates from Traefik", - Long: `Dump the content of the "acme.json" file from Traefik to certificates.`, - Version: version, - } - - var dumpCmd = &cobra.Command{ - Use: "dump", - Short: "Dump Let's Encrypt certificates from Traefik", - Long: `Dump the content of the "acme.json" file from Traefik to certificates.`, - PreRunE: func(cmd *cobra.Command, args []string) error { - crtExt := cmd.Flag("crt-ext").Value.String() - keyExt := cmd.Flag("key-ext").Value.String() - - subDir, _ := strconv.ParseBool(cmd.Flag("domain-subdir").Value.String()) - if !subDir { - if crtExt == keyExt { - return fmt.Errorf("--crt-ext (%q) and --key-ext (%q) are identical, in this case --domain-subdir is required", crtExt, keyExt) - } - } - - return nil - }, - RunE: func(cmd *cobra.Command, _ []string) error { - acmeFile := cmd.Flag("source").Value.String() - dumpPath := cmd.Flag("dest").Value.String() - - crtInfo := fileInfo{ - Name: cmd.Flag("crt-name").Value.String(), - Ext: cmd.Flag("crt-ext").Value.String(), - } - - keyInfo := fileInfo{ - Name: cmd.Flag("key-name").Value.String(), - Ext: cmd.Flag("key-ext").Value.String(), - } - - subDir, _ := strconv.ParseBool(cmd.Flag("domain-subdir").Value.String()) - - err := dump(acmeFile, dumpPath, crtInfo, keyInfo, subDir) - if err != nil { - return err - } - - return tree(dumpPath, "") - }, - } - - dumpCmd.Flags().String("source", "./acme.json", "Path to 'acme.json' file.") - dumpCmd.Flags().String("dest", "./dump", "Path to store the dump content.") - dumpCmd.Flags().String("crt-ext", ".crt", "The file extension of the generated certificates.") - dumpCmd.Flags().String("crt-name", "certificate", "The file name (without extension) of the generated certificates.") - dumpCmd.Flags().String("key-ext", ".key", "The file extension of the generated private keys.") - dumpCmd.Flags().String("key-name", "privatekey", "The file name (without extension) of the generated private keys.") - dumpCmd.Flags().Bool("domain-subdir", false, "Use domain as sub-directory.") - rootCmd.AddCommand(dumpCmd) - - var versionCmd = &cobra.Command{ - Use: "version", - Short: "Display version", - Run: func(_ *cobra.Command, _ []string) { - displayVersion(rootCmd.Name()) - }, - } - - rootCmd.AddCommand(versionCmd) - - if err := rootCmd.Execute(); err != nil { - fmt.Println(err) - os.Exit(1) - } -} - -func tree(root, indent string) error { - fi, err := os.Stat(root) - if err != nil { - return fmt.Errorf("could not stat %s: %v", root, err) - } - - fmt.Println(fi.Name()) - if !fi.IsDir() { - return nil - } - - fis, err := ioutil.ReadDir(root) - if err != nil { - return fmt.Errorf("could not read dir %s: %v", root, err) - } - - var names []string - for _, fi := range fis { - if fi.Name()[0] != '.' { - names = append(names, fi.Name()) - } - } - - for i, name := range names { - add := "│ " - if i == len(names)-1 { - fmt.Printf(indent + "└──") - add = " " - } else { - fmt.Printf(indent + "├──") - } - - if err := tree(filepath.Join(root, name), indent+add); err != nil { - return err - } - } - - return nil + cmd.Execute() }