Merge pull request #1 from stypr/12.1.1

Upgrade scripts to be compatible for mitmproxy 12.x

Author: stypr

caddy/Caddyfile

@@ -36,11 +36,15 @@ example.tld {
 
     handle_path /* {
         # use `caddy hash-password` to generate credentials
-        basicauth {
-            admin $2a$......
-        }
+        # or use the new authentication feature shipped on mitmproxy 12.x and higher.
+        # In case you want to use the built-in authentication feature, please change run.sh accordingly
+        # and remove `header_up` values from Caddyfile.
+        # basicauth {
+        #     admin $2a$......
+        # }
         reverse_proxy * http://localhost:8000 {
             header_up Host localhost:8000
+            header_up Authorization "Bearer changeme"
             header_up Origin http://localhost:8000
         }
     }

main.py

@@ -4,10 +4,9 @@
 Main script for mitmproxy
 """
 
-import os
-import pkgutil
+import sys
 import asyncio
-import importlib
+from pathlib import Path
 
 from mitmproxy import ctx, contentviews
 from reloader import watch_changes, reload_modules
@@ -18,12 +17,19 @@
 from addons.no_cache import NoCache
 from addons.debug import Debug
 
-# Hot Reloading
+# Redirect all stdout to stderr
+sys.stdout = sys.stderr
+
+# HotReloading
 for task in asyncio.all_tasks():
     if task.get_name() == 'watch_changes':
         ctx.log.info("Canceling previous autoreload task")
         task.cancel()
-asyncio.create_task(watch_changes(), name="watch_changes")
+
+asyncio.create_task(
+    watch_changes(trigger_file=Path(__file__)),
+    name="watch_changes"
+)
 
 reload_modules([
     "addons",
@@ -43,7 +49,10 @@
     ViewSekai(),
 ]
 
+####
 # This code is required for adding/removing views
+####
+
 def load(loader):
     for view in views:
         contentviews.add(view)

reloader.py

@@ -1,35 +1,34 @@
 import os
 import pkgutil
-import asyncio
 import importlib
 
 from pathlib import Path
+from watchfiles import awatch, PythonFilter
 from mitmproxy import ctx
-from watchfiles import awatch, Change, PythonFilter
 
 # By default, Hot reloading is only done for Python scripts only
-# Use https://watchfiles.helpmanual.io/api/filters/ as a reference
+# Read https://watchfiles.helpmanual.io/api/filters/ for more information
 
 class ReloadFilter(PythonFilter):
     ignore_paths = [os.path.realpath(__file__)]
 
-async def watch_changes():
+async def watch_changes(trigger_file: Path):
     """
     Watch for all changes in the subdirectory
     the main script needs to be filtered as mitmproxy autoreloads main script changes
     """
     ctx.log.info("Autoreload task started")
     async for changes in awatch(
-        os.path.realpath(__file__),
+        os.path.dirname(os.path.realpath(__file__)),
         watch_filter=ReloadFilter()
     ):
         try:
             ctx.log.info(f"Changes detected: {changes}")
-            Path(__file__).touch()
+            trigger_file.touch()
         except Exception as e:
             print("Exception in autoreload:", e)
 
-def reload_modules(module_dirs):
+def reload_modules(module_dirs: list):
     """
     Reload all modules in subdirectories
     """
@@ -44,5 +43,4 @@ def reload_modules(module_dirs):
                     ctx.log.info(f"Reloading module: {module_name}")
                     importlib.reload(importlib.import_module(module_name))
         except ModuleNotFoundError as e:
-            ctx.log.error("Reloading Module Error: {%s}")
-
+            ctx.log.error(f"Reloading Module Error: {e}")

run.sh

@@ -3,6 +3,7 @@
 warp-cli disconnect
 warp-cli connect
 mitmweb \
+  --set web_password='changeme' \
   --ignore-hosts dns.google.com \
   --web-port 8000 \
   --web-host localhost \
@@ -15,8 +16,7 @@ mitmweb \
   --set confdir=$PWD/config \
   --mode wireguard:$PWD/config/wireguard_server1.conf@303 \
   --script main.py \
-  -r config/flow \
-  -w config/flow
+  -r config/flow
 
 # For mulitple clients, simple add more configs.
 # Wireguard client configs are available in the web frontend.

views/sekai.py

@@ -7,16 +7,13 @@
 """
 
 from typing import Optional
-from urllib.parse import urlparse
+import json
 import msgpack
 from Crypto.Cipher import AES
-from mitmproxy import contentviews
-from mitmproxy import flow
-from mitmproxy import http
-# from mitmproxy import ctx
+from mitmproxy.contentviews import Contentview
 
 class SekaiCore:
-    # To use this you need a valid key and IV.
+    # To use this class, you need a valid key and IV.
     aes_key = b""
     aes_iv = b""
 
@@ -48,39 +45,31 @@ def decrypt_data(cls, crypttext):
                 return {}
 
 
-class ViewSekai(contentviews.View):
-    name = "sekai"
-
-    def __call__(
-        self,
-        data: bytes,
-        *,
-        content_type: Optional[str] = None,
-        flow: Optional[flow.Flow] = None,
-        http_message: Optional[http.Message] = None,
-        **unknown_metadata,
-    ) -> contentviews.TViewResult:
-        """ Decrypts data upon response. """
-        try:
-            plaintext: Optional[dict] = SekaiCore.decrypt_data(data)
-            return "sekai", contentviews.json.format_json(plaintext)
-        except Exception as e:
-            return "sekai", contentviews.format_text(e)
+class ViewProjectSekai(Contentview):
+    name = "pjsekai"
 
     def render_priority(
         self,
         data: bytes,
-        *,
-        content_type: Optional[str] = None,
-        flow: Optional[flow.Flow] = None,
-        http_message: Optional[http.Message] = None,
-        **unknown_metadata,
+        metadata
     ) -> float:
         """ prioritize using this when priority is set """
         try:
-            if not data:
+            if not data or not metadata:
                 return 0
-            _ = SekaiCore.decrypt_data(data)
-            return 1
+
+            decrypt_result = SekaiCore.decrypt_data(data)
+            return 1 if decrypt_result else 0
         except Exception as e:
             return 0
+
+    def prettify(
+        self,
+        data: bytes,
+        _
+    ) -> str:
+        try:
+            plaintext: Optional[dict] = SekaiCore.decrypt_data(data)
+            return json.dumps(plaintext, indent=4, ensure_ascii=False)
+        except Exception as e:
+            return e