@@ -147,7 +147,7 @@ pub fn uninspectable_traffic_gate(
147147/// Emit the detection finding for traffic a matching middleware chain cannot
148148/// inspect: denied under a fail-closed chain, bypassed under fail-open.
149149pub fn emit_middleware_uninspectable ( ctx : & L7EvalContext , detail : & str , denied : bool ) {
150- let event = DetectionFindingBuilder :: new ( openshell_ocsf:: ctx:: ctx ( ) )
150+ let mut event = DetectionFindingBuilder :: new ( openshell_ocsf:: ctx:: ctx ( ) )
151151 . severity ( if denied {
152152 SeverityId :: High
153153 } else {
@@ -167,9 +167,11 @@ pub fn emit_middleware_uninspectable(ctx: &L7EvalContext, detail: &str, denied:
167167 "Uninspectable traffic to host with required middleware; denied"
168168 } else {
169169 "Uninspectable traffic bypassed middleware (fail_open)"
170- } )
171- . build ( ) ;
172- egress_emit ! ( event) ;
170+ } ) ;
171+ if denied {
172+ event = event. action ( ActionId :: Denied ) ;
173+ }
174+ egress_emit ! ( event. build( ) ) ;
173175}
174176
175177pub fn emit_websocket_preflight_events (
@@ -185,7 +187,7 @@ pub fn emit_websocket_preflight_events(
185187 emit_websocket_saturation ( ctx) ;
186188 }
187189 if outcome. session_capacity_exhausted {
188- emit_middleware_session_capacity_exhausted ( ctx) ;
190+ emit_middleware_session_capacity_exhausted ( ctx, !outcome . allowed ) ;
189191 }
190192}
191193
@@ -454,8 +456,8 @@ fn emit_websocket_saturation(ctx: &L7EvalContext) {
454456 egress_emit ! ( event) ;
455457}
456458
457- fn emit_middleware_session_capacity_exhausted ( ctx : & L7EvalContext ) {
458- let event = DetectionFindingBuilder :: new ( openshell_ocsf:: ctx:: ctx ( ) )
459+ fn emit_middleware_session_capacity_exhausted ( ctx : & L7EvalContext , denied : bool ) {
460+ let mut event = DetectionFindingBuilder :: new ( openshell_ocsf:: ctx:: ctx ( ) )
459461 . severity ( SeverityId :: Medium )
460462 . finding_info ( FindingInfo :: new (
461463 "openshell.middleware.session_capacity_exhausted" ,
@@ -466,13 +468,16 @@ fn emit_middleware_session_capacity_exhausted(ctx: &L7EvalContext) {
466468 ( "host" , ctx. host . as_str ( ) ) ,
467469 ( "operation" , "websocket_message" ) ,
468470 ] )
469- . message ( "Persistent middleware session admission was refused at process capacity" )
470- . build ( ) ;
471- egress_emit ! ( event) ;
471+ . message ( "Persistent middleware session admission was refused at process capacity" ) ;
472+ if denied {
473+ event = event. action ( ActionId :: Denied ) ;
474+ }
475+ egress_emit ! ( event. build( ) ) ;
472476}
473477
474478fn middleware_admission_exhausted_event ( ctx : & L7EvalContext ) -> openshell_ocsf:: OcsfEvent {
475479 DetectionFindingBuilder :: new ( openshell_ocsf:: ctx:: ctx ( ) )
480+ . action ( ActionId :: Denied )
476481 . severity ( SeverityId :: Medium )
477482 . finding_info ( FindingInfo :: new (
478483 "openshell.middleware.admission_exhausted" ,
@@ -796,7 +801,7 @@ pub(super) fn resolve_unbuffered_body(
796801}
797802
798803fn emit_middleware_body_unavailable ( ctx : & L7EvalContext , denied : bool ) {
799- let event = DetectionFindingBuilder :: new ( openshell_ocsf:: ctx:: ctx ( ) )
804+ let mut event = DetectionFindingBuilder :: new ( openshell_ocsf:: ctx:: ctx ( ) )
800805 . severity ( if denied {
801806 SeverityId :: High
802807 } else {
@@ -815,9 +820,11 @@ fn emit_middleware_body_unavailable(ctx: &L7EvalContext, denied: bool) {
815820 "Request body exceeded middleware inspection cap; denied"
816821 } else {
817822 "Request body exceeded middleware inspection cap; passed through (fail_open)"
818- } )
819- . build ( ) ;
820- egress_emit ! ( event) ;
823+ } ) ;
824+ if denied {
825+ event = event. action ( ActionId :: Denied ) ;
826+ }
827+ egress_emit ! ( event. build( ) ) ;
821828}
822829
823830/// Parse the raw header block into middleware-visible headers, preserving
@@ -1109,6 +1116,71 @@ mod trace_tests {
11091116 }
11101117 }
11111118
1119+ #[ tokio:: test( flavor = "multi_thread" , worker_threads = 2 ) ]
1120+ async fn inspection_refusals_record_denial_but_fail_open_findings_do_not ( ) {
1121+ for denied in [ false , true ] {
1122+ let ( events, received) = exported ( "warn" , || {
1123+ let ctx = L7EvalContext :: default ( ) ;
1124+ emit_middleware_uninspectable ( & ctx, "unknown protocol" , denied) ;
1125+ emit_middleware_body_unavailable ( & ctx, denied) ;
1126+ } )
1127+ . await ;
1128+ assert_eq ! ( events. len( ) , 2 ) ;
1129+ for ( event, uid) in events. iter ( ) . zip ( [
1130+ "openshell.middleware.traffic_uninspectable" ,
1131+ "openshell.middleware.body_unavailable" ,
1132+ ] ) {
1133+ assert_eq ! ( event[ "finding_info" ] [ "uid" ] , uid) ;
1134+ assert_eq ! ( event[ "class_uid" ] , 2004 ) ;
1135+ assert_eq ! ( event[ "action_id" ] . as_u64( ) , denied. then_some( 2 ) ) ;
1136+ assert_eq ! ( event[ "action" ] . as_str( ) , denied. then_some( "Denied" ) ) ;
1137+ if !denied {
1138+ assert ! ( event. get( "action_id" ) . is_none( ) ) ;
1139+ assert ! ( event. get( "action" ) . is_none( ) ) ;
1140+ }
1141+ }
1142+ // A finding-only refusal still creates no HTTP deny span.
1143+ assert_no_deny ( & events, & received) ;
1144+ }
1145+ }
1146+
1147+ #[ tokio:: test( flavor = "multi_thread" , worker_threads = 2 ) ]
1148+ async fn session_capacity_findings_follow_the_preflight_outcome ( ) {
1149+ for allowed in [ true , false ] {
1150+ let ( events, received) = exported ( "warn" , || {
1151+ emit_websocket_preflight_events (
1152+ & L7EvalContext :: default ( ) ,
1153+ & openshell_supervisor_middleware:: WebSocketPreflightResult {
1154+ allowed,
1155+ terminal_reason : None ,
1156+ reason : "middleware_session_capacity_exhausted" . into ( ) ,
1157+ denial : None ,
1158+ session : None ,
1159+ findings : vec ! [ ] ,
1160+ metadata : std:: collections:: BTreeMap :: new ( ) ,
1161+ invocations : vec ! [ ] ,
1162+ coverage : vec ! [ ] ,
1163+ saturated : false ,
1164+ session_capacity_exhausted : true ,
1165+ } ,
1166+ ) ;
1167+ } )
1168+ . await ;
1169+ assert_eq ! ( events. len( ) , 1 ) ;
1170+ assert_eq ! (
1171+ events[ 0 ] [ "finding_info" ] [ "uid" ] ,
1172+ "openshell.middleware.session_capacity_exhausted"
1173+ ) ;
1174+ assert_eq ! ( events[ 0 ] [ "action_id" ] . as_u64( ) , ( !allowed) . then_some( 2 ) ) ;
1175+ assert_eq ! ( events[ 0 ] [ "action" ] . as_str( ) , ( !allowed) . then_some( "Denied" ) ) ;
1176+ if allowed {
1177+ assert ! ( events[ 0 ] . get( "action_id" ) . is_none( ) ) ;
1178+ assert ! ( events[ 0 ] . get( "action" ) . is_none( ) ) ;
1179+ }
1180+ assert_no_deny ( & events, & received) ;
1181+ }
1182+ }
1183+
11121184 #[ tokio:: test( flavor = "multi_thread" , worker_threads = 2 ) ]
11131185 async fn http_chain_outcomes_group_findings_and_preserve_allowed_controls ( ) {
11141186 for allowed in [ true , false ] {
@@ -1169,6 +1241,10 @@ mod tests {
11691241
11701242 let serialized = serde_json:: to_string ( & middleware_admission_exhausted_event ( & ctx) )
11711243 . expect ( "serialize admission event" ) ;
1244+ let event: serde_json:: Value = serde_json:: from_str ( & serialized) . unwrap ( ) ;
1245+ assert_eq ! ( event[ "class_uid" ] , 2004 ) ;
1246+ assert_eq ! ( event[ "action_id" ] , 2 ) ;
1247+ assert_eq ! ( event[ "action" ] , "Denied" ) ;
11721248 assert ! ( serialized. contains( "openshell.middleware.admission_exhausted" ) ) ;
11731249 assert ! ( serialized. contains( "api-policy" ) ) ;
11741250 assert ! ( serialized. contains( "api.example.test" ) ) ;
0 commit comments