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

Fixed errors in template generator #952

Merged
merged 3 commits into from
Apr 17, 2017
Merged

Fixed errors in template generator #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eec5ae5
fixed port type
Apr 16, 2017
5f30780
missed exploit.py template
reu-res Apr 16, 2017
3c5b73e
fixed condition availability parameters
reu-res Apr 16, 2017
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
4 changes: 2 additions & 2 deletions pwnlib/commandline/template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

parser.add_argument('exe', nargs='?', help='Target binary')
parser.add_argument('--host', help='Remote host / SSH server')
parser.add_argument('--port', help='Remote port / SSH port')
parser.add_argument('--port', help='Remote port / SSH port', type=int)
parser.add_argument('--user', help='SSH Username')
parser.add_argument('--pass', help='SSH Password', dest='password')
parser.add_argument('--path', help='Remote path of file on SSH server')
Expand All @@ -34,7 +34,7 @@ def main(args):
# For the SSH scenario, check that the binary is at the
# same path on the remote host.
if args.user:
if not args.path or args.exe:
if not (args.path or args.exe):
log.error("Must specify --path or a exe")

s = ssh(args.user, args.host, args.port or 22, args.password or None)
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
'data/binutils/*',
'data/includes/*.h',
'data/includes/*/*.h',
'data/templates/pwnup.mako',
] + templates,
},
entry_points = {'console_scripts': console_scripts},
Expand Down