Skip to content

Commit

Permalink
Fix broken locking in OAuth
Browse files Browse the repository at this point in the history
Closes #26824... I think?

Can be reproduced via something like

diff --git a/osu.Game/Online/API/OAuth.cs b/osu.Game/Online/API/OAuth.cs
index 485274f349..e6e93ab4c7 100644
--- a/osu.Game/Online/API/OAuth.cs
+++ b/osu.Game/Online/API/OAuth.cs
@@ -151,6 +151,11 @@ internal string RequestAccessToken()
         {
             if (!ensureAccessToken()) return null;

+            for (int i = 0; i < 10000; ++i)
+            {
+                _ = Token.Value.AccessToken;
+            }
+
             return Token.Value.AccessToken;
         }

The cause is `SecondFactorAuthForm` calling `Logout()`, which calls
`OAuth.Clear()`, _while_ the `APIAccess` connect loop is checking if
`authentication.HasValidAccessToken` is true, which happens to
internally check `Token.Value.AccessToken`, which the clearing of
tokens can brutally interrupt.
  • Loading branch information
bdach committed Jan 30, 2024
1 parent 6931af6 commit 000ddc1
Showing 1 changed file with 12 additions and 15 deletions.
27 changes: 12 additions & 15 deletions osu.Game/Online/API/OAuth.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,19 +128,12 @@ private bool ensureAccessToken()
// if we already have a valid access token, let's use it.
if (accessTokenValid) return true;

// we want to ensure only a single authentication update is happening at once.
lock (access_token_retrieval_lock)
{
// re-check if valid, in case another request completed and revalidated our access.
if (accessTokenValid) return true;

// if not, let's try using our refresh token to request a new access token.
if (!string.IsNullOrEmpty(Token.Value?.RefreshToken))
// ReSharper disable once PossibleNullReferenceException
AuthenticateWithRefresh(Token.Value.RefreshToken);
// if not, let's try using our refresh token to request a new access token.
if (!string.IsNullOrEmpty(Token.Value?.RefreshToken))
// ReSharper disable once PossibleNullReferenceException
AuthenticateWithRefresh(Token.Value.RefreshToken);

return accessTokenValid;
}
return accessTokenValid;
}

private bool accessTokenValid => Token.Value?.IsValid ?? false;
Expand All @@ -149,14 +142,18 @@ private bool ensureAccessToken()

internal string RequestAccessToken()
{
if (!ensureAccessToken()) return null;
lock (access_token_retrieval_lock)
{
if (!ensureAccessToken()) return null;

return Token.Value.AccessToken;
return Token.Value.AccessToken;
}
}

internal void Clear()
{
Token.Value = null;
lock (access_token_retrieval_lock)
Token.Value = null;
}

private class AccessTokenRequestRefresh : AccessTokenRequest
Expand Down

0 comments on commit 000ddc1

Please sign in to comment.