flwr-nightly 1.18.0.dev20250418__py3-none-any.whl → 1.18.0.dev20250421__py3-none-any.whl

flwr/cli/config_utils.py

@@ -197,21 +197,7 @@ def validate_certificate_in_federation_config(
          - `address` is provided and `insecure = true`. If `root-certificates` is
            set, exit with an error.
     """
-    insecure_value = federation_config.get("insecure")
-    # Determine the insecure flag
-    if insecure_value is None:
-        # Not provided, default to False (TLS enabled)
-        insecure = False
-    elif isinstance(insecure_value, bool):
-        insecure = insecure_value
-    else:
-        typer.secho(
-            "❌ Invalid type for `insecure`: expected a boolean if provided. "
-            "(`insecure = true` or `insecure = false`)",
-            fg=typer.colors.RED,
-            bold=True,
-        )
-        raise typer.Exit(code=1)
+    insecure = get_insecure_flag(federation_config)
 
     # Process root certificates
     if root_certificates := federation_config.get("root-certificates"):
@@ -250,3 +236,21 @@ def exit_if_no_address(federation_config: dict[str, Any], cmd: str) -> None:
             bold=True,
         )
         raise typer.Exit(code=1)
+
+
+def get_insecure_flag(federation_config: dict[str, Any]) -> bool:
+    """Extract and validate the `insecure` flag from the federation configuration."""
+    insecure_value = federation_config.get("insecure")
+
+    if insecure_value is None:
+        # Not provided, default to False (TLS enabled)
+        return False
+    if isinstance(insecure_value, bool):
+        return insecure_value
+    typer.secho(
+        "❌ Invalid type for `insecure`: expected a boolean if provided. "
+        "(`insecure = true` or `insecure = false`)",
+        fg=typer.colors.RED,
+        bold=True,
+    )
+    raise typer.Exit(code=1)

flwr/cli/login/login.py

@@ -22,6 +22,7 @@ import typer
 
 from flwr.cli.config_utils import (
     exit_if_no_address,
+    get_insecure_flag,
     load_and_validate,
     process_loaded_project_config,
     validate_federation_in_project_config,
@@ -80,6 +81,16 @@ def login(  # pylint: disable=R0914
             bold=True,
         )
         raise typer.Exit(code=1)
+    # Check if insecure flag is set to `True`
+    insecure = get_insecure_flag(federation_config)
+    if insecure:
+        typer.secho(
+            "❌ `flwr login` requires TLS to be enabled. `insecure` must NOT be set to "
+            "`true` in the federation configuration.",
+            fg=typer.colors.RED,
+            bold=True,
+        )
+        raise typer.Exit(code=1)
 
     channel = init_channel(app, federation_config, None)
     stub = ExecStub(channel)

flwr/cli/utils.py

@@ -220,17 +220,6 @@ def try_obtain_cli_auth_plugin(
     if not federation_config.get("enable-user-auth", False):
         return None
 
-    # Check if TLS is enabled. If not, raise an error
-    if federation_config.get("root-certificates") is None:
-        typer.secho(
-            "❌ User authentication requires TLS to be enabled. "
-            "Please provide 'root-certificates' in the federation"
-            " configuration.",
-            fg=typer.colors.RED,
-            bold=True,
-        )
-        raise typer.Exit(code=1)
-
     config_path = get_user_auth_config_path(root_dir, federation)
 
     # Get the auth type from the config if not provided
@@ -273,6 +262,16 @@ def init_channel(
     # Initialize the CLI-side user auth interceptor
     interceptors: list[grpc.UnaryUnaryClientInterceptor] = []
     if auth_plugin is not None:
+        # Check if TLS is enabled. If not, raise an error
+        if insecure:
+            typer.secho(
+                "❌ User authentication requires TLS to be enabled. "
+                "Remove `insecure = true` from the federation configuration.",
+                fg=typer.colors.RED,
+                bold=True,
+            )
+            raise typer.Exit(code=1)
+
         auth_plugin.load_tokens()
         interceptors.append(CliUserAuthInterceptor(auth_plugin))
 

{flwr_nightly-1.18.0.dev20250418.dist-info → flwr_nightly-1.18.0.dev20250421.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.18.0.dev20250418
+Version: 1.18.0.dev20250421
 Summary: Flower: A Friendly Federated AI Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.18.0.dev20250418.dist-info → flwr_nightly-1.18.0.dev20250421.dist-info}/RECORD

@@ -5,13 +5,13 @@ flwr/cli/auth_plugin/__init__.py,sha256=FyaoqPzcxlBTFfJ2sBRC5USwQLmAhFr5KuBwfMO4
 flwr/cli/auth_plugin/oidc_cli_plugin.py,sha256=gIhW6Jg9QAo-jL43LYPpw_kn7pdUZZae0s0H8dEgjLM,5384
 flwr/cli/build.py,sha256=sPzCAZC0gDytpDqMO3aHBcdCzQVXqRhts4TJYSZNu1E,6375
 flwr/cli/cli_user_auth_interceptor.py,sha256=-JqDXpeZNQVwoSG7hMKsiS5qY5k5oklNSlQOVpM0-aY,3126
-flwr/cli/config_utils.py,sha256=Si9nKXULxhk0qk5S-ocbu_Shh_EcIKtKrJ5zqb_Xwtg,8998
+flwr/cli/config_utils.py,sha256=IAVn2uWTXpN72YYt7raLtwp8ziwZugUKSURpc471VzU,9123
 flwr/cli/constant.py,sha256=g7Ad7o3DJDkJNrWS0T3SSJETWSTkkVJWGpLM8zlbpcY,1289
 flwr/cli/example.py,sha256=SNTorkKPrx1rOryGREUyZu8TcOc1-vFv1zEddaysdY0,2216
 flwr/cli/install.py,sha256=Jr883qR7qssVpUr3hEOEcLK-dfW67Rsve3lZchjA9RU,8180
 flwr/cli/log.py,sha256=xpUVMe3K-3XHayerL9H8WaYhm3rKw5YM-T9CZ-bYRPg,6529
 flwr/cli/login/__init__.py,sha256=B1SXKU3HCQhWfFDMJhlC7FOl8UsvH4mxysxeBnrfyUE,800
-flwr/cli/login/login.py,sha256=gLnCEInuw48QxgkBwGPJszUhQiyRbkphGn-tSj5iNCY,3917
+flwr/cli/login/login.py,sha256=JC3T99b9f33zLkJSEQ9_p1qKgVh2VNM5thhSRZ2o1oI,4320
 flwr/cli/ls.py,sha256=GdaNgEjGWKiMVrUa1CtUdUwBW1oEb4ddTSyZk61OHnc,11433
 flwr/cli/new/__init__.py,sha256=QA1E2QtzPvFCjLTUHnFnJbufuFiGyT_0Y53Wpbvg1F0,790
 flwr/cli/new/new.py,sha256=2e4ACJqeZ0W0_FyksQTi7PEzQpXT8KRpBPthFoac6zQ,9917
@@ -70,7 +70,7 @@ flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl,sha256=KTgLL3aKSqu50GVj
 flwr/cli/run/__init__.py,sha256=RPyB7KbYTFl6YRiilCch6oezxrLQrl1kijV7BMGkLbA,790
 flwr/cli/run/run.py,sha256=t3vgDeSGKgptYbGKLLTVAcGB-ZQqu3Ui0cVloA-eoy8,8277
 flwr/cli/stop.py,sha256=iLbh1dq8XMdcIlh0Lh8ufG6h0VvrP1kyp_mGO-kimt0,4976
-flwr/cli/utils.py,sha256=iTxNid0-KmysnH-Q2Nbsno2_ofX34gnCbFdTWvVUgvc,11236
+flwr/cli/utils.py,sha256=FjRYfzTw75qh5YHmrg9XzBA6o73T6xWt9WQYIxq-iHY,11207
 flwr/client/__init__.py,sha256=FslaZOoCGPIzlK-NhL7bFMVVnmFDOh_PhW4AfGzno68,1192
 flwr/client/app.py,sha256=N4-LwxoHT_I-O3K1xfkNRh6fyloR-1YFYoWhOxjlRrM,34282
 flwr/client/client.py,sha256=3HAchxvknKG9jYbB7swNyDj-e5vUWDuMKoLvbT7jCVM,7895
@@ -326,7 +326,7 @@ flwr/superexec/exec_servicer.py,sha256=Z0YYfs6eNPhqn8rY0x_R04XgR2mKFpggt07IH0EhU
 flwr/superexec/exec_user_auth_interceptor.py,sha256=iqygALkOMBUu_s_R9G0mFThZA7HTUzuXCLgxLCefiwI,4440
 flwr/superexec/executor.py,sha256=M5ucqSE53jfRtuCNf59WFLqQvA1Mln4741TySeZE7qQ,3112
 flwr/superexec/simulation.py,sha256=j6YwUvBN7EQ09ID7MYOCVZ70PGbuyBy8f9bXU0EszEM,4088
-flwr_nightly-1.18.0.dev20250418.dist-info/METADATA,sha256=tDbwKszWrO98LczNz5bP5Z3xaQhfdwwyvGN_rmWNGPg,15868
-flwr_nightly-1.18.0.dev20250418.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-flwr_nightly-1.18.0.dev20250418.dist-info/entry_points.txt,sha256=2-1L-GNKhwGw2_7_RoH55vHw2SIHjdAQy3HAVAWl9PY,374
-flwr_nightly-1.18.0.dev20250418.dist-info/RECORD,,
+flwr_nightly-1.18.0.dev20250421.dist-info/METADATA,sha256=eEFwDyhwWT0kVS5NTDw7LHItc6cHrxye-OP7FwbM2Ro,15868
+flwr_nightly-1.18.0.dev20250421.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+flwr_nightly-1.18.0.dev20250421.dist-info/entry_points.txt,sha256=2-1L-GNKhwGw2_7_RoH55vHw2SIHjdAQy3HAVAWl9PY,374
+flwr_nightly-1.18.0.dev20250421.dist-info/RECORD,,