django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2024-11-24 08:53:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adjusting for PR as requested

Browse Source
This commit is contained in:
László Károlyi 2018-05-23 12:37:27 +02:00
parent 9806d21280
commit a7ccae7025
No known key found for this signature in database
GPG Key ID: 2DCAF25E55735BFE
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daphne/cli.py
View File

@ -2,7 +2,6 @@ import argparse
import logging import logging
import sys import sys
from argparse import ArgumentError, Namespace from argparse import ArgumentError, Namespace
from typing import Union
from .access import AccessLogGenerator from .access import AccessLogGenerator
from .endpoints import build_endpoint_description_strings from .endpoints import build_endpoint_description_strings
@ -13,7 +12,6 @@ logger = logging.getLogger(__name__)
DEFAULT_HOST = "127.0.0.1" DEFAULT_HOST = "127.0.0.1"
DEFAULT_PORT = 8000 DEFAULT_PORT = 8000
str_or_none = Union[None, str]
class CommandLineInterface(object): class CommandLineInterface(object):
@ -135,7 +133,7 @@ class CommandLineInterface(object):
default=False, default=False,
action="store_true", action="store_true",
) )
self._arg_proxy_host = self.parser.add_argument( self.arg_proxy_host = self.parser.add_argument(
"--proxy-headers-host", "--proxy-headers-host",
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 "
@ -145,7 +143,7 @@ class CommandLineInterface(object):
default=False, default=False,
action="store", action="store",
) )
self._arg_proxy_port = self.parser.add_argument( self.arg_proxy_port = self.parser.add_argument(
"--proxy-headers-port", "--proxy-headers-port",
dest="proxy_headers_port", dest="proxy_headers_port",
help="Specify which header will be used for getting the port " help="Specify which header will be used for getting the port "
@ -176,26 +174,26 @@ class CommandLineInterface(object):
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) -> str_or_none: def _get_forwarded_host(self, args: Namespace):
""" """
Return the default host header from which the remote hostname/ip Return the default host header from which the remote hostname/ip
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"
def _get_forwarded_port(self, args: Namespace) -> str_or_none: def _get_forwarded_port(self, args: Namespace):
""" """
Return the default host header from which the remote hostname/ip Return the default host header from which the remote hostname/ip
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"