Load config files from proper dir. Fixes mitmproxy#6014

mitmproxy/optmanager.py

@@ -317,13 +317,7 @@ def set(self, *specs: str, defer: bool = False) -> None:
         May raise an `OptionsError` if a value is malformed or an option is unknown and defer is False.
         """
         # First, group specs by option name.
-        unprocessed: dict[str, list[str]] = {}
-        for spec in specs:
-            if "=" in spec:
-                name, value = spec.split("=", maxsplit=1)
-                unprocessed.setdefault(name, []).append(value)
-            else:
-                unprocessed.setdefault(spec, [])
+        unprocessed: dict[str, list[str]] = specs_to_dict(specs)
 
         # Second, convert values to the correct type.
         processed: dict[str, Any] = {}
@@ -519,6 +513,21 @@ def dump_dicts(opts, keys: Iterable[str] | None = None) -> dict:
     return options_dict
 
 
+def specs_to_dict(specs: Sequence[str]) -> dict[str, list[str]]:
+    """
+    Takes a sequence of set specification in standard form (option=value).
+    Returns a dict of option names to a list of string values.
+    """
+    options = {}
+    for spec in specs:
+        if "=" in spec:
+            name, value = spec.split("=", maxsplit=1)
+            options.setdefault(name, []).append(value)
+        else:
+            options.setdefault(spec, [])
+    return options
+
+
 def parse(text):
     if not text:
         return {}

mitmproxy/tools/main.py

@@ -20,6 +20,20 @@
 from mitmproxy.utils import debug
 
 
+def load_options(opts, args):
+    args_options = optmanager.specs_to_dict(args.setoptions)
+    # if confdir option is set in args, config files should be loaded from there
+    if "confdir" in args_options:
+        confdir = args_options["confdir"][-1]
+    else:
+        confdir = opts.confdir
+    optmanager.load_paths(
+        opts,
+        os.path.join(confdir, "config.yaml"),
+        os.path.join(confdir, "config.yml"),
+    )
+
+
 def process_options(parser, opts, args):
     if args.version:
         print(debug.dump_system_info())
@@ -81,12 +95,8 @@ async def main() -> T:
             sys.exit(1)
 
         try:
+            load_options(opts, args)
             opts.set(*args.setoptions, defer=True)
-            optmanager.load_paths(
-                opts,
-                os.path.join(opts.confdir, "config.yaml"),
-                os.path.join(opts.confdir, "config.yml"),
-            )
             process_options(parser, opts, args)
 
             if args.options:

test/mitmproxy/test_optmanager.py

@@ -469,3 +469,18 @@ def test_set():
     opts.process_deferred()
     assert "deferredsequenceoption" not in opts.deferred
     assert opts.deferredsequenceoption == ["a", "b"]
+
+
+def test_spec_to_dict():
+    assert(optmanager.specs_to_dict([])
+           == {})
+    assert(optmanager.specs_to_dict(["option"])
+           == {"option": []})
+    assert(optmanager.specs_to_dict(["option=value"])
+           == {"option": ["value"]})
+    assert(optmanager.specs_to_dict(["option=value1", "option=value2"])
+           == {"option": ["value1", "value2"]})
+    assert(optmanager.specs_to_dict(["option=value1", "option"])
+           == {"option": ["value1"]})
+    assert(optmanager.specs_to_dict(["option1=value1", "option2=value2"])
+           == {"option1": ["value1"], "option2": ["value2"]})