Merge pull request #464 from jumpstarter-dev/backport-462-to-release-0.6

Backport #462 to release 0.6

Author: mangelajo

docs/source/getting-started/configuration/authentication.md

@@ -46,13 +46,14 @@ Note, the HTTPS URL is mandatory, and you only need to include certificateAuthor
    prefix usernames with `keycloak:` as configured in the claim mappings:
 
 ```shell
-$ jmp admin create client test-client --oidc-username keycloak:developer-1
+$ jmp admin create client test-client --insecure-tls-config --oidc-username keycloak:developer-1
 ```
 
 4. Instruct users to log in with:
 
 ```shell
 $ jmp login --client <client alias> \
+    --insecure-tls-config \
     --endpoint <jumpstarter controller endpoint> \
     --namespace <namespace> --name <client name> \
     --issuer https://<keycloak domain>/realms/<realm name>
@@ -62,6 +63,7 @@ For non-interactive login, add username and password:
 
 ```shell
 $ jmp login --client <client alias> [other parameters] \
+    --insecure-tls-config \
     --username <username> \
     --password <password>
 ```
@@ -76,6 +78,7 @@ For exporters, use similar login command but with the `--exporter` flag:
 
 ```shell
 $ jmp login --exporter <exporter alias> \
+    --insecure-tls-config \
     --endpoint <jumpstarter controller endpoint> \
     --namespace <namespace> --name <exporter name> \
     --issuer https://<keycloak domain>/realms/<realm name>
@@ -188,6 +191,7 @@ jwt:
 
 ```shell
 $ jmp admin create exporter test-exporter \
+    --insecure-tls-config \
     --oidc-username dex:system:serviceaccount:default:test-service-account
 ```
 
@@ -197,6 +201,7 @@ For clients:
 
 ```shell
 $ jmp login --client <client alias> \
+    --insecure-tls-config \
     --endpoint <jumpstarter controller endpoint> \
     --namespace <namespace> --name <client name> \
     --issuer https://dex.dex.svc.cluster.local:5556 \
@@ -208,6 +213,7 @@ For exporters:
 
 ```shell
 $ jmp login --exporter <exporter alias> \
+    --insecure-tls-config \
     --endpoint <jumpstarter controller endpoint> \
     --namespace <namespace> --name <exporter name> \
     --issuer https://dex.dex.svc.cluster.local:5556 \

docs/source/getting-started/usage/setup-distributed-mode.md

@@ -3,6 +3,16 @@
 This guide walks you through the process of creating an exporter using the
 controller service, configuring drivers, and running the exporter.
 
+```{warning}
+The jumpstarter-controller endpoints are secured by TLS. However, in release 0.6.x,
+the certificates are self-signed and rotated on every restart. This means the client
+will not be able to verify the server certificate. To bypass this, you should use the
+`--insecure-tls-config` flag when creating clients and exporters. This issue will be
+resolved in the next release. See [issue #455](https://github.com/jumpstarter-dev/jumpstarter/issues/455)
+for more details.
+Alternatively, you can configure the ingress/route in reencrypt mode with your own key and certificate.
+```
+
 ## Prerequisites
 
 Install [the following packages](../installation/packages.md) in your Python
@@ -30,7 +40,7 @@ Run this command to create an exporter named `example-distributed` and save the
 configuration locally:
 
 ```shell
-$ jmp admin create exporter example-distributed --save
+$ jmp admin create exporter example-distributed --save --insecure-tls-config
 ```
 
 After creating the exporter, find the new configuration file at
@@ -78,7 +88,7 @@ development purposes, and saves the configuration locally in
 `${HOME}/.config/jumpstarter/clients/`:
 
 ```shell
-$ jmp admin create client hello --save --unsafe
+$ jmp admin create client hello --save --unsafe --insecure-tls-config
 ```
 
 ### Spawn an Exporter Shell

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create.py

