@@ -57,11 +57,21 @@ async fn authorize(
5757 Ok ( ( ) )
5858}
5959
60+ fn require_enabled ( state : & ServerState ) -> Result < ( ) , Status > {
61+ if !state. config . supervisor_app_listener . enabled {
62+ return Err ( Status :: failed_precondition (
63+ "service discovery requires the supervisor app listener to be enabled" ,
64+ ) ) ;
65+ }
66+ Ok ( ( ) )
67+ }
68+
6069pub async fn get_snapshot (
6170 state : & Arc < ServerState > ,
6271 request : Request < GetServiceRouteSnapshotRequest > ,
6372) -> Result < Response < GetServiceRouteSnapshotResponse > , Status > {
6473 let principal = super :: extract_principal ( & request) ?;
74+ require_enabled ( state) ?;
6575 let workspace = selected_workspace_name ( request. get_ref ( ) . workspace_scope . as_ref ( ) ) ?;
6676 authorize ( state, & principal, workspace) . await ?;
6777 Ok ( Response :: new ( GetServiceRouteSnapshotResponse {
@@ -74,6 +84,7 @@ pub async fn watch(
7484 request : Request < WatchServiceRoutesRequest > ,
7585) -> Result < Response < RouteWatchStream > , Status > {
7686 let principal = super :: extract_principal ( & request) ?;
87+ require_enabled ( state) ?;
7788 let workspace =
7889 selected_workspace_name ( request. get_ref ( ) . workspace_scope . as_ref ( ) ) ?. to_string ( ) ;
7990 authorize ( state, & principal, & workspace) . await ?;
@@ -300,6 +311,38 @@ mod tests {
300311 }
301312 }
302313
314+ #[ tokio:: test]
315+ async fn disabled_listener_rejects_discovery_without_allocating_a_watch ( ) {
316+ let ( mut state, owner, report) = installed_fixture ( ) . await ;
317+ // Persist a route first: disabling must reject discovery even with stored evidence.
318+ accept ( & state, & owner, & report, current_time_ms ( ) + 10_000 )
319+ . await
320+ . unwrap ( ) ;
321+ Arc :: get_mut ( & mut state)
322+ . unwrap ( )
323+ . config
324+ . supervisor_app_listener
325+ . enabled = false ;
326+ let permits = state. discovery_watches . available_permits ( ) ;
327+ let error = get_snapshot ( & state, authed_request ( request ( ) ) )
328+ . await
329+ . unwrap_err ( ) ;
330+ assert_eq ! ( error. code( ) , tonic:: Code :: FailedPrecondition ) ;
331+ assert ! ( error. message( ) . contains( "app listener" ) ) ;
332+ let error = watch (
333+ & state,
334+ authed_request ( WatchServiceRoutesRequest {
335+ workspace_scope : request ( ) . workspace_scope ,
336+ ..Default :: default ( )
337+ } ) ,
338+ )
339+ . await
340+ . unwrap_err ( ) ;
341+ assert_eq ! ( error. code( ) , tonic:: Code :: FailedPrecondition ) ;
342+ assert ! ( error. message( ) . contains( "app listener" ) ) ;
343+ assert_eq ! ( state. discovery_watches. available_permits( ) , permits) ;
344+ }
345+
303346 #[ tokio:: test]
304347 async fn snapshot_is_shared_between_gateway_states_and_rejects_expired_or_replaced_owners ( ) {
305348 let ( state, owner, report) = installed_fixture ( ) . await ;
0 commit comments