From fcf34c509e85956fcd100b2b4558258b262d4073 Mon Sep 17 00:00:00 2001 From: Taddes Date: Mon, 30 Mar 2026 14:51:49 -0400 Subject: [PATCH] related ignores or nosec annotations --- tools/postgres/purge_ttl.py | 4 ++-- tools/spanner/count_expired_rows.py | 2 +- tools/spanner/purge_ttl.py | 4 ++-- tools/syncstorage-loadtest/storage/auth.py | 4 ++-- tools/tokenserver/database.py | 7 +++---- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/tools/postgres/purge_ttl.py b/tools/postgres/purge_ttl.py index 6d593e66..7d988ada 100644 --- a/tools/postgres/purge_ttl.py +++ b/tools/postgres/purge_ttl.py @@ -94,7 +94,7 @@ def purge_records(args: argparse.Namespace) -> None: if args.mode in ["batches", "both"]: (batch_query, params) = add_conditions( args, - f"DELETE FROM batches WHERE {expiry_condition}", + f"DELETE FROM batches WHERE {expiry_condition}", # nosec B608 ) exec_delete( engine, @@ -107,7 +107,7 @@ def purge_records(args: argparse.Namespace) -> None: if args.mode in ["bsos", "both"]: (bso_query, params) = add_conditions( args, - f"DELETE FROM bsos WHERE {expiry_condition}", + f"DELETE FROM bsos WHERE {expiry_condition}", # nosec B608 ) exec_delete( engine, diff --git a/tools/spanner/count_expired_rows.py b/tools/spanner/count_expired_rows.py index 16b0a6c0..a13455ba 100644 --- a/tools/spanner/count_expired_rows.py +++ b/tools/spanner/count_expired_rows.py @@ -55,7 +55,7 @@ if __name__ == "__main__": logging.info("Starting count_expired_rows.py") for table in ["batches", "bsos"]: - query = f"SELECT COUNT(*) FROM {table} WHERE expiry < CURRENT_TIMESTAMP()" + query = f"SELECT COUNT(*) FROM {table} WHERE expiry < CURRENT_TIMESTAMP()" # nosec B608 spanner_read_data(query, table) logging.info("Completed count_expired_rows.py") diff --git a/tools/spanner/purge_ttl.py b/tools/spanner/purge_ttl.py index 32e6c3bb..f4e6b7fe 100644 --- a/tools/spanner/purge_ttl.py +++ b/tools/spanner/purge_ttl.py @@ -135,7 +135,7 @@ def spanner_purge(args: argparse.Namespace) -> None: # IN PARENT batches ON DELETE CASCADE) (batch_query, params, types) = add_conditions( args, - f"DELETE FROM batches WHERE {expiry_condition}", + f"DELETE FROM batches WHERE {expiry_condition}", # nosec B608 prefix, ) deleter( @@ -151,7 +151,7 @@ def spanner_purge(args: argparse.Namespace) -> None: if args.mode in ["bsos", "both"]: # Delete BSOs (bso_query, params, types) = add_conditions( - args, f"DELETE FROM bsos WHERE {expiry_condition}", prefix + args, f"DELETE FROM bsos WHERE {expiry_condition}", prefix # nosec B608 ) deleter( database, diff --git a/tools/syncstorage-loadtest/storage/auth.py b/tools/syncstorage-loadtest/storage/auth.py index a6f6538f..c833512f 100644 --- a/tools/syncstorage-loadtest/storage/auth.py +++ b/tools/syncstorage-loadtest/storage/auth.py @@ -78,7 +78,7 @@ def _track_account_creation(email: str, password: str, fxa_uid: str) -> None: with open(_ACCT_TRACKING_FILE, "w") as f: json.dump(accounts, f, indent=2) - except Exception: + except Exception: # nosec B110 # continue with tests pass @@ -105,7 +105,7 @@ def _remove_account_from_tracking(email: str) -> None: with open(_ACCT_TRACKING_FILE, "w") as f: json.dump(accounts, f, indent=2) - except Exception: + except Exception: # nosec B110 pass diff --git a/tools/tokenserver/database.py b/tools/tokenserver/database.py index 98009ff1..0da4bd93 100644 --- a/tools/tokenserver/database.py +++ b/tools/tokenserver/database.py @@ -642,10 +642,9 @@ class Database: if "nodeid" in kwds: cols.append("id") args.append(":nodeid") - query = """ - insert into nodes ({cols}) - values ({args}) - """.format(cols=", ".join(cols), args=", ".join(args)) + query = "insert into nodes ({cols}) values ({args})".format( # nosec B608 + cols=", ".join(cols), args=", ".join(args) + ) res = self._execute_sql( sqltext(query), nodeid=kwds.get("nodeid"),