@@ -723,6 +723,12 @@ fn expand_access_preset(protocol: &str, access: &str) -> Option<Vec<L7Rule>> {
723723fn append_unique_binaries ( existing : & mut Vec < NetworkBinary > , incoming : & [ NetworkBinary ] ) {
724724 let mut seen: HashSet < String > = existing. iter ( ) . map ( |binary| binary. path . clone ( ) ) . collect ( ) ;
725725 for binary in incoming {
726+ if let Some ( existing_binary) = existing. iter_mut ( ) . find ( |item| item. path == binary. path ) {
727+ if !is_advisor_proposed_binary ( binary) {
728+ mark_user_declared_binary ( existing_binary) ;
729+ }
730+ continue ;
731+ }
726732 if seen. insert ( binary. path . clone ( ) ) {
727733 existing. push ( binary. clone ( ) ) ;
728734 }
@@ -778,8 +784,30 @@ fn dedup_strings(values: &mut Vec<String>) {
778784}
779785
780786fn dedup_binaries ( values : & mut Vec < NetworkBinary > ) {
781- let mut seen = HashSet :: new ( ) ;
782- values. retain ( |binary| seen. insert ( binary. path . clone ( ) ) ) ;
787+ let mut deduped: Vec < NetworkBinary > = Vec :: with_capacity ( values. len ( ) ) ;
788+ for binary in std:: mem:: take ( values) {
789+ if let Some ( existing) = deduped. iter_mut ( ) . find ( |item| item. path == binary. path ) {
790+ if !is_advisor_proposed_binary ( & binary) {
791+ mark_user_declared_binary ( existing) ;
792+ }
793+ } else {
794+ deduped. push ( binary) ;
795+ }
796+ }
797+ * values = deduped;
798+ }
799+
800+ fn is_advisor_proposed_binary ( binary : & NetworkBinary ) -> bool {
801+ #[ allow( deprecated) ]
802+ let advisor_proposed = binary. harness ;
803+ advisor_proposed
804+ }
805+
806+ fn mark_user_declared_binary ( binary : & mut NetworkBinary ) {
807+ #[ allow( deprecated) ]
808+ {
809+ binary. harness = false ;
810+ }
783811}
784812
785813fn dedup_l7_rules ( values : & mut Vec < L7Rule > ) {
@@ -878,6 +906,18 @@ mod tests {
878906 }
879907 }
880908
909+ fn advisor_binary ( path : & str ) -> NetworkBinary {
910+ let mut binary = NetworkBinary {
911+ path : path. to_string ( ) ,
912+ ..Default :: default ( )
913+ } ;
914+ #[ allow( deprecated) ]
915+ {
916+ binary. harness = true ;
917+ }
918+ binary
919+ }
920+
881921 fn rest_rule ( method : & str , path : & str ) -> L7Rule {
882922 L7Rule {
883923 allow : Some ( L7Allow {
@@ -949,6 +989,75 @@ mod tests {
949989 assert_eq ! ( rule. binaries. len( ) , 2 ) ;
950990 }
951991
992+ #[ test]
993+ fn add_rule_user_binary_clears_advisor_marker_for_same_path ( ) {
994+ let mut policy = restrictive_default_policy ( ) ;
995+ policy. network_policies . insert (
996+ "existing" . to_string ( ) ,
997+ NetworkPolicyRule {
998+ name : "existing" . to_string ( ) ,
999+ endpoints : vec ! [ endpoint( "api.github.com" , 443 ) ] ,
1000+ binaries : vec ! [ advisor_binary( "/usr/bin/curl" ) ] ,
1001+ } ,
1002+ ) ;
1003+
1004+ let incoming = NetworkPolicyRule {
1005+ name : "incoming" . to_string ( ) ,
1006+ endpoints : vec ! [ endpoint( "api.github.com" , 443 ) ] ,
1007+ binaries : vec ! [ NetworkBinary {
1008+ path: "/usr/bin/curl" . to_string( ) ,
1009+ ..Default :: default ( )
1010+ } ] ,
1011+ } ;
1012+
1013+ let result = merge_policy (
1014+ policy,
1015+ & [ PolicyMergeOp :: AddRule {
1016+ rule_name : "existing" . to_string ( ) ,
1017+ rule : incoming,
1018+ } ] ,
1019+ )
1020+ . expect ( "merge should succeed" ) ;
1021+
1022+ let rule = & result. policy . network_policies [ "existing" ] ;
1023+ assert_eq ! ( rule. binaries. len( ) , 1 ) ;
1024+ #[ allow( deprecated) ]
1025+ {
1026+ assert ! ( !rule. binaries[ 0 ] . harness) ;
1027+ }
1028+ }
1029+
1030+ #[ test]
1031+ fn add_rule_duplicate_binaries_prefer_user_declared_marker ( ) {
1032+ let incoming = NetworkPolicyRule {
1033+ name : "incoming" . to_string ( ) ,
1034+ endpoints : vec ! [ endpoint( "api.github.com" , 443 ) ] ,
1035+ binaries : vec ! [
1036+ advisor_binary( "/usr/bin/curl" ) ,
1037+ NetworkBinary {
1038+ path: "/usr/bin/curl" . to_string( ) ,
1039+ ..Default :: default ( )
1040+ } ,
1041+ ] ,
1042+ } ;
1043+
1044+ let result = merge_policy (
1045+ restrictive_default_policy ( ) ,
1046+ & [ PolicyMergeOp :: AddRule {
1047+ rule_name : "github" . to_string ( ) ,
1048+ rule : incoming,
1049+ } ] ,
1050+ )
1051+ . expect ( "merge should succeed" ) ;
1052+
1053+ let rule = & result. policy . network_policies [ "github" ] ;
1054+ assert_eq ! ( rule. binaries. len( ) , 1 ) ;
1055+ #[ allow( deprecated) ]
1056+ {
1057+ assert ! ( !rule. binaries[ 0 ] . harness) ;
1058+ }
1059+ }
1060+
9521061 #[ test]
9531062 fn add_rule_merges_websocket_credential_rewrite_flag ( ) {
9541063 let mut policy = restrictive_default_policy ( ) ;
0 commit comments