@@ -6,7 +6,9 @@
 from jumpstarter_cli_common.opt import (
     OutputMode,
     OutputType,
+    confirm_insecure_tls,
     opt_context,
+    opt_insecure_tls_config,
     opt_kubeconfig,
     opt_labels,
     opt_log_level,
@@ -75,13 +77,15 @@ def print_created_client(client: V1Alpha1Client, output: OutputType):
 @opt_labels
 @opt_kubeconfig
 @opt_context
+@opt_insecure_tls_config
 @opt_oidc_username
 @opt_nointeractive
 @opt_output_all
 async def create_client(
     name: Optional[str],
     kubeconfig: Optional[str],
     context: Optional[str],
+    insecure_tls_config: bool,
     namespace: str,
     labels: list[(str, str)],
     save: bool,
@@ -94,6 +98,7 @@ async def create_client(
 ):
     """Create a client object in the Kubernetes cluster"""
     try:
+        confirm_insecure_tls(insecure_tls_config, nointeractive)
         async with ClientsV1Alpha1Api(namespace, kubeconfig, context) as api:
             if output is None:
                 # Only print status if  is not JSON/YAML
@@ -113,6 +118,7 @@ async def create_client(
                 allow_drivers = allow.split(",") if allow is not None and len(allow) > 0 else []
                 client_config.drivers.unsafe = unsafe
                 client_config.drivers.allow = allow_drivers
+                client_config.tls.insecure = insecure_tls_config
                 ClientConfigV1Alpha1.save(client_config, out)
                 # If this is the only client config, set it as default
                 if out is None and len(ClientConfigV1Alpha1.list()) == 1:
@@ -156,13 +162,15 @@ def print_created_exporter(exporter: V1Alpha1Exporter, output: OutputType):
 @opt_labels
 @opt_kubeconfig
 @opt_context
+@opt_insecure_tls_config
 @opt_oidc_username
 @opt_nointeractive
 @opt_output_all
 async def create_exporter(
     name: Optional[str],
     kubeconfig: Optional[str],
     context: Optional[str],
+    insecure_tls_config: bool,
     namespace: str,
     labels: list[(str, str)],
     save: bool,
@@ -173,6 +181,7 @@ async def create_exporter(
 ):
     """Create an exporter object in the Kubernetes cluster"""
     try:
+        confirm_insecure_tls(insecure_tls_config, nointeractive)
         async with ExportersV1Alpha1Api(namespace, kubeconfig, context) as api:
             if output is None:
                 click.echo(f"Creating exporter '{name}' in namespace '{namespace}'")
@@ -182,6 +191,7 @@ async def create_exporter(
                 if output is None:
                     click.echo("Fetching exporter credentials from cluster")
                 exporter_config = await api.get_exporter_config(name)
+                exporter_config.tls.insecure = insecure_tls_config
                 ExporterConfigV1Alpha1.save(exporter_config, out)
                 if output is None:
                     click.echo(f"Exporter configuration successfully saved to {exporter_config.path}")

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create_test.py

@@ -1,4 +1,5 @@
 import uuid
+from pathlib import Path
 from unittest.mock import AsyncMock, Mock, patch
 
 import pytest
@@ -17,6 +18,7 @@
 from jumpstarter.config.client import ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers
 from jumpstarter.config.common import ObjectMeta
 from jumpstarter.config.exporter import ExporterConfigV1Alpha1
+from jumpstarter.config.tls import TLSConfigV1Alpha1
 
 # Generate a random client name
 CLIENT_NAME = uuid.uuid4().hex
@@ -82,6 +84,15 @@
     drivers=ClientConfigV1Alpha1Drivers(allow=[], unsafe=True),
 )
 
+INSECURE_TLS_CLIENT_CONFIG = ClientConfigV1Alpha1(
+    alias=CLIENT_NAME,
+    metadata=ObjectMeta(namespace="default", name=CLIENT_NAME),
+    endpoint=CLIENT_ENDPOINT,
+    token=CLIENT_TOKEN,
+    tls=TLSConfigV1Alpha1(insecure=True),
+    drivers=ClientConfigV1Alpha1Drivers(allow=[], unsafe=True),
+)
+
 
 @pytest.mark.anyio
 @patch.object(ClientConfigV1Alpha1, "save")
@@ -102,6 +113,33 @@ async def test_create_client(
     mock_save_client.assert_not_called()
     mock_save_client.reset_mock()
 
+    # Insecure TLS config is returned
+    mock_get_client_config.return_value = INSECURE_TLS_CLIENT_CONFIG
+
+    # Save with prompts accept insecure = Y, save = Y, unsafe = Y
+    result = await runner.invoke(create, ["client", "--insecure-tls-config", CLIENT_NAME], input="Y\nY\nY\n")
+    assert result.exit_code == 0
+    assert "Client configuration successfully saved" in result.output
+    mock_save_client.assert_called_once_with(INSECURE_TLS_CLIENT_CONFIG, None)
+    mock_save_client.reset_mock()
+
+    # Save no interactive and insecure tls
+    result = await runner.invoke(
+        create, ["client", "--insecure-tls-config", "--unsafe", "--save", "--nointeractive", CLIENT_NAME]
+    )
+    assert result.exit_code == 0
+    assert "Client configuration successfully saved" in result.output
+    mock_save_client.assert_called_once_with(INSECURE_TLS_CLIENT_CONFIG, None)
+    mock_save_client.reset_mock()
+
+    # Insecure TLS config is returned
+    mock_get_client_config.return_value = INSECURE_TLS_CLIENT_CONFIG
+
+    # Save with prompts accept insecure = N
+    result = await runner.invoke(create, ["client", "--insecure-tls-config", CLIENT_NAME], input="n\n")
+    assert result.exit_code == 1
+    assert "Aborted" in result.output
+
     # Unsafe client config is returned
     mock_get_client_config.return_value = UNSAFE_CLIENT_CONFIG
 
@@ -117,7 +155,7 @@ async def test_create_client(
     result = await runner.invoke(create, ["client", CLIENT_NAME, "--unsafe", "--out", out], input="\n\n")
     assert result.exit_code == 0
     assert "Client configuration successfully saved" in result.output
-    mock_save_client.assert_called_once_with(UNSAFE_CLIENT_CONFIG, out)
+    mock_save_client.assert_called_once_with(UNSAFE_CLIENT_CONFIG, str(Path(out).resolve()))
     mock_save_client.reset_mock()
 
     # Regular client config is returned
@@ -221,6 +259,14 @@ async def test_create_client(
     token=EXPORTER_TOKEN,
 )
 
+INSECURE_TLS_EXPORTER_CONFIG = ExporterConfigV1Alpha1(
+    alias=EXPORTER_NAME,
+    metadata=ObjectMeta(namespace="default", name=EXPORTER_NAME),
+    endpoint=EXPORTER_ENDPOINT,
+    token=EXPORTER_TOKEN,
+    tls=TLSConfigV1Alpha1(insecure=True),
+)
+
 
 @pytest.mark.anyio
 @patch.object(ExporterConfigV1Alpha1, "save")
@@ -241,6 +287,32 @@ async def test_create_exporter(
     save_exporter_mock.assert_not_called()
     save_exporter_mock.reset_mock()
 
+    # Insecure TLS config is returned
+    _get_exporter_config_mock.return_value = INSECURE_TLS_EXPORTER_CONFIG
+    # Save with prompts accept insecure = Y, save = Y
+    result = await runner.invoke(create, ["exporter", "--insecure-tls-config", EXPORTER_NAME], input="Y\nY\n")
+    assert result.exit_code == 0
+    assert "Exporter configuration successfully saved" in result.output
+    save_exporter_mock.assert_called_once_with(INSECURE_TLS_EXPORTER_CONFIG, None)
+    save_exporter_mock.reset_mock()
+
+    _get_exporter_config_mock.return_value = INSECURE_TLS_EXPORTER_CONFIG
+    # Save with prompts accept no interactive
+    result = await runner.invoke(
+        create, ["exporter", "--insecure-tls-config", "--nointeractive", "--save", EXPORTER_NAME]
+    )
+    assert result.exit_code == 0
+    assert "Exporter configuration successfully saved" in result.output
+    save_exporter_mock.assert_called_once_with(INSECURE_TLS_EXPORTER_CONFIG, None)
+    save_exporter_mock.reset_mock()
+
+    # Insecure TLS config is returned
+    _get_exporter_config_mock.return_value = INSECURE_TLS_EXPORTER_CONFIG
+    # Save with prompts accept insecure = N
+    result = await runner.invoke(create, ["exporter", "--insecure-tls-config", EXPORTER_NAME], input="n\n")
+    assert result.exit_code == 1
+    assert "Aborted" in result.output
+
     # Save with prompts
     result = await runner.invoke(create, ["exporter", EXPORTER_NAME], input="Y\n")
     assert result.exit_code == 0
@@ -260,7 +332,7 @@ async def test_create_exporter(
     result = await runner.invoke(create, ["exporter", EXPORTER_NAME, "--out", out])
     assert result.exit_code == 0
     assert "Exporter configuration successfully saved" in result.output
-    save_exporter_mock.assert_called_once_with(EXPORTER_CONFIG, out)
+    save_exporter_mock.assert_called_once_with(EXPORTER_CONFIG, str(Path(out).resolve()))
     save_exporter_mock.reset_mock()
 
     # Save with nointeractive

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res.py

@@ -3,7 +3,9 @@
 import asyncclick as click
 from jumpstarter_cli_common.opt import (
     PathOutputType,
+    confirm_insecure_tls,
     opt_context,
+    opt_insecure_tls_config,
     opt_kubeconfig,
     opt_namespace,
     opt_nointeractive,
@@ -45,13 +47,15 @@ def import_res():
 @opt_namespace
 @opt_kubeconfig
 @opt_context
+@opt_insecure_tls_config
 @opt_output_path_only
 @opt_nointeractive
 async def import_client(
     name: str,
     namespace: str,
     kubeconfig: Optional[str],
     context: Optional[str],
+    insecure_tls_config: bool,
     allow: Optional[str],
     unsafe: bool,
     out: Optional[str],
@@ -63,6 +67,7 @@ async def import_client(
     if out is None and ClientConfigV1Alpha1.exists(name):
         raise click.ClickException(f"A client with the name '{name}' already exists")
     try:
+        confirm_insecure_tls(insecure_tls_config, nointeractive)
         async with ClientsV1Alpha1Api(namespace, kubeconfig, context) as api:
             if unsafe is False and allow is None and nointeractive is False:
                 unsafe = click.confirm("Allow unsafe driver client imports?")
@@ -74,6 +79,7 @@ async def import_client(
                 click.echo("Fetching client credentials from cluster")
             allow_drivers = allow.split(",") if allow is not None and len(allow) > 0 else []
             client_config = await api.get_client_config(name, allow=allow_drivers, unsafe=unsafe)
+            client_config.tls.insecure = insecure_tls_config
             config_path = ClientConfigV1Alpha1.save(client_config, out)
             # If this is the only client config, set it as default
             if out is None and len(ClientConfigV1Alpha1.list()) == 1:
@@ -100,6 +106,7 @@ async def import_client(
 @opt_namespace
 @opt_kubeconfig
 @opt_context
+@opt_insecure_tls_config
 @opt_output_path_only
 @opt_nointeractive
 async def import_exporter(
@@ -108,6 +115,7 @@ async def import_exporter(
     out: Optional[str],
     kubeconfig: Optional[str],
     context: Optional[str],
+    insecure_tls_config: bool,
     output: PathOutputType,
     nointeractive: bool,
 ):
@@ -119,10 +127,12 @@ async def import_exporter(
     else:
         raise click.ClickException(f'An exporter with the name "{name}" already exists')
     try:
+        confirm_insecure_tls(insecure_tls_config, nointeractive)
         async with ExportersV1Alpha1Api(namespace, kubeconfig, context) as api:
             if output is None:
                 click.echo("Fetching exporter credentials from cluster")
             exporter_config = await api.get_exporter_config(name)
+            exporter_config.tls.insecure = insecure_tls_config
             config_path = ExporterConfigV1Alpha1.save(exporter_config, out)
             if output is None:
                 click.echo(f"Exporter configuration successfully saved to {config_path}")