Move httpStatusCodes, httpMethods and Url within top-level proxy.http package

abhinavsingh · abhinavsingh · commit b27213b34438 · 2021-11-15T01:52:55.000+05:30
diff --git a/examples/https_connect_tunnel.py b/examples/https_connect_tunnel.py
@@ -14,7 +14,8 @@
 
 from proxy import Proxy
 from proxy.common.utils import build_http_response
-from proxy.http.parser import httpParserStates, httpStatusCodes
+from proxy.http import httpStatusCodes
+from proxy.http.parser import httpParserStates
 from proxy.core.base import BaseTcpTunnelHandler
 
 
diff --git a/proxy/common/pki.py b/proxy/common/pki.py
@@ -8,15 +8,16 @@
     :copyright: (c) 2013-present by Abhinav Singh and contributors.
     :license: BSD, see LICENSE for more details.
 """
-import time
+import os
 import sys
+import uuid
+import time
+import logging
+import tempfile
 import argparse
 import contextlib
-import os
-import uuid
 import subprocess
-import tempfile
-import logging
+
 from typing import List, Generator, Optional, Tuple
 
 from .utils import bytes_
diff --git a/proxy/core/connection/client.py b/proxy/core/connection/client.py
@@ -8,8 +8,9 @@
     :copyright: (c) 2013-present by Abhinav Singh and contributors.
     :license: BSD, see LICENSE for more details.
 """
-import socket
 import ssl
+import socket
+
 from typing import Union, Tuple, Optional
 
 from .connection import TcpConnection, TcpConnectionUninitializedException
diff --git a/proxy/core/connection/connection.py b/proxy/core/connection/connection.py
@@ -8,8 +8,8 @@
     :copyright: (c) 2013-present by Abhinav Singh and contributors.
     :license: BSD, see LICENSE for more details.
 """
-import socket
 import ssl
+import socket
 import logging
 
 from abc import ABC, abstractmethod
diff --git a/proxy/core/connection/pool.py b/proxy/core/connection/pool.py
@@ -13,6 +13,7 @@
 from typing import Set, Dict, Tuple
 
 from ...common.flag import flags
+
 from .server import TcpServerConnection
 
 logger = logging.getLogger(__name__)
diff --git a/proxy/core/connection/types.py b/proxy/core/connection/types.py
@@ -17,4 +17,5 @@
         ('CLIENT', int),
     ],
 )
+
 tcpConnectionTypes = TcpConnectionTypes(1, 2)
diff --git a/proxy/dashboard/dashboard.py b/proxy/dashboard/dashboard.py
@@ -16,9 +16,11 @@
 from .plugin import ProxyDashboardWebsocketPlugin
 
 from ..common.utils import build_http_response, bytes_
-from ..http.server import HttpWebServerPlugin, HttpWebServerBasePlugin, httpProtocolTypes
-from ..http.parser import HttpParser, httpStatusCodes
+
+from ..http import httpStatusCodes
+from ..http.parser import HttpParser
 from ..http.websocket import WebsocketFrame
+from ..http.server import HttpWebServerPlugin, HttpWebServerBasePlugin, httpProtocolTypes
 
 logger = logging.getLogger(__name__)
 
diff --git a/proxy/http/__init__.py b/proxy/http/__init__.py
@@ -10,8 +10,14 @@
 """
 from .handler import HttpProtocolHandler
 from .plugin import HttpProtocolHandlerPlugin
+from .codes import httpStatusCodes
+from .methods import httpMethods
+from .url import Url
 
 __all__ = [
     'HttpProtocolHandler',
     'HttpProtocolHandlerPlugin',
+    'httpStatusCodes',
+    'httpMethods',
+    'Url',
 ]
diff --git a/proxy/http/codes.py b/proxy/http/codes.py
diff --git a/proxy/http/exception/proxy_auth_failed.py b/proxy/http/exception/proxy_auth_failed.py
@@ -9,7 +9,9 @@
     :license: BSD, see LICENSE for more details.
 """
 from .base import HttpProtocolException
-from ..parser import HttpParser, httpStatusCodes
+
+from ..codes import httpStatusCodes
+from ..parser import HttpParser
 
 from ...common.constants import PROXY_AGENT_HEADER_VALUE, PROXY_AGENT_HEADER_KEY
 from ...common.utils import build_http_response
diff --git a/proxy/http/exception/proxy_conn_failed.py b/proxy/http/exception/proxy_conn_failed.py
@@ -9,7 +9,9 @@
     :license: BSD, see LICENSE for more details.
 """
 from .base import HttpProtocolException
