From aedc2bf48cf09c6670f03fc8e830bc718ab56555 Mon Sep 17 00:00:00 2001 From: Salad Dais Date: Mon, 3 May 2021 17:09:57 +0000 Subject: [PATCH] Fix CapType resolution --- hippolyzer/lib/proxy/message_logger.py | 3 ++- hippolyzer/lib/proxy/sessions.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hippolyzer/lib/proxy/message_logger.py b/hippolyzer/lib/proxy/message_logger.py index cee562b..7501b8a 100644 --- a/hippolyzer/lib/proxy/message_logger.py +++ b/hippolyzer/lib/proxy/message_logger.py @@ -16,11 +16,12 @@ from hippolyzer.lib.base import serialization as se, llsd from hippolyzer.lib.base.datatypes import TaggedUnion, UUID, TupleCoord from hippolyzer.lib.base.helpers import bytes_escape from hippolyzer.lib.proxy.message_filter import MetaFieldSpecifier, compile_filter, BaseFilterNode, MessageFilterNode +from hippolyzer.lib.proxy.region import CapType if typing.TYPE_CHECKING: from hippolyzer.lib.proxy.http_flow import HippoHTTPFlow from hippolyzer.lib.proxy.message import ProxiedMessage - from hippolyzer.lib.proxy.region import ProxiedRegion, CapType + from hippolyzer.lib.proxy.region import ProxiedRegion from hippolyzer.lib.proxy.sessions import Session LOG = logging.getLogger(__name__) diff --git a/hippolyzer/lib/proxy/sessions.py b/hippolyzer/lib/proxy/sessions.py index f2ad7b1..d0b9157 100644 --- a/hippolyzer/lib/proxy/sessions.py +++ b/hippolyzer/lib/proxy/sessions.py @@ -12,9 +12,11 @@ from hippolyzer.lib.base.datatypes import UUID from hippolyzer.lib.proxy.circuit import ProxiedCircuit from hippolyzer.lib.proxy.http_asset_repo import HTTPAssetRepo from hippolyzer.lib.proxy.http_proxy import HTTPFlowContext, is_asset_server_cap_name, SerializedCapData -from hippolyzer.lib.proxy.message_logger import BaseMessageLogger from hippolyzer.lib.proxy.region import ProxiedRegion, CapType +if TYPE_CHECKING: + from hippolyzer.lib.proxy.message_logger import BaseMessageLogger + class Session: def __init__(self, session_id, secure_session_id, agent_id, circuit_code,