Usiel opened a new pull request, #35048:
URL: https://github.com/apache/airflow/pull/35048

   We can get into trouble for text types that cannot be initiated with re2's 
`type(obj)()` call. The `secrets_masker` thus fails, which triggers a warning 
log, which also fails because we pass the object to the logger, which is then 
masked again, and so forth.
   
   We can break the recursion by printing out the `repr` of the object in 
question in the warning log. This issue has occured previously: 
https://github.com/apache/airflow/issues/19816#issuecomment-983311373
   
   I noticed this issue while working with a DAG that calls Airflow's DB 
cleanup function, thus I'm fixing the logging call in `db_cleanup` to log a 
stringified name instead of the `quoted_name` object.
   
   I thought about fixing the `SecretsMasker` call to the reducer, i.e. only 
passing objects that re2 can handle (i.e. having a parameterless constructor), 
but decided against it. Checking for this would probably not be cheap and 
considering this scenario is quite unlikely, I think it's better to simply fail 
and emit a warning log (without the infinite recursion :)).
   
   ### Testing
   
   I added a basic test that fails next time someone refactors the warning log. 
I also used the following DAG for a more comprehensive end-to-end test:
   
   ```
   from datetime import datetime
   
   from airflow import DAG
   from airflow.models import Variable
   from airflow.operators.python import PythonOperator
   
   class MyStringClass(str):
       def __init__(self, required_arg):
           pass
   
   def fail(task_instance):
       # make sure the `SecretsMasker` has a replacer
       Variable.set(key="secret", value="secret_value")
       Variable.get("secret")
       # trigger the infinite recursion
       task_instance.log.info("%s", MyStringClass("secret_value"))
   
   with DAG(
       dag_id="secrets_masker_recursion",
       start_date=datetime(2023, 9, 26),
   ):
       PythonOperator(task_id="fail", python_callable=fail)
   
   ```
   
   Related: 
https://github.com/apache/airflow/issues/19816#issuecomment-983311373
   See also: https://github.com/apache/airflow/pull/20039
   Broke with: https://github.com/apache/airflow/pull/33520
   
   <!--
    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.
    -->
   
   <!--
   Thank you for contributing! Please make sure that your code changes
   are covered with tests. And in case of new features or big changes
   remember to adjust the documentation.
   
   Feel free to ping committers for the review!
   
   In case of an existing issue, reference it using one of the following:
   
   closes: #ISSUE
   related: #ISSUE
   
   How to write a good git commit message:
   http://chris.beams.io/posts/git-commit/
   -->
   
   
   
   <!-- Please keep an empty line above the dashes. -->
   ---
   **^ Add meaningful description above**
   Read the **[Pull Request 
Guidelines](https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst#pull-request-guidelines)**
 for more information.
   In case of fundamental code changes, an Airflow Improvement Proposal 
([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals))
 is needed.
   In case of a new dependency, check compliance with the [ASF 3rd Party 
License Policy](https://www.apache.org/legal/resolved.html#category-x).
   In case of backwards incompatible changes please leave a note in a 
newsfragment file, named `{pr_number}.significant.rst` or 
`{issue_number}.significant.rst`, in 
[newsfragments](https://github.com/apache/airflow/tree/main/newsfragments).
   


-- 
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]

Reply via email to