-from ..parser import HttpParser, httpStatusCodes
+
+from ..codes import httpStatusCodes
+from ..parser import HttpParser
 
 from ...common.constants import PROXY_AGENT_HEADER_VALUE, PROXY_AGENT_HEADER_KEY
 from ...common.utils import build_http_response
diff --git a/proxy/http/handler.py b/proxy/http/handler.py
@@ -8,13 +8,13 @@
     :copyright: (c) 2013-present by Abhinav Singh and contributors.
     :license: BSD, see LICENSE for more details.
 """
-import socket
-import selectors
 import ssl
 import time
-import contextlib
 import errno
+import socket
 import logging
+import selectors
+import contextlib
 
 from typing import Tuple, List, Union, Optional, Generator, Dict, Any
 
diff --git a/proxy/http/methods.py b/proxy/http/methods.py
@@ -24,6 +24,7 @@
         ('PATCH', bytes),
     ],
 )
+
 httpMethods = HttpMethods(
     b'GET',
     b'HEAD',
diff --git a/proxy/http/parser/__init__.py b/proxy/http/parser/__init__.py
@@ -10,10 +10,7 @@
 """
 from .parser import HttpParser
 from .chunk import ChunkParser, chunkParserStates
-from .codes import httpStatusCodes
-from .methods import httpMethods
 from .types import httpParserStates, httpParserTypes
-from .url import Url
 from .protocol import ProxyProtocol, PROXY_PROTOCOL_V2_SIGNATURE
 
 __all__ = [
@@ -22,9 +19,6 @@
     'httpParserStates',
     'ChunkParser',
     'chunkParserStates',
-    'httpStatusCodes',
-    'httpMethods',
-    'Url',
     'ProxyProtocol',
     'PROXY_PROTOCOL_V2_SIGNATURE',
 ]
diff --git a/proxy/http/parser/parser.py b/proxy/http/parser/parser.py
@@ -16,8 +16,9 @@
 from ...common.utils import build_http_request, build_http_response, find_http_line, text_
 from ...common.flag import flags
 
-from .url import Url
-from .methods import httpMethods
+from ..url import Url
+from ..methods import httpMethods
+
 from .protocol import ProxyProtocol
 from .chunk import ChunkParser, chunkParserStates
 from .types import httpParserTypes, httpParserStates
diff --git a/proxy/http/parser/protocol.py b/proxy/http/parser/protocol.py
@@ -9,6 +9,7 @@
     :license: BSD, see LICENSE for more details.
 """
 from typing import Optional, Tuple
+
 from ...common.constants import WHITESPACE
 
 PROXY_PROTOCOL_V2_SIGNATURE = b'\x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A'
diff --git a/proxy/http/plugin.py b/proxy/http/plugin.py
@@ -8,11 +8,11 @@
     :copyright: (c) 2013-present by Abhinav Singh and contributors.
     :license: BSD, see LICENSE for more details.
 """
-import argparse
 import socket
+import argparse
 
-from abc import ABC, abstractmethod
 from uuid import UUID
+from abc import ABC, abstractmethod
 from typing import Tuple, List, Union, Optional
 
 from .parser import HttpParser
diff --git a/proxy/http/proxy/auth.py b/proxy/http/proxy/auth.py
@@ -11,6 +11,7 @@
 from typing import Optional
 
 from ..exception import ProxyAuthenticationFailed
+
 from ...common.flag import flags
 from ...common.constants import DEFAULT_BASIC_AUTH
 from ...http.parser import HttpParser
diff --git a/proxy/http/proxy/plugin.py b/proxy/http/proxy/plugin.py
@@ -11,9 +11,9 @@
 import socket
 import argparse
 
+from abc import ABC
 from uuid import UUID
 from typing import Any, Dict, List, Optional, Tuple
-from abc import ABC, abstractmethod
 
 from ..parser import HttpParser
 
