openatom_foundation
/
bitxhub
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #284 from meshplus/fix/fix-cmd 

fix(cmd): fix some bugs in command
This commit is contained in:
jzhe 2020-12-15 22:26:09 +08:00 committed by GitHub
parent 9c9078c8e5 1b6a1991aa
commit 57952282bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/bitxhub/cert.go
View File

@ -39,7 +39,7 @@ var certCMD = cli.Command{
var caCMD = cli.Command{ var caCMD = cli.Command{
Name: "ca", Name: "ca",
Usage: "generate ca cert and private key", Usage: "Generate ca cert and private key",
Action: func(ctx *cli.Context) error { Action: func(ctx *cli.Context) error {
privKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader) privKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
if err != nil { if err != nil {
@ -88,12 +88,12 @@ var csrCMD = cli.Command{
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{
Name: "key", Name: "key",
Usage: "Specific private key path", Usage: "Specify Secp256r1 private key path",
Required: true, Required: true,
}, },
cli.StringFlag{ cli.StringFlag{
Name: "org", Name: "org",
Usage: "Specific organization name", Usage: "Specify organization name",
Required: true, Required: true,
}, },
cli.StringFlag{ cli.StringFlag{
@ -113,7 +113,7 @@ var csrCMD = cli.Command{
block, _ := pem.Decode(privData) block, _ := pem.Decode(privData)
privKey, err := x509.ParseECPrivateKey(block.Bytes) privKey, err := x509.ParseECPrivateKey(block.Bytes)
if err != nil { if err != nil {
return fmt.Errorf("parse private key: %w", err) return fmt.Errorf("Error occured when parsing private key. Please make sure it's secp256r1 private key.")
} }
template := &x509.CertificateRequest{ template := &x509.CertificateRequest{
@ -152,21 +152,21 @@ var issueCMD = cli.Command{
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{
Name: "csr", Name: "csr",
Usage: "Special csr path", Usage: "Specify csr path",
Required: true, Required: true,
}, },
cli.StringFlag{ cli.StringFlag{
Name: "is_ca", Name: "is_ca",
Usage: "is ca", Usage: "Specify whether it's ca",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "key", Name: "key",
Usage: "ca priv path", Usage: "Specify ca's secp256r1 private key path",
Required: true, Required: true,
}, },
cli.StringFlag{ cli.StringFlag{
Name: "cert", Name: "cert",
Usage: "ca certification path", Usage: "Specify ca certification path",
Required: true, Required: true,
}, },
cli.StringFlag{ cli.StringFlag{
@ -188,7 +188,7 @@ var issueCMD = cli.Command{
block, _ := pem.Decode(privData) block, _ := pem.Decode(privData)
privKey, err := x509.ParseECPrivateKey(block.Bytes) privKey, err := x509.ParseECPrivateKey(block.Bytes)
if err != nil { if err != nil {
return fmt.Errorf("parse ca private key: %w", err) return fmt.Errorf("Error occured when parsing private key. Please make sure it's secp256r1 private key.")
} }
caCertData, err := ioutil.ReadFile(certPath) caCertData, err := ioutil.ReadFile(certPath)

12
cmd/bitxhub/key.go
View File

@ -37,15 +37,15 @@ func keyCMD() cli.Command {
}, },
{ {
Name: "convert", Name: "convert",
Usage: "Convert new key file from private key", Usage: "Convert the Secp256k1 private key to BitXHub key format",
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.BoolFlag{ cli.BoolFlag{
Name: "save,s", Name: "save,s",
Usage: "save key into repo", Usage: "Save BitXHub key into repo",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "priv", Name: "priv",
Usage: "private key path", Usage: "Specify private key path",
Required: true, Required: true,
}, },
}, },
@ -53,17 +53,17 @@ func keyCMD() cli.Command {
}, },
{ {
Name: "show", Name: "show",
Usage: "Show key from cert", Usage: "Show BitXHub key from repo",
Action: showKey, Action: showKey,
}, },
{ {
Name: "address", Name: "address",
Usage: "Show address from private key", Usage: "Show address from Secp256k1 private key",
Action: getAddress, Action: getAddress,
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{
Name: "path", Name: "path",
Usage: "Specific private key path", Usage: "Specify private key path",
Required: true, Required: true,
}, },
}, },