Skip to content
Merged
Changes from all commits
Commits
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
24 changes: 18 additions & 6 deletions autoload/pass/get.vim
Original file line number Diff line number Diff line change
Expand Up @@ -69,36 +69,47 @@ endfunction

" '' or passphrase
function! pass#get#passphrase() abort
if exists('s:_passphrase')
return s:_passphrase
if exists('s:_get_passphrase')
return s:_get_passphrase()
endif

" passphrase detect
let s:_passphrase = ''
if g:pass_use_agent
" work pinentry
return s:_passphrase
return ''
endif

" check loop
let s:_passphrase = ''

for i in range(g:pass_passphrase_verify_retry)
let s:_passphrase = inputsecret('passphrase: ')
" verify
if pass#util#passphrase_verify(pass#get#id(), s:_passphrase)
" success
redraw!
" setup passphrase closure
function! s:_generate_get_passphrase_closure(passphrase)
return {-> a:passphrase}
endfunction

let s:_get_passphrase = s:_generate_get_passphrase_closure(s:_passphrase)

unlet s:_passphrase
" exit
break
endif

unlet s:_passphrase

" failure
redraw!
if (i + 1) == g:pass_passphrase_verify_retry
echo 'passphrase verify failed [' .
\ string(i + 1) . '/' .
\ string(g:pass_passphrase_verify_retry) . ']' .
\ ' abort'
unlet s:_passphrase
" All failed, throw exception
throw 'vim-pss: passphrase verify all failed'
else
echo 'passphrase verify failed [' .
Expand All @@ -110,7 +121,8 @@ function! pass#get#passphrase() abort
endif
endfor

return get(s:, '_passphrase', '')
" Passed verification
return s:_get_passphrase()
endfunction

" path
Expand Down