holm/httpie-cli
1
1
Fork 0
forked from extern/httpie-cli
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved password prompt.

Browse Source
This commit is contained in:
Jakub Roztocil 2012-08-04 16:59:36 +02:00
parent 747b87c4e6
commit 94c77c9bfc
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
httpie/core.py
View File

@ -31,8 +31,6 @@ from .cli import parser
FORM = 'application/x-www-form-urlencoded; charset=utf-8' FORM = 'application/x-www-form-urlencoded; charset=utf-8'
JSON = 'application/json; charset=utf-8' JSON = 'application/json; charset=utf-8'
HTTP = 'http://'
HTTPS = 'https://'
def get_response(args, env): def get_response(args, env):
@ -65,15 +63,9 @@ def get_response(args, env):
'digest': requests.auth.HTTPDigestAuth, 'digest': requests.auth.HTTPDigestAuth,
}[args.auth_type](args.auth.key, args.auth.value) }[args.auth_type](args.auth.key, args.auth.value)
if not (args.url.startswith(HTTP) or args.url.startswith(HTTPS)):
scheme = HTTPS if env.progname == 'https' else HTTP
url = scheme + args.url
else:
url = args.url
return requests.request( return requests.request(
method=args.method.lower(), method=args.method.lower(),
url=url, url=args.url,
headers=args.headers, headers=args.headers,
data=args.data, data=args.data,
verify={'yes': True, 'no': False}.get(args.verify, args.verify), verify={'yes': True, 'no': False}.get(args.verify, args.verify),

15
httpie/input.py
View File

@ -16,13 +16,15 @@ except ImportError:
OrderedDict = dict OrderedDict = dict
from requests.structures import CaseInsensitiveDict from requests.structures import CaseInsensitiveDict
from requests.compat import str from requests.compat import str, urlparse
from . import __version__ from . import __version__
HTTP_POST = 'POST' HTTP_POST = 'POST'
HTTP_GET = 'GET' HTTP_GET = 'GET'
HTTP = 'http://'
HTTPS = 'https://'
# Various separators used in args # Various separators used in args
@ -106,9 +108,13 @@ class Parser(argparse.ArgumentParser):
if not env.stdin_isatty: if not env.stdin_isatty:
self._body_from_file(args, env.stdin) self._body_from_file(args, env.stdin)
if not (args.url.startswith(HTTP) or args.url.startswith(HTTPS)):
scheme = HTTPS if env.progname == 'https' else HTTP
args.url = scheme + args.url
if args.auth and not args.auth.has_password(): if args.auth and not args.auth.has_password():
# Stdin already read (if not a tty) so it's save to prompt. # Stdin already read (if not a tty) so it's save to prompt.
args.auth.prompt_password() args.auth.prompt_password(urlparse(args.url).netloc)
if args.prettify == PRETTIFY_STDOUT_TTY_ONLY: if args.prettify == PRETTIFY_STDOUT_TTY_ONLY:
args.prettify = env.stdout_isatty args.prettify = env.stdout_isatty
@ -346,9 +352,10 @@ class AuthCredentials(KeyValue):
def has_password(self): def has_password(self):
return self.value is not None return self.value is not None
def prompt_password(self): def prompt_password(self, host):
try: try:
self.value = self._getpass("Password for user '%s': " % self.key) self.value = self._getpass(
'http: password for %s@%s: ' % (self.key, host))
except (EOFError, KeyboardInterrupt): except (EOFError, KeyboardInterrupt):
sys.stderr.write('\n') sys.stderr.write('\n')
sys.exit(0) sys.exit(0)

2
httpie/output.py
View File

@ -85,6 +85,8 @@ class BaseStream(object):
yield chunk yield chunk
except BinarySuppressedError as e: except BinarySuppressedError as e:
if self.with_headers:
yield b'\n'
yield e.message yield e.message