From f81184fb653beaf0d15d17c7693cf056391f1ea6 Mon Sep 17 00:00:00 2001 From: Charlie Park Date: Tue, 3 Nov 2026 17:54:06 -0800 Subject: [PATCH 1/2] update nexus routes for access pages with tabs --- nexus/external-api/src/lib.rs | 22 ++----------------- nexus/src/external_api/http_entrypoints.rs | 13 ----------- nexus/tests/integration_tests/console_api.rs | 8 +++---- .../output/uncovered-authz-endpoints.txt | 4 +--- 4 files changed, 7 insertions(+), 40 deletions(-) diff --git a/nexus/external-api/src/lib.rs b/nexus/external-api/src/lib.rs index e7734f0e0c6..6f3bbb27d14 100644 --- a/nexus/external-api/src/lib.rs +++ b/nexus/external-api/src/lib.rs @@ -9447,32 +9447,14 @@ pub trait NexusExternalApi { rqctx: RequestContext, ) -> Result, HttpError>; + // Covers /access as well as the /access/users/* and /access/groups/* pages #[endpoint { method = GET, - path = "/access", + path = "/access/{path:.*}", unpublished = true, }] async fn console_silo_access( rqctx: RequestContext, - ) -> Result, HttpError>; - - #[endpoint { - method = GET, - path = "/users/{path:.*}", - unpublished = true, - }] - async fn console_silo_users( - rqctx: RequestContext, - path_params: Path, - ) -> Result, HttpError>; - - #[endpoint { - method = GET, - path = "/groups/{path:.*}", - unpublished = true, - }] - async fn console_silo_groups( - rqctx: RequestContext, path_params: Path, ) -> Result, HttpError>; diff --git a/nexus/src/external_api/http_entrypoints.rs b/nexus/src/external_api/http_entrypoints.rs index 2dec7644f0e..06381494ab5 100644 --- a/nexus/src/external_api/http_entrypoints.rs +++ b/nexus/src/external_api/http_entrypoints.rs @@ -8849,19 +8849,6 @@ impl NexusExternalApi for NexusExternalApiImpl { async fn console_silo_access( rqctx: RequestContext, - ) -> Result, HttpError> { - console_api::console_index_or_login_redirect(rqctx).await - } - - async fn console_silo_users( - rqctx: RequestContext, - _path_params: Path, - ) -> Result, HttpError> { - console_api::console_index_or_login_redirect(rqctx).await - } - - async fn console_silo_groups( - rqctx: RequestContext, _path_params: Path, ) -> Result, HttpError> { console_api::console_index_or_login_redirect(rqctx).await diff --git a/nexus/tests/integration_tests/console_api.rs b/nexus/tests/integration_tests/console_api.rs index d11b74aceba..ea0be036e02 100644 --- a/nexus/tests/integration_tests/console_api.rs +++ b/nexus/tests/integration_tests/console_api.rs @@ -223,10 +223,10 @@ async fn test_console_pages(cptestctx: &ControlPlaneTestContext) { "/images/irrelevant-path", "/utilization", "/access", - "/users", - "/users/irrelevant-path", - "/groups", - "/groups/irrelevant-path", + "/access/users", + "/access/users/irrelevant-path", + "/access/groups", + "/access/groups/irrelevant-path", "/lookup/", "/lookup/abc", ]; diff --git a/nexus/tests/output/uncovered-authz-endpoints.txt b/nexus/tests/output/uncovered-authz-endpoints.txt index e4feb98b5c6..055d8540df6 100644 --- a/nexus/tests/output/uncovered-authz-endpoints.txt +++ b/nexus/tests/output/uncovered-authz-endpoints.txt @@ -1,10 +1,9 @@ API endpoints with no coverage in authz tests: console_root (get "/") -console_silo_access (get "/access") +console_silo_access (get "/access/{path}") asset (get "/assets/{path}") device_auth_success (get "/device/success") device_auth_verify (get "/device/verify") -console_silo_groups (get "/groups/{path}") console_silo_images (get "/images/{path}") login_begin (get "/login") login_local_begin (get "/login/{silo_name}/local") @@ -15,7 +14,6 @@ console_projects_new (get "/projects-new") console_projects (get "/projects/{path}") console_settings_page (get "/settings/{path}") console_system_page (get "/system/{path}") -console_silo_users (get "/users/{path}") console_silo_utilization (get "/utilization") ping (get "/v1/ping") device_auth_request (post "/device/auth") From 7417b0f8f70edb051180fb93963a3dddbd6e5bb7 Mon Sep 17 00:00:00 2001 From: Charlie Park Date: Tue, 3 Nov 2026 18:18:17 -0800 Subject: [PATCH 2/2] remove comment --- nexus/external-api/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/nexus/external-api/src/lib.rs b/nexus/external-api/src/lib.rs index 6f3bbb27d14..916e717bf6b 100644 --- a/nexus/external-api/src/lib.rs +++ b/nexus/external-api/src/lib.rs @@ -9447,7 +9447,6 @@ pub trait NexusExternalApi { rqctx: RequestContext, ) -> Result, HttpError>; - // Covers /access as well as the /access/users/* and /access/groups/* pages #[endpoint { method = GET, path = "/access/{path:.*}",