extern/httpie-cli
1
0
Fork 1
mirror of https://github.com/httpie/cli.git synced 2024-11-22 07:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added --auth-type and tests for basic/digest auth.

Browse Source 
Closes #38.
This commit is contained in:
Jakub Roztocil 2012-04-11 13:47:47 +02:00
parent ee598d304d
commit 0c4c6c4753
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
httpie/__main__.py
View File

@ -134,10 +134,11 @@ def main(args=None,
# Fire the request. # Fire the request.
try: try:
credentials = None credentials = None
if args.auth and args.digest: if args.auth:
credentials = requests.auth.HTTPDigestAuth(args.auth.key, args.auth.value) auth_type = (requests.auth.HTTPDigestAuth
elif args.auth: if args.auth_type == 'digest'
credentials = requests.auth.HTTPBasicAuth(args.auth.key, args.auth.value) else requests.auth.HTTPBasicAuth)
credentials = auth_type(args.auth.key, args.auth.value)
response = requests.request( response = requests.request(
method=args.method.lower(), method=args.method.lower(),

9
httpie/cli.py
View File

@ -100,6 +100,7 @@ class HTTPieArgumentParser(argparse.ArgumentParser):
def parse_args(self, args=None, namespace=None): def parse_args(self, args=None, namespace=None):
args = super(HTTPieArgumentParser, self).parse_args(args, namespace) args = super(HTTPieArgumentParser, self).parse_args(args, namespace)
self._validate_output_options(args) self._validate_output_options(args)
self._validate_auth_options(args)
return args return args
def _validate_output_options(self, args): def _validate_output_options(self, args):
@ -107,6 +108,11 @@ class HTTPieArgumentParser(argparse.ArgumentParser):
if unknown_output_options: if unknown_output_options:
self.error('Unknown output options: %s' % ','.join(unknown_output_options)) self.error('Unknown output options: %s' % ','.join(unknown_output_options))
def _validate_auth_options(self, args):
if args.auth_type and not args.auth:
self.error('--auth-type can only be used with --auth')
parser = HTTPieArgumentParser(description=doc.strip(),) parser = HTTPieArgumentParser(description=doc.strip(),)
parser.add_argument('--version', action='version', version=version) parser.add_argument('--version', action='version', version=version)
@ -217,7 +223,8 @@ parser.add_argument(
) )
parser.add_argument( parser.add_argument(
'--digest', '-d', action='store_true', help=_('Use Digest authentication') '--auth-type', choices=['basic', 'digest'],
help=_('The type of authentication ("basic" or "digest"). Defaults to "basic".')
) )
parser.add_argument( parser.add_argument(

15
tests/tests.py
View File

@ -139,5 +139,20 @@ class TestFileUpload(BaseTest):
self.assertIn('"test-file": "__test_file_content__', r) self.assertIn('"test-file": "__test_file_content__', r)
class TestAuth(BaseTest):
def test_basic_auth(self):
r = http('--auth', 'user:password',
'GET', 'httpbin.org/basic-auth/user/password')
self.assertIn('"authenticated": true', r)
self.assertIn('"user": "user"', r)
def test_digest_auth(self):
r = http('--auth-type=digest', '--auth', 'user:password',
'GET', 'httpbin.org/digest-auth/auth/user/password')
self.assertIn('"authenticated": true', r)
self.assertIn('"user": "user"', r)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()