django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2025-07-28 16:09:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Blacking code

Browse Source
This commit is contained in:
László Károlyi 2018-10-24 20:09:09 +02:00
parent b650c61324
commit 58a8db330e
No known key found for this signature in database
GPG Key ID: 2DCAF25E55735BFE
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
daphne/cli.py
View File

@ -132,7 +132,7 @@ class CommandLineInterface(object):
dest="proxy_headers_host", dest="proxy_headers_host",
help="Specify which header will be used for getting the host " help="Specify which header will be used for getting the host "
"part. Can be omitted, requires --proxy-headers to be specified " "part. Can be omitted, requires --proxy-headers to be specified "
"when passed. \"X-Real-IP\" (when passed by your webserver) is a " 'when passed. "X-Real-IP" (when passed by your webserver) is a '
"good candidate for this.", "good candidate for this.",
default=False, default=False,
action="store", action="store",
@ -166,7 +166,8 @@ class CommandLineInterface(object):
return return
raise ArgumentError( raise ArgumentError(
argument=argument, argument=argument,
message="--proxy-headers has to be passed for this parameter.") message="--proxy-headers has to be passed for this parameter.",
)
def _get_forwarded_host(self, args: Namespace): def _get_forwarded_host(self, args: Namespace):
""" """
@ -174,8 +175,7 @@ class CommandLineInterface(object):
will be extracted. will be extracted.
""" """
if args.proxy_headers_host: if args.proxy_headers_host:
self._check_proxy_headers_passed( self._check_proxy_headers_passed(argument=self.arg_proxy_host, args=args)
argument=self.arg_proxy_host, args=args)
return args.proxy_headers_host return args.proxy_headers_host
if args.proxy_headers: if args.proxy_headers:
return "X-Forwarded-For" return "X-Forwarded-For"
@ -186,8 +186,7 @@ class CommandLineInterface(object):
will be extracted. will be extracted.
""" """
if args.proxy_headers_port: if args.proxy_headers_port:
self._check_proxy_headers_passed( self._check_proxy_headers_passed(argument=self.arg_proxy_port, args=args)
argument=self.arg_proxy_port, args=args)
return args.proxy_headers_port return args.proxy_headers_port
if args.proxy_headers: if args.proxy_headers:
return "X-Forwarded-Port" return "X-Forwarded-Port"
@ -265,6 +264,8 @@ class CommandLineInterface(object):
verbosity=args.verbosity, verbosity=args.verbosity,
proxy_forwarded_address_header=self._get_forwarded_host(args=args), proxy_forwarded_address_header=self._get_forwarded_host(args=args),
proxy_forwarded_port_header=self._get_forwarded_port(args=args), proxy_forwarded_port_header=self._get_forwarded_port(args=args),
proxy_forwarded_proto_header="X-Forwarded-Proto" if args.proxy_headers else None, proxy_forwarded_proto_header="X-Forwarded-Proto"
if args.proxy_headers
else None,
) )
self.server.run() self.server.run()

27
tests/test_cli.py
View File

@ -200,10 +200,7 @@ class TestCLIInterface(TestCase):
`X-Forwarded-For` header. `X-Forwarded-For` header.
""" """
self.assertCLI( self.assertCLI(
["--proxy-headers"], ["--proxy-headers"], {"proxy_forwarded_address_header": "X-Forwarded-For"}
{
"proxy_forwarded_address_header": "X-Forwarded-For",
},
) )
def test_custom_proxyhost(self): def test_custom_proxyhost(self):
@ -213,21 +210,18 @@ class TestCLIInterface(TestCase):
""" """
self.assertCLI( self.assertCLI(
["--proxy-headers", "--proxy-headers-host", "blah"], ["--proxy-headers", "--proxy-headers-host", "blah"],
{ {"proxy_forwarded_address_header": "blah"},
"proxy_forwarded_address_header": "blah",
},
) )
with self.assertRaises(expected_exception=ArgumentError) as exc: with self.assertRaises(expected_exception=ArgumentError) as exc:
self.assertCLI( self.assertCLI(
["--proxy-headers-host", "blah"], ["--proxy-headers-host", "blah"],
{ {"proxy_forwarded_address_header": "blah"},
"proxy_forwarded_address_header": "blah",
},
) )
self.assertEqual(exc.exception.argument_name, "--proxy-headers-host") self.assertEqual(exc.exception.argument_name, "--proxy-headers-host")
self.assertEqual( self.assertEqual(
exc.exception.message, exc.exception.message,
"--proxy-headers has to be passed for this parameter.") "--proxy-headers has to be passed for this parameter.",
)
def test_custom_proxyport(self): def test_custom_proxyport(self):
""" """
@ -236,18 +230,15 @@ class TestCLIInterface(TestCase):
""" """
self.assertCLI( self.assertCLI(
["--proxy-headers", "--proxy-headers-port", "blah2"], ["--proxy-headers", "--proxy-headers-port", "blah2"],
{ {"proxy_forwarded_port_header": "blah2"},
"proxy_forwarded_port_header": "blah2",
},
) )
with self.assertRaises(expected_exception=ArgumentError) as exc: with self.assertRaises(expected_exception=ArgumentError) as exc:
self.assertCLI( self.assertCLI(
["--proxy-headers-port", "blah2"], ["--proxy-headers-port", "blah2"],
{ {"proxy_forwarded_address_header": "blah2"},
"proxy_forwarded_address_header": "blah2",
},
) )
self.assertEqual(exc.exception.argument_name, "--proxy-headers-port") self.assertEqual(exc.exception.argument_name, "--proxy-headers-port")
self.assertEqual( self.assertEqual(
exc.exception.message, exc.exception.message,
"--proxy-headers has to be passed for this parameter.") "--proxy-headers has to be passed for this parameter.",
)