Skip to content
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

keyring's encrypted file backend integration #5355

Merged
merged 34 commits into from
Dec 11, 2019
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
376fe1f
Start working on keyring's encrypted file backend integration
Dec 3, 2019
a97002e
Store keyring and test keyring files under ~/.appcli/{,test-}keyring …
Dec 4, 2019
32c374c
Keybase -> keyring migration is in fact an API and ABI breakage break…
Dec 4, 2019
79f691d
Merge branch 'master' into alessio/keyring-file-backend
Dec 4, 2019
7a11d4e
Merge branch 'master' into alessio/keyring-file-backend
fedekunze Dec 5, 2019
14c1252
Improve keyring docs
Dec 5, 2019
69bb4af
Merge branch 'master' into alessio/keyring-file-backend
Dec 5, 2019
411cb42
Replace COSMOS_SDK_TEST_KEYRING env var with a global --keybase-backe…
Dec 6, 2019
9f0c12e
Merge branch 'master' into alessio/keyring-file-backend
Dec 6, 2019
5e963a9
Merge branch 'master' into alessio/keyring-file-backend
Dec 6, 2019
ed89b9c
Add tests
Dec 6, 2019
aca7026
Cosmetic adjustments
Dec 6, 2019
fd2355e
Fix gentx
Dec 6, 2019
abc25e0
Bind flag
Dec 6, 2019
8eaa41b
Merge branch 'master' into alessio/keyring-file-backend
Dec 6, 2019
563e2f3
Simplify flag handling
Dec 7, 2019
6b925f3
Add test case
Dec 8, 2019
e72641c
Add test case
Dec 8, 2019
ed05225
Update CHANGELOG
Dec 8, 2019
fc190ab
Update
Dec 8, 2019
c4b3fa6
Merge branch 'master' into alessio/keyring-file-backend
Dec 9, 2019
dcd967e
Merge branch 'master' into alessio/keyring-file-backend
alexanderbez Dec 9, 2019
5f777bf
Create README.md
Dec 9, 2019
810083f
Typo
Dec 9, 2019
7fc84fb
Fixes
Dec 9, 2019
34ced6d
Update crypto/keys/README.md
Dec 9, 2019
c2b248f
Update crypto/keys/README.md
Dec 9, 2019
6b3b8f3
Fix NewInMemory description
Dec 9, 2019
afbb163
Add info on where keyring files are stored
Dec 9, 2019
d1cfa57
Merge branch 'master' into alessio/keyring-file-backend
alexanderbez Dec 10, 2019
1701751
Merge branch 'alessio/keyring-file-backend' of github.com:cosmos/cosm…
Dec 10, 2019
d79acf2
Merge branch 'master' into alessio/keyring-file-backend
Dec 10, 2019
81bf4fb
Merge branch 'master' into alessio/keyring-file-backend
alexanderbez Dec 11, 2019
24ba280
Merge branch 'master' into alessio/keyring-file-backend
Dec 11, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Store keyring and test keyring files under ~/.appcli/{,test-}keyring …
…respectively
  • Loading branch information
Alessio Treglia committed Dec 4, 2019
commit a97002eb998048855f8d952bb3d74e4a2d0445f2
12 changes: 9 additions & 3 deletions crypto/keys/keyring.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ import (
"github.com/cosmos/cosmos-sdk/types"
)

const (
keyringDirName = "keyring"
testKeyringDirName = "keyring-test"
)

var _ Keybase = keyringKeybase{}

// keyringKeybase implements the Keybase interface by using the Keyring library
Expand Down Expand Up @@ -468,7 +473,7 @@ func lkbToKeyringConfig(name, dir string, buf io.Reader, test bool) keyring.Conf
return keyring.Config{
AllowedBackends: []keyring.BackendType{"file"},
ServiceName: name,
FileDir: dir,
FileDir: filepath.Join(dir, testKeyringDirName),
FilePasswordFunc: fakePrompt,
}
}
Expand All @@ -481,11 +486,12 @@ func lkbToKeyringConfig(name, dir string, buf io.Reader, test bool) keyring.Conf
}

func newFileBackendKeyringConfig(name, dir string, buf io.Reader) keyring.Config {
fileDir := filepath.Join(dir, keyringDirName)
return keyring.Config{
AllowedBackends: []keyring.BackendType{"file"},
ServiceName: name,
FileDir: dir,
FilePasswordFunc: newRealPrompt(dir, buf),
FileDir: fileDir,
FilePasswordFunc: newRealPrompt(fileDir, buf),
}
}

Expand Down