schema: AllOf/OneOf: actually perform additional_properties() check

rather than just always allowing additional properties, only return
true if any of the available schemas allows it

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/proxmox-schema/src/schema.rs b/proxmox-schema/src/schema.rs
index 2377718e1f812261d682493d954a201641bdf1d7..257cedc8954a457854296b0b133ca8bbbe77fcee 100644 (file)
--- a/proxmox-schema/src/schema.rs
+++ b/proxmox-schema/src/schema.rs
@@ -917,7 +917,12 @@ impl ObjectSchemaType for AllOfSchema {
     }
 
     fn additional_properties(&self) -> bool {
-        true
+        self.list.iter().any(|schema| {
+            schema
+                .any_object()
+                .expect("non-object-schema in `AllOfSchema`")
+                .additional_properties()
+        })
     }
 
     fn default_key(&self) -> Option<&'static str> {
@@ -988,7 +993,12 @@ impl ObjectSchemaType for OneOfSchema {
     }
 
     fn additional_properties(&self) -> bool {
-        true
+        self.list.iter().any(|(_, schema)| {
+            schema
+                .any_object()
+                .expect("non-object-schema in `OneOfSchema`")
+                .additional_properties()
+        })
     }
 
     fn default_key(&self) -> Option<&'static str> {