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.

Sign up for GitHub

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

Jump to bottom

Allow the user to configure a pinentry #202

Closed
wants to merge 14 commits into from
Closed

Allow the user to configure a pinentry #202

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a67701e
Allow the user to configure a pinentry
rendaw Feb 21, 2018
6a0e1cf
Fixed config consistency
rendaw Feb 22, 2018
bb9ec4d
Lint fixes
rendaw Feb 22, 2018
c7cb578
Refactor config parsing
rendaw Feb 22, 2018
ef8e77e
Use config in ssh verbosity; lint fixes
rendaw Feb 22, 2018
23d9e8d
Merge remote-tracking branch 'upstream/master' into configure-pinentry
rendaw Feb 22, 2018
5f6aae8
Also remove pylint warnings
rendaw Feb 22, 2018
fa8b71b
Make pin/passentry options long-form only
rendaw Feb 22, 2018
8da63a1
Redo pin/passentry config for SSH using config argparse
rendaw Feb 23, 2018
1e61b62
Forgot to add pin/passentry args to ssh agent
rendaw Feb 23, 2018
0247c3d
Log when pin/passentry not found
rendaw Feb 23, 2018
da59ba4
Fix lint
rendaw Feb 23, 2018
8d121dd
Merge remote-tracking branch 'upstream/master' into configure-pinentry
rendaw Feb 27, 2018
316e407
Add documentation for PIN entry
rendaw Feb 27, 2018
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
Forgot to add pin/passentry args to ssh agent
  • Loading branch information
@rendaw
rendaw committed Feb 23, 2018
commit 1e61b62dd76a147065ff8bb293c2f51ff6ed9743
13 changes: 9 additions & 4 deletions libagent/ssh/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ def create_agent_parser(device_type):
help='proto://[user@]host[:port][/path]')
p.add_argument('command', type=str, nargs='*', metavar='ARGUMENT',
help='command to run under the SSH agent')
p.add_argument('--pinentry', help='Configure a GPG PINENTRY program')
p.add_argument('--passentry',
help=('Configure a GPG PINENTRY program for passphrase '
'entry'))
return p


Expand Down Expand Up @@ -255,10 +259,11 @@ def main(device_type):
command = os.environ['SHELL']
sys.stdin.close()

config = {
'pinentry-program': args.pinentry,
'passentry-program': args.passentry,
}
config = {}
if args.pinentry:
config['pinentry-program'] = args.pinentry
if args.passentry:
config['passentry-program'] = args.passentry
conn = JustInTimeConnection(
conn_factory=lambda: client.Client(device_type(config=config)),
identities=identities, public_keys=public_keys)
Expand Down