merge: Merge pull request #209 from arunaengine/fix/cors_overwrite

Fix/cors overwrite

Author: das-Abroxas

components/data_proxy/src/caching/grpc_query_handler.rs

@@ -512,10 +512,16 @@ impl GrpcQueryHandler {
             variant: KeyValueVariant::Label as i32,
         };
 
+        let remove_key_values = obj
+            .key_values
+            .into_iter()
+            .filter(|k| k.key == "app.aruna-storage.org/cors")
+            .collect();
+
         let mut req = Request::new(UpdateProjectKeyValuesRequest {
             project_id: obj.id.to_string(),
             add_key_values: vec![kv],
-            remove_key_values: vec![],
+            remove_key_values,
         });
 
         Self::add_token_to_md(req.metadata_mut(), token)?;

components/server/src/middlelayer/relations_request_types.rs

@@ -53,13 +53,15 @@ impl ModifyRelations {
                 &self.0.add_relations,
                 resource_id,
                 transaction_client,
+                DbPermissionLevel::APPEND,
             )
             .await?;
         let (external_rm_relations, temp_rm_int_relations, mut removed_to_check) =
             ModifyRelations::convert_relations(
                 &self.0.remove_relations,
                 resource_id,
                 transaction_client,
+                DbPermissionLevel::WRITE,
             )
             .await?;
         if !temp_rm_int_relations
@@ -101,6 +103,7 @@ impl ModifyRelations {
         api_relations: &Vec<Relation>,
         resource_id: DieselUlid,
         transaction_client: &Client,
+        permission_level: DbPermissionLevel,
     ) -> Result<(Vec<ExternalRelation>, Vec<InternalRelation>, Vec<Context>)> {
         let mut external_relations: Vec<ExternalRelation> = Vec::new();
         let mut internal_relations: Vec<InternalRelation> = Vec::new();
@@ -114,7 +117,7 @@ impl ModifyRelations {
                     relation::Relation::Internal(internal) => {
                         resources_to_check.push(Context::res_ctx(
                             DieselUlid::from_str(&internal.resource_id)?,
-                            DbPermissionLevel::WRITE,
+                            permission_level,
                             true,
                         ));
                         internal_relations

components/server/src/middlelayer/update_db_handler.rs

@@ -160,6 +160,22 @@ impl DatabaseHandler {
                 "Both add_key_values and remove_key_values are empty.",
             ));
         }
+        if !rm_key_values.0.is_empty() {
+            let object = Object::get(id, transaction_client)
+                .await?
+                .ok_or(anyhow!("Dataset does not exist."))?;
+            for kv in rm_key_values.0 {
+                if kv.variant == KeyValueVariant::STATIC_LABEL {
+                    return Err(anyhow!("Cannot remove static labels."));
+                }
+                if kv.variant == KeyValueVariant::HOOK_STATUS {
+                    return Err(anyhow!(
+                        "Cannot remove hook_status outside of hook_callback"
+                    ));
+                }
+                object.remove_key_value(transaction_client, kv).await?;
+            }
+        }
         if !add_key_values.0.is_empty() {
             for kv in add_key_values.0 {
                 match kv.variant {
@@ -182,22 +198,6 @@ impl DatabaseHandler {
             }
         }
 
-        if !rm_key_values.0.is_empty() {
-            let object = Object::get(id, transaction_client)
-                .await?
-                .ok_or(anyhow!("Dataset does not exist."))?;
-            for kv in rm_key_values.0 {
-                if kv.variant == KeyValueVariant::STATIC_LABEL {
-                    return Err(anyhow!("Cannot remove static labels."));
-                }
-                if kv.variant == KeyValueVariant::HOOK_STATUS {
-                    return Err(anyhow!(
-                        "Cannot remove hook_status outside of hook_callback"
-                    ));
-                }
-                object.remove_key_value(transaction_client, kv).await?;
-            }
-        }
         self.evaluate_rules(&vec![id], transaction_client).await?;
         transaction.commit().await?;