mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 04:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prompt for PIN on tpm-backed ssh keys

Browse source
This commit is contained in:
oliverpool 2024-10-29 20:40:15 +01:00
parent a0dd3bec8e
commit ed73e514d0
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkg/commands/oscommands/cmd_obj_runner.go
View file

@ -376,7 +376,10 @@ func (self *cmdObjRunner) getCheckForCredentialRequestFunc() func([]byte) (Crede
`Password\s*for\s*'.+':`: Password, `Password\s*for\s*'.+':`: Password,
`Username\s*for\s*'.+':`: Username, `Username\s*for\s*'.+':`: Username,
`Enter\s*passphrase\s*for\s*key\s*'.+':`: Passphrase, `Enter\s*passphrase\s*for\s*key\s*'.+':`: Passphrase,
`Enter\s*PIN\s*for\s*.+\s*key\s*.+:`: PIN, // With a tpm, ssh prompts:
// Enter PIN for '%s':
// https://github.com/openssh/libopenssh/blob/05dfdd5f54d9a1bae5544141a7ee65baa3313ecd/ssh/ssh-pkcs11.c#L251
`Enter\s*PIN\s*for\s*.+\s*(key\s*.+|'.+'):`: PIN,
`.*2FA Token.*`: Token, `.*2FA Token.*`: Token,
} }

6
pkg/commands/oscommands/cmd_obj_runner_test.go
View file

@ -94,6 +94,12 @@ func TestProcessOutput(t *testing.T) {
output: "Enter PIN for key '123':", output: "Enter PIN for key '123':",
expectedToWrite: "pin", expectedToWrite: "pin",
}, },
{
name: "tpm pin prompt",
promptUserForCredential: defaultPromptUserForCredential,
output: "Enter PIN for 'label':", // https://github.com/tpm2-software/tpm2-pkcs11/blob/d7fd660dd3ad2b8382afc57a768872032bd71d64/docs/SSH.md?plain=1#L86S
expectedToWrite: "pin",
},
{ {
name: "2FA token prompt", name: "2FA token prompt",
promptUserForCredential: defaultPromptUserForCredential, promptUserForCredential: defaultPromptUserForCredential,