Skip to content

Commit 1692201

Browse files
committed
feat(add): Default public key to <private key>.pub if not given
1 parent f604333 commit 1692201

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,28 +86,30 @@ Injects SSL keys to `ssh-agent` stored in 1Password, Bitwarden and AWS S3.
8686

8787
## How to use it
8888

89-
1. Login to Bitwarden or 1Password with `bw` or `op`. If you are using S3, set your credentials.
89+
1. Login to Bitwarden (and export its session key) or 1Password with `bw` or `op`. If you are using S3, set your credentials.
9090
1. Add your key pairs to your password manager.
9191

92+
> **NOTE:** If not public key is given, the private one, postfixed with `.pub`, will be used.
93+
9294
For 1Password
9395
---
9496

9597
```shell
96-
ssh-manager add --name my-another-server --private-key $PK_PATH --public-key $PUB_KEY_PATH --provider op
98+
ssh-manager add --name my-another-server --private-key $PK_PATH [ --public-key $PUB_KEY_PATH ] --provider op
9799
```
98100

99101
For Bitwarden
100102
---
101103

102104
```shell
103-
ssh-manager add --name my-server --private-key $PK_PATH --public-key $PUB_KEY_PATH --provider bw
105+
ssh-manager add --name my-server --private-key $PK_PATH [ --public-key $PUB_KEY_PATH ] --provider bw
104106
```
105107

106108
For AWS S3
107109
---
108110

109111
```shell
110-
ssh-manager add --name my-another-server --private-key $PK_PATH --public-key $PUB_KEY_PATH --provider s3 --bucket my-bucket
112+
ssh-manager add --name my-another-server --private-key $PK_PATH [ --public-key $PUB_KEY_PATH ] --provider s3 --bucket my-bucket
111113
```
112114

113115
## Improvements to be made

cmd/add.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ func setupAddCommand(cmd *cobra.Command) {
2121

2222
cmd.Flags().String("public-key", "", "Public Key file")
2323

24-
if err := cmd.MarkFlagRequired("public-key"); err != nil {
25-
log.Fatalf("Lethal damage: %s\n\n", err)
26-
}
27-
2824
cmd.Flags().String("private-key", "", "Private Key file")
2925

3026
if err := cmd.MarkFlagRequired("private-key"); err != nil {
@@ -52,14 +48,14 @@ func Add() *cobra.Command {
5248
providerName, _ := cmd.Flags().GetString("provider")
5349
bucket, _ := cmd.Flags().GetString("bucket")
5450

55-
publicKey, err := readFile(publicKeyFileName)
51+
privateKey, err := readFile(privateKeyFileName)
5652
if err != nil {
5753
return err
5854
}
5955

60-
privateKey, err := readFile(privateKeyFileName)
56+
publicKey, err := readFile(publicKeyFileName)
6157
if err != nil {
62-
return err
58+
publicKey = privateKey + ".pub"
6359
}
6460

6561
item := provider.Item{

0 commit comments

Comments
 (0)