mirrors/age
1
0
Fork 0
mirror of https://github.com/FiloSottile/age.git synced 2026-09-19 22:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

internal/plugin: update to latest plugin spec

Browse Source 
The main change is that phase 2 of the wrapping state machine is
interactive to accommodate symmetric plugins.
This commit is contained in:
Filippo Valsorda
2022-05-24 15:56:22 +02:00
parent 01b56b117c
commit 7bad9c2ad8
2 changed files with 98 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/age/parse.go
+10 -4
View File
@@ -34,7 +34,13 @@ func (gitHubRecipientError) Error() string {
func parseRecipient(arg string) (age.Recipient, error) {
switch {
case strings.HasPrefix(arg, "age1") && strings.Count(arg, "1") > 1:
return plugin.NewRecipient(arg)
r, err := plugin.NewRecipient(arg)
if err != nil {
return nil, err
}
r.DisplayMessage = pluginDisplayMessage(r.Name())
r.RequestValue = pluginRequestSecret(r.Name())
return r, nil
case strings.HasPrefix(arg, "age1"):
return age.ParseX25519Recipient(arg)
case strings.HasPrefix(arg, "ssh-"):
@@ -206,7 +212,7 @@ func parseIdentity(s string) (age.Identity, error) {
return nil, err
}
i.DisplayMessage = pluginDisplayMessage(i.Name())
i.RequestSecret = pluginRequestSecret(i.Name())
i.RequestValue = pluginRequestSecret(i.Name())
return i, nil
case strings.HasPrefix(s, "AGE-SECRET-KEY-1"):
return age.ParseX25519Identity(s)
@@ -305,8 +311,8 @@ func pluginDisplayMessage(name string) func(string) error {
}
}
func pluginRequestSecret(name string) func(string) (string, error) {
return func(message string) (string, error) {
func pluginRequestSecret(name string) func(string, bool) (string, error) {
return func(message string, _ bool) (string, error) {
fmt.Fprintf(os.Stderr, "[age-plugin-%s] %v\n", name, message)
prompt := fmt.Sprintf("[age-plugin-%s] Enter value:", name)
secret, err := readPassphrase(prompt)