Override for AclWithAadAuthenticator added. Earlier it would only use…

… IsAuthenticated from base class i.e. GarnetAclAuthenticator which would not abide by IsAuthenticated from aad authenticator which sets token validity.
microsoft · Dec 10, 2024 · a44aeb4 · a44aeb4
1 parent 4ebe239
commit a44aeb4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/libs/server/Auth/GarnetACLAuthenticator.cs b/libs/server/Auth/GarnetACLAuthenticator.cs
@@ -44,7 +44,7 @@ public GarnetACLAuthenticator(AccessControlList accessControlList, ILogger logge
         /// <summary>
         /// Check if the user is authorized to execute commands.
         /// </summary>
-        public bool IsAuthenticated => _user != null;
+        public virtual bool IsAuthenticated => _user != null;
 
         /// <summary>
         /// ACL authenticator is can use ACL.

diff --git a/libs/server/Auth/GarnetAclWithAadAuthenticator.cs b/libs/server/Auth/GarnetAclWithAadAuthenticator.cs
@@ -38,5 +38,14 @@ protected override bool AuthenticateInternal(User user, ReadOnlySpan<byte> usern
             }
             return false;
         }
+
+        public override bool IsAuthenticated
+        {
+            get
+            {
+                return this._garnetAuthenticator.IsAuthenticated 
+                    && base.IsAuthenticated;
+            }
+        }
     }
 }