diff --git a/proxy/http/proxy/server.py b/proxy/http/proxy/server.py
@@ -20,9 +20,12 @@
 from typing import Optional, List, Union, Dict, cast, Any, Tuple
 
 from .plugin import HttpProxyBasePlugin
+
+from ..methods import httpMethods
+from ..codes import httpStatusCodes
 from ..plugin import HttpProtocolHandlerPlugin
 from ..exception import HttpProtocolException, ProxyConnectionFailed
-from ..parser import HttpParser, httpParserStates, httpParserTypes, httpStatusCodes, httpMethods
+from ..parser import HttpParser, httpParserStates, httpParserTypes
 
 from ...common.types import Readables, Writables
 from ...common.constants import DEFAULT_CA_CERT_DIR, DEFAULT_CA_CERT_FILE, DEFAULT_CA_FILE
diff --git a/proxy/http/server/pac_plugin.py b/proxy/http/server/pac_plugin.py
@@ -9,12 +9,15 @@
     :license: BSD, see LICENSE for more details.
 """
 import gzip
+
 from typing import List, Tuple, Optional, Any
 
 from .plugin import HttpWebServerBasePlugin
 from .protocols import httpProtocolTypes
+
 from ..websocket import WebsocketFrame
 from ..parser import HttpParser
+
 from ...common.utils import bytes_, text_, build_http_response
 from ...common.flag import flags
 from ...common.constants import DEFAULT_PAC_FILE, DEFAULT_PAC_FILE_URL_PATH
diff --git a/proxy/http/server/plugin.py b/proxy/http/server/plugin.py
@@ -11,9 +11,9 @@
 import socket
 import argparse
 
+from uuid import UUID
 from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Optional, Tuple
-from uuid import UUID
 
 from ..websocket import WebsocketFrame
 from ..parser import HttpParser
diff --git a/proxy/http/server/protocols.py b/proxy/http/server/protocols.py
@@ -17,4 +17,5 @@
         ('WEBSOCKET', int),
     ],
 )
+
 httpProtocolTypes = HttpProtocolTypes(1, 2, 3)
diff --git a/proxy/http/server/web.py b/proxy/http/server/web.py
@@ -24,10 +24,11 @@
 from ...common.types import Readables, Writables
 from ...common.flag import flags
 
+from ..codes import httpStatusCodes
 from ..exception import HttpProtocolException
-from ..websocket import WebsocketFrame, websocketOpcodes
-from ..parser import HttpParser, httpParserStates, httpParserTypes, httpStatusCodes
 from ..plugin import HttpProtocolHandlerPlugin
+from ..websocket import WebsocketFrame, websocketOpcodes
+from ..parser import HttpParser, httpParserStates, httpParserTypes
 
 from .plugin import HttpWebServerBasePlugin
 from .protocols import httpProtocolTypes
diff --git a/proxy/http/url.py b/proxy/http/url.py
@@ -10,7 +10,7 @@
 """
 from typing import Optional, Tuple
 
-from ...common.constants import COLON, SLASH
+from ..common.constants import COLON, SLASH
 
 
 class Url:
diff --git a/proxy/http/websocket/client.py b/proxy/http/websocket/client.py
@@ -8,11 +8,11 @@
     :copyright: (c) 2013-present by Abhinav Singh and contributors.
     :license: BSD, see LICENSE for more details.
 """
+import ssl
 import base64
-import selectors
 import socket
 import secrets
-import ssl
+import selectors
 
 from typing import Optional, Union, Callable
 
diff --git a/proxy/http/websocket/frame.py b/proxy/http/websocket/frame.py
@@ -8,12 +8,12 @@
     :copyright: (c) 2013-present by Abhinav Singh and contributors.
     :license: BSD, see LICENSE for more details.
 """
+import io
 import hashlib
 import base64
 import struct
 import secrets
 import logging
-import io
 
 from typing import TypeVar, Type, Optional, NamedTuple
 
diff --git a/proxy/plugin/filter_by_client_ip.py b/proxy/plugin/filter_by_client_ip.py
@@ -11,9 +11,11 @@
 from typing import Optional
 
 from ..common.flag import flags
