From d54a95e0f9c689f2bbaaea90a3a16a855a408823 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Wed, 17 Aug 2022 13:50:34 +0200 Subject: allow loading packages from zip files through web UI and listing installed mappings --- src/hydrilla/proxy/policies/payload.py | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'src/hydrilla/proxy/policies/payload.py') diff --git a/src/hydrilla/proxy/policies/payload.py b/src/hydrilla/proxy/policies/payload.py index 577c94e..e64653d 100644 --- a/src/hydrilla/proxy/policies/payload.py +++ b/src/hydrilla/proxy/policies/payload.py @@ -46,7 +46,6 @@ from . import base @dc.dataclass(frozen=True) # type: ignore[misc] class PayloadAwarePolicy(base.Policy): """....""" - haketilo_state: state.HaketiloState payload_data: state.PayloadData def assets_base_url(self, request_url: ParsedUrl): @@ -174,7 +173,7 @@ class PayloadInjectPolicy(PayloadAwarePolicy): base_url = self.assets_base_url(url) payload_ref = self.payload_data.payload_ref - for path in payload_ref.get_script_paths(self.haketilo_state): + for path in payload_ref.get_script_paths(): yield base_url + '/'.join(('static', *path)) def _modify_body( @@ -266,19 +265,6 @@ class AutoPayloadInjectPolicy(PayloadInjectPolicy): """....""" priority: t.ClassVar[base.PolicyPriority] = base.PolicyPriority._ONE - def _modify_body( - self, - url: ParsedUrl, - body: bytes, - encoding: t.Optional[str] - ) -> bytes: - """....""" - payload_ref = self.payload_data.payload_ref - mapping_ref = payload_ref.get_mapping(self.haketilo_state) - mapping_ref.enable(self.haketilo_state) - - return super()._modify_body(url, body, encoding) - @dc.dataclass(frozen=True) class PayloadSuggestPolicy(PayloadAwarePolicy): @@ -299,20 +285,20 @@ class PayloadPolicyFactory(PayloadAwarePolicyFactory): -> t.Optional[base.Policy]: """....""" try: - payload_data = self.payload_ref.get_data(haketilo_state) + payload_data = self.payload_ref.get_data() except: return None if payload_data.explicitly_enabled: - return PayloadInjectPolicy(haketilo_state, payload_data) + return PayloadInjectPolicy(payload_data) mode = haketilo_state.get_settings().mapping_use_mode if mode == state.MappingUseMode.QUESTION: - return PayloadSuggestPolicy(haketilo_state, payload_data) + return PayloadSuggestPolicy(payload_data) if mode == state.MappingUseMode.WHEN_ENABLED: return None # mode == state.MappingUseMode.AUTO - return AutoPayloadInjectPolicy(haketilo_state, payload_data) + return AutoPayloadInjectPolicy(payload_data) -- cgit v1.2.3