-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Keymaster tool preview #150
Open
cviecco
wants to merge
5
commits into
Cloud-Foundations:master
Choose a base branch
from
cviecco:keymaster-tool
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
12e1734
initial commands
cviecco 48c6cdf
now read secret from aws secret manager
cviecco 8f94af9
outpur in ssh or pem format
cviecco d9ee25c
Merge remote-tracking branch 'upstream/master' into keymaster-tool
cviecco 6d68a23
module fixes
cviecco File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,265 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "crypto" | ||
| "crypto/ecdsa" | ||
| "crypto/ed25519" | ||
| "crypto/rand" | ||
| "crypto/rsa" | ||
| "crypto/x509" | ||
| "encoding/base64" | ||
| "encoding/pem" | ||
| "fmt" | ||
| "io" | ||
| "io/ioutil" | ||
| stdlog "log" | ||
| "os" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/aws/session" | ||
| "github.com/aws/aws-sdk-go/service/secretsmanager" | ||
| "github.com/howeyc/gopass" | ||
| "golang.org/x/crypto/openpgp" | ||
| "golang.org/x/crypto/openpgp/armor" | ||
| "golang.org/x/crypto/ssh" | ||
| "gopkg.in/alecthomas/kingpin.v2" | ||
|
|
||
| "github.com/Cloud-Foundations/Dominator/lib/log/cmdlogger" | ||
| "github.com/Cloud-Foundations/golib/pkg/log" | ||
| "github.com/Cloud-Foundations/keymaster/lib/certgen" | ||
| ) | ||
|
|
||
| var ( | ||
| app = kingpin.New("keyutil", "Tooling for puresigner2 secret management") | ||
| debug = app.Flag("debug", "Enable debug mode.").Bool() | ||
| inSecretARN = app.Flag("secret-arn", "Location of secret to use").String() | ||
| inAWSRegion = app.Flag("aws-region", "AWS region for secret").Default("us-west-2").String() | ||
|
|
||
| generateCmd = app.Command("generate-new", "Generate a new keypair and encrypt") | ||
| keyTypeIn = generateCmd.Flag("type", "Type of Key (ed25519 | rsa)").Default("ed25519").String() | ||
|
|
||
| printPublicCmd = app.Command("printPublic", "Verify EMS secret") | ||
| printPublicFilenameIn = printPublicCmd.Flag("inFilename", "File to Read").Required().String() | ||
| printFormat = printPublicCmd.Flag("printFormat", "format to use pem|ssh").Default("pem").String() | ||
| ) | ||
|
|
||
| const rsaBits = 3072 | ||
|
|
||
| func getPasswordFromConsole() ([]byte, error) { | ||
| fmt.Fprintf(os.Stderr, "Passphrase for key ") | ||
| return gopass.GetPasswd() | ||
| } | ||
|
|
||
| func getPassphraseFromAWS(awsSecretId string, awsRegion string) ([]byte, error) { | ||
| svc := secretsmanager.New(session.New(), | ||
| aws.NewConfig().WithRegion(awsRegion)) | ||
| input := &secretsmanager.GetSecretValueInput{ | ||
| SecretId: aws.String(awsSecretId), | ||
| VersionStage: aws.String("AWSCURRENT"), // VersionStage defaults to AWSCURRENT if unspecified | ||
| } | ||
| result, err := svc.GetSecretValue(input) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return []byte(*result.SecretString), nil | ||
|
|
||
| } | ||
|
|
||
| func getPassPhrase(secretArn string, awsRegion string) ([]byte, error) { | ||
| if secretArn != "" { | ||
| return getPassphraseFromAWS(secretArn, awsRegion) | ||
| } | ||
| return getPasswordFromConsole() | ||
|
|
||
| } | ||
|
|
||
| func armoredEncryptPrivateKey(privateKey interface{}, passphrase []byte) ([]byte, error) { | ||
| encryptionType := "PGP MESSAGE" | ||
| armoredBuf := new(bytes.Buffer) | ||
| armoredWriter, err := armor.Encode(armoredBuf, encryptionType, nil) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| var plaintextWriter io.WriteCloser | ||
| plaintextWriter, err = openpgp.SymmetricallyEncrypt(armoredWriter, | ||
| passphrase, nil, nil) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| derPrivateKey, err := x509.MarshalPKCS8PrivateKey(privateKey) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| privateKeyPEM := &pem.Block{ | ||
| Type: "PRIVATE KEY", | ||
| Bytes: derPrivateKey, | ||
| } | ||
| if err := pem.Encode(plaintextWriter, privateKeyPEM); err != nil { | ||
| return nil, err | ||
| } | ||
| if err := plaintextWriter.Close(); err != nil { | ||
| return nil, err | ||
| } | ||
| if err := armoredWriter.Close(); err != nil { | ||
| return nil, err | ||
| } | ||
| return armoredBuf.Bytes(), nil | ||
| } | ||
|
|
||
| func generateNewKeyPair(passPhrase []byte, keyType string, outWriter io.Writer, logger log.DebugLogger) error { | ||
| var privateKey crypto.Signer | ||
| var err error | ||
| switch keyType { | ||
| case "ed25519": | ||
| _, privateKey, err = ed25519.GenerateKey(rand.Reader) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| case "rsa": | ||
| privateKey, err = rsa.GenerateKey(rand.Reader, rsaBits) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| default: | ||
| return fmt.Errorf("bad key type") | ||
| } | ||
| armoredBytes, err := armoredEncryptPrivateKey(privateKey, passPhrase) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| _, err = outWriter.Write(armoredBytes) | ||
|
|
||
| return err | ||
| } | ||
|
|
||
| func pgpDecryptFileData(cipherText []byte, password []byte) ([]byte, error) { | ||
| decbuf := bytes.NewBuffer(cipherText) | ||
| armorBlock, err := armor.Decode(decbuf) | ||
| if err != nil { | ||
| fmt.Printf("ciphertext=%s", string(cipherText)) | ||
| return nil, fmt.Errorf("cannot decode armored file") | ||
| } | ||
| failed := false | ||
| prompt := func(keys []openpgp.Key, symmetric bool) ([]byte, error) { | ||
| // If the given passphrase isn't correct, the function will be called | ||
| // again, forever. | ||
| // This method will fail fast. | ||
| // Ref: https://godoc.org/golang.org/x/crypto/openpgp#PromptFunction | ||
| if failed { | ||
| return nil, fmt.Errorf("decryption failed") | ||
| } | ||
| failed = true | ||
| return password, nil | ||
| } | ||
| md, err := openpgp.ReadMessage(armorBlock.Body, nil, prompt, nil) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("cannot decrypt key: %s", err) | ||
| } | ||
| return ioutil.ReadAll(md.UnverifiedBody) | ||
| } | ||
|
|
||
| func decryptDecodeArmoredPrivateKey(cipherText []byte, passPhrase []byte) (crypto.Signer, error) { | ||
| plaintext, err := pgpDecryptFileData(cipherText, passPhrase) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return certgen.GetSignerFromPEMBytes(plaintext) | ||
| } | ||
|
|
||
| func goSSHPubToFileString(pub ssh.PublicKey, comment string) (string, error) { | ||
| pubBytes := pub.Marshal() | ||
| encoded := base64.StdEncoding.EncodeToString(pubBytes) | ||
| return pub.Type() + " " + encoded + " " + comment, nil | ||
| } | ||
|
|
||
| //copied from https://golang.org/src/crypto/tls/generate_cert.go | ||
| func publicKey(priv interface{}) interface{} { | ||
| switch k := priv.(type) { | ||
| case *rsa.PrivateKey: | ||
| return &k.PublicKey | ||
| case *ecdsa.PrivateKey: | ||
| return &k.PublicKey | ||
| case ed25519.PrivateKey: | ||
| return k.Public().(ed25519.PublicKey) | ||
| case *ed25519.PrivateKey: | ||
| return k.Public().(*ed25519.PublicKey) | ||
| default: | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func printPublicKey(passPhrase []byte, inFilename string, outFormat string, outWriter io.Writer, logger log.DebugLogger) error { | ||
| inFile, err := os.Open(inFilename) // For read access. | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer inFile.Close() | ||
| cipherText, err := io.ReadAll(inFile) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| signer, err := decryptDecodeArmoredPrivateKey(cipherText, passPhrase) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| pubKey := publicKey(signer) | ||
| if pubKey == nil { | ||
| return fmt.Errorf("Invalid private key type") | ||
| } | ||
| switch outFormat { | ||
| case "pem": | ||
| pubKeyBytes, err := x509.MarshalPKIXPublicKey(pubKey) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| block := &pem.Block{ | ||
| Type: "PUBLIC KEY", | ||
| Bytes: pubKeyBytes, | ||
| } | ||
| return pem.Encode(outWriter, block) | ||
| case "ssh": | ||
| sshPub, err := ssh.NewPublicKey(pubKey) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| sshPubFileString, err := goSSHPubToFileString(sshPub, "keymaster") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| _, err = fmt.Fprintf(outWriter, "%s\n", sshPubFileString) | ||
| return err | ||
|
|
||
| default: | ||
| return fmt.Errorf("invalid outpur format") | ||
| } | ||
| } | ||
|
|
||
| func main() { | ||
|
|
||
| logger := cmdlogger.New() | ||
| //var err error | ||
| switch kingpin.MustParse(app.Parse(os.Args[1:])) { | ||
| // Register user | ||
| case generateCmd.FullCommand(): | ||
| passPhrase, err := getPassPhrase(*inSecretARN, *inAWSRegion) | ||
| if err != nil { | ||
| stdlog.Fatalf("Error: %s", err) | ||
| } | ||
| err = generateNewKeyPair(passPhrase, *keyTypeIn, os.Stdout, logger) | ||
| if err != nil { | ||
| stdlog.Fatalf("Error: %s", err) | ||
| } | ||
| case printPublicCmd.FullCommand(): | ||
| passPhrase, err := getPassPhrase(*inSecretARN, *inAWSRegion) | ||
| if err != nil { | ||
| stdlog.Fatalf("Error: %s", err) | ||
| } | ||
| err = printPublicKey(passPhrase, *printPublicFilenameIn, *printFormat, os.Stdout, logger) | ||
| if err != nil { | ||
| stdlog.Fatalf("Error: %s", err) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We're using Cobra here. What do you think of using that instead?
https://pkg.go.dev/github.com/spf13/cobra