-from ..http.exception import HttpRequestRejected
-from ..http.parser import HttpParser, httpStatusCodes
+
+from ..http import httpStatusCodes
+from ..http.parser import HttpParser
 from ..http.proxy import HttpProxyBasePlugin
+from ..http.exception import HttpRequestRejected
 
 
 flags.add_argument(
diff --git a/proxy/plugin/filter_by_upstream.py b/proxy/plugin/filter_by_upstream.py
@@ -12,9 +12,11 @@
 
 from ..common.utils import text_
 from ..common.flag import flags
-from ..http.exception import HttpRequestRejected
-from ..http.parser import HttpParser, httpStatusCodes
+
+from ..http import httpStatusCodes
+from ..http.parser import HttpParser
 from ..http.proxy import HttpProxyBasePlugin
+from ..http.exception import HttpRequestRejected
 
 
 flags.add_argument(
diff --git a/proxy/plugin/filter_by_url_regex.py b/proxy/plugin/filter_by_url_regex.py
@@ -14,11 +14,13 @@
 from typing import Optional, List, Dict, Any
 
 from ..common.flag import flags
-from ..http.exception import HttpRequestRejected
-from ..http.parser import HttpParser, httpStatusCodes
-from ..http.proxy import HttpProxyBasePlugin
 from ..common.utils import text_
 
+from ..http import httpStatusCodes
+from ..http.parser import HttpParser
+from ..http.proxy import HttpProxyBasePlugin
+from ..http.exception import HttpRequestRejected
+
 import re
 
 logger = logging.getLogger(__name__)
diff --git a/proxy/plugin/man_in_the_middle.py b/proxy/plugin/man_in_the_middle.py
@@ -8,10 +8,8 @@
     :copyright: (c) 2013-present by Abhinav Singh and contributors.
     :license: BSD, see LICENSE for more details.
 """
-from typing import Optional
-
 from ..common.utils import build_http_response
-from ..http.parser import httpStatusCodes
+from ..http import httpStatusCodes
 from ..http.proxy import HttpProxyBasePlugin
 
 
diff --git a/proxy/plugin/mock_rest_api.py b/proxy/plugin/mock_rest_api.py
@@ -12,7 +12,9 @@
 from typing import Optional
 
 from ..common.utils import bytes_, build_http_response, text_
-from ..http.parser import HttpParser, httpStatusCodes
+
+from ..http import httpStatusCodes
+from ..http.parser import HttpParser
 from ..http.proxy import HttpProxyBasePlugin
 
 
diff --git a/proxy/plugin/modify_post_data.py b/proxy/plugin/modify_post_data.py
@@ -11,7 +11,9 @@
 from typing import Optional
 
 from ..common.utils import bytes_
-from ..http.parser import HttpParser, httpMethods
+
+from ..http import httpMethods
+from ..http.parser import HttpParser
 from ..http.proxy import HttpProxyBasePlugin
 
 
diff --git a/proxy/plugin/proxy_pool.py b/proxy/plugin/proxy_pool.py
diff --git a/proxy/plugin/shortlink.py b/proxy/plugin/shortlink.py
diff --git a/proxy/plugin/web_server_route.py b/proxy/plugin/web_server_route.py
diff --git a/tests/http/exceptions/test_http_request_rejected.py b/tests/http/exceptions/test_http_request_rejected.py
diff --git a/tests/http/test_http_parser.py b/tests/http/test_http_parser.py
diff --git a/tests/http/test_http_proxy_tls_interception.py b/tests/http/test_http_proxy_tls_interception.py
diff --git a/tests/http/test_url.py b/tests/http/test_url.py
diff --git a/tests/plugin/test_http_proxy_plugins.py b/tests/plugin/test_http_proxy_plugins.py
diff --git a/tests/plugin/test_http_proxy_plugins_with_tls_interception.py b/tests/plugin/test_http_proxy_plugins_with_tls_interception.py
diff --git a/tests/testing/test_embed.py b/tests/testing/test_embed.py

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,5 @@`
`17`	`17`	`('CLIENT', int),`
`18`	`18`	`],`
`19`	`19`	`)`
	`20`	`+`
`20`	`21`	`tcpConnectionTypes = TcpConnectionTypes(1, 2)`