rusackas commented on code in PR #42897: URL: https://github.com/apache/superset/pull/42897#discussion_r3738401113
########## superset/migrations/versions/2026-08-07_09-00_da0e3f0081bf_enforce_oauth2_token_uniqueness.py: ########## @@ -0,0 +1,75 @@ +# 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. +"""Enforce one OAuth2 token per (user_id, database_id). + +`OAuth2StoreTokenCommand` always deletes any existing token for a +user+database pair before storing a new one, so the table is only ever +meant to carry a single live row per pair -- but that invariant was only +enforced in application code, via a plain (non-unique) lookup index. A +race between two concurrent OAuth2 callbacks for the same user+database +can leave duplicate rows behind, and nothing downstream picks a +deterministic one of them. Flagged as a follow-up during review of #42211 +(which fixed an unrelated `purge_oauth2_tokens` filter bug on this same +table). + +Pre-flight: deletes any pre-existing duplicate rows, keeping the +highest-id row per (user_id, database_id) pair, since +`OAuth2StoreTokenCommand` always deletes-then-inserts and a higher id is +therefore the more recently issued token. + +Revision ID: da0e3f0081bf +Revises: b8d2f4a6c901 +Create Date: 2026-08-07 09:00:00.000000 + +""" + +import sqlalchemy as sa +from alembic import op +from sqlalchemy.sql import func, select + +from superset.migrations.shared.utils import create_index, drop_index + +# revision identifiers, used by Alembic. +revision: str = "da0e3f0081bf" +down_revision: str = "b8d2f4a6c901" + +TABLE_NAME = "database_user_oauth2_tokens" +INDEX_NAME = "idx_user_id_database_id" + + +def upgrade() -> None: + bind = op.get_bind() + metadata = sa.MetaData() + table = sa.Table(TABLE_NAME, metadata, autoload_with=bind) + + max_ids = ( + select(func.max(table.c.id).label("max_id")) + .group_by(table.c.user_id, table.c.database_id) + .alias("max_ids") + ) + bind.execute(table.delete().where(table.c.id.notin_(select(max_ids.c.max_id)))) Review Comment: Good catch — fixed. The DELETE now reads duplicate ids in Python instead of subquerying the same table, and while I was in there I found the drop/create of `idx_user_id_database_id` also broke MySQL (error 1553, the index is the only one covering the `user_id` FK), so the migration now swaps in the unique index under a temp name before dropping the old one. -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
