@@ -12,6 +12,7 @@ use akri_discovery_utils::discovery::{
1212} ;
1313use async_trait:: async_trait;
1414use log:: { error, info, trace} ;
15+ use serde:: { de, Deserialize , Deserializer } ;
1516use std:: collections:: { HashMap , HashSet } ;
1617use std:: time:: Duration ;
1718use tokio:: sync:: mpsc;
@@ -30,6 +31,34 @@ pub struct UdevDiscoveryDetails {
3031
3132 #[ serde( default ) ]
3233 pub group_recursive : bool ,
34+
35+ #[ serde( default = "default_permissions" ) ]
36+ #[ serde( deserialize_with = "validate_permissions" ) ]
37+ pub permissions : String ,
38+ }
39+
40+ // Validate the permissible set of cgroups `permissions`
41+ fn validate_permissions < ' de , D > ( deserializer : D ) -> Result < String , D :: Error >
42+ where
43+ D : Deserializer < ' de > ,
44+ {
45+ let value: String = Deserialize :: deserialize ( deserializer) ?;
46+
47+ // Validating that the string only contains allowed combinations of 'r', 'w', 'm'
48+ let valid_permissions = [ "r" , "w" , "m" , "rw" , "rm" , "rwm" , "wm" ] ;
49+ if valid_permissions. contains ( & value. as_str ( ) ) {
50+ Ok ( value)
51+ } else {
52+ Err ( de:: Error :: invalid_value (
53+ de:: Unexpected :: Str ( & value) ,
54+ & "a valid permission combination ('r', 'w', 'm', 'rw', 'rm', 'rwm', 'wm')" ,
55+ ) )
56+ }
57+ }
58+
59+ /// Default permissions for devices
60+ fn default_permissions ( ) -> String {
61+ "rwm" . to_string ( )
3362}
3463
3564/// `DiscoveryHandlerImpl` discovers udev instances by parsing the udev rules in `discovery_handler_config.udev_rules`.
@@ -105,7 +134,7 @@ impl DiscoveryHandler for DiscoveryHandlerImpl {
105134 device_specs. push ( DeviceSpec {
106135 container_path : devnode. clone ( ) ,
107136 host_path : devnode,
108- permissions : "rwm" . to_string ( ) ,
137+ permissions : discovery_handler_config . permissions . clone ( ) ,
109138 } )
110139 }
111140 }
@@ -178,7 +207,8 @@ mod tests {
178207 let udev_dh_config: UdevDiscoveryDetails = deserialize_discovery_details ( yaml) . unwrap ( ) ;
179208 assert ! ( udev_dh_config. udev_rules. is_empty( ) ) ;
180209 let serialized = serde_json:: to_string ( & udev_dh_config) . unwrap ( ) ;
181- let expected_deserialized = r#"{"udevRules":[],"groupRecursive":false}"# ;
210+ let expected_deserialized =
211+ r#"{"udevRules":[],"groupRecursive":false,"permissions":"rwm"}"# ;
182212 assert_eq ! ( expected_deserialized, serialized) ;
183213 }
184214
@@ -187,9 +217,24 @@ mod tests {
187217 let yaml = r#"
188218 udevRules:
189219 - 'KERNEL=="video[0-9]*"'
220+ permissions: rwm
190221 "# ;
191222 let udev_dh_config: UdevDiscoveryDetails = deserialize_discovery_details ( yaml) . unwrap ( ) ;
192223 assert_eq ! ( udev_dh_config. udev_rules. len( ) , 1 ) ;
193224 assert_eq ! ( & udev_dh_config. udev_rules[ 0 ] , "KERNEL==\" video[0-9]*\" " ) ;
225+ assert_eq ! ( & udev_dh_config. permissions, "rwm" ) ;
226+ }
227+
228+ #[ test]
229+ fn test_deserialize_discovery_details_permissions_invalid ( ) {
230+ let yaml = r#"
231+ udevRules:
232+ - 'KERNEL=="video[0-9]*"'
233+ permissions: xyz
234+ "# ;
235+ match deserialize_discovery_details :: < UdevDiscoveryDetails > ( yaml) {
236+ Ok ( _) => panic ! ( "Expected error parsing invalid permissions" ) ,
237+ Err ( e) => assert ! ( e. to_string( ) . contains( "a valid permission combination" ) ) ,
238+ }
194239 }
195240}
0 commit comments