amoghrajesh commented on code in PR #64148: URL: https://github.com/apache/airflow/pull/64148#discussion_r2986513189
########## shared/serialization/src/airflow_shared/serialization/__init__.py: ########## @@ -0,0 +1,41 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +from __future__ import annotations + +from .constants import ( + CACHE, + CLASSNAME, + DATA, + OLD_DATA, + OLD_DICT, + OLD_SOURCE, + OLD_TYPE, + SCHEMA_ID, + VERSION, +) Review Comment: Handled it ########## shared/serialization/src/airflow_shared/serialization/__init__.py: ########## @@ -0,0 +1,41 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +from __future__ import annotations + +from .constants import ( + CACHE, + CLASSNAME, + DATA, + OLD_DATA, + OLD_DICT, + OLD_SOURCE, + OLD_TYPE, + SCHEMA_ID, + VERSION, +) Review Comment: Not a bad idea, I can do that ########## airflow-core/src/airflow/api_fastapi/core_api/routes/public/xcom.py: ########## @@ -269,6 +292,24 @@ def create_xcom_entry( detail=f"The XCom with key: `{request_body.key}` with mentioned task instance already exists.", ) + def _check_forbidden_keys(obj: Any, path: str = "value") -> None: + """Recursively check for forbidden deserialization keys in user-provided XCom data.""" + if isinstance(obj, dict): + found = FORBIDDEN_XCOM_KEYS & obj.keys() + if found: + raise HTTPException( + status.HTTP_400_BAD_REQUEST, + f"XCom {path} contains reserved serialization keys: {', '.join(sorted(found))}. " + f"These keys are reserved for internal use.", + ) + for k, v in obj.items(): + _check_forbidden_keys(v, f"{path}.{k}") + elif isinstance(obj, (list, tuple)): + for i, item in enumerate(obj): + _check_forbidden_keys(item, f"{path}[{i}]") + + _check_forbidden_keys(request_body.value) Review Comment: It does yes, the intent is to keep the behaviour of neglecting forbidden keys `FORBIDDEN_XCOM_KEYS` which was lost due to https://github.com/apache/airflow/pull/58900. I have explained that in the PR desc too -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
