diff options
Diffstat (limited to 'libs')
4 files changed, 7 insertions, 23 deletions
diff --git a/libs/VNLib.Plugins.Sessions.Memory/src/MemorySession.cs b/libs/VNLib.Plugins.Sessions.Memory/src/MemorySession.cs index c26c281..5033362 100644 --- a/libs/VNLib.Plugins.Sessions.Memory/src/MemorySession.cs +++ b/libs/VNLib.Plugins.Sessions.Memory/src/MemorySession.cs @@ -104,9 +104,9 @@ namespace VNLib.Plugins.Sessions.Memory //Check for special keys switch (key) { - //For tokens/login hashes, we can set the upgrade flag - case TOKEN_ENTRY: + //For token/login hashes, we can set the upgrade flag case LOGIN_TOKEN_ENTRY: + case TOKEN_ENTRY: Flags.Set(REGEN_ID_MSK); break; } diff --git a/libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionIdProvider.cs b/libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionIdProvider.cs index 5a30ec4..5e8ad6b 100644 --- a/libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionIdProvider.cs +++ b/libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionIdProvider.cs @@ -83,7 +83,7 @@ namespace VNLib.Plugins.Sessions.OAuth private string ComputeSessionIdFromToken(string token) { //Buffer to copy data to - using UnsafeMemoryHandle<char> buffer = Memory.UnsafeAlloc<char>(_bufferSize, true); + using UnsafeMemoryHandle<char> buffer = MemoryUtil.UnsafeAlloc<char>(_bufferSize, true); //Writer to accumulate data ForwardOnlyWriter<char> writer = new(buffer.Span); @@ -100,7 +100,7 @@ namespace VNLib.Plugins.Sessions.OAuth TokenAndSessionIdResult IOauthSessionIdFactory.GenerateTokensAndId() { //Alloc buffer for random data - using UnsafeMemoryHandle<byte> mem = Memory.UnsafeAlloc<byte>(_tokenSize, true); + using UnsafeMemoryHandle<byte> mem = MemoryUtil.UnsafeAlloc<byte>(_tokenSize, true); //Generate token from random cng bytes RandomHash.GetRandomBytes(mem); @@ -112,7 +112,7 @@ namespace VNLib.Plugins.Sessions.OAuth string sessionId = ComputeSessionIdFromToken(token); //Clear buffer - Memory.InitializeBlock(mem.Span); + MemoryUtil.InitializeBlock(mem.Span); //Return sessid result return new(sessionId, token, null); diff --git a/libs/VNLib.Plugins.Sessions.VNCache/src/WebSession.cs b/libs/VNLib.Plugins.Sessions.VNCache/src/WebSession.cs index 8bd17ef..812bf73 100644 --- a/libs/VNLib.Plugins.Sessions.VNCache/src/WebSession.cs +++ b/libs/VNLib.Plugins.Sessions.VNCache/src/WebSession.cs @@ -32,8 +32,6 @@ namespace VNLib.Plugins.Sessions.VNCache { internal class WebSession : RemoteSession { - protected const ulong UPGRADE_MSK = 0b0000000000010000UL; - protected readonly Func<IHttpEvent, string, string> UpdateId; private string? _oldId; @@ -43,20 +41,6 @@ namespace VNLib.Plugins.Sessions.VNCache this.UpdateId = UpdateId; } - protected override void IndexerSet(string key, string value) - { - //Set value - base.IndexerSet(key, value); - switch (key) - { - //Set the upgrade flag when token data is modified - case LOGIN_TOKEN_ENTRY: - case TOKEN_ENTRY: - Flags.Set(UPGRADE_MSK); - break; - } - } - public override async Task WaitAndLoadAsync(IHttpEvent entity, CancellationToken cancellationToken) { //Wait for the session to load @@ -99,7 +83,7 @@ namespace VNLib.Plugins.Sessions.VNCache //write update to server result = Task.Run(ProcessUpgradeAsync); } - else if (Flags.IsSet(UPGRADE_MSK | REGEN_ID_MSK)) + else if (Flags.IsSet(REGEN_ID_MSK)) { //generate new session-id and update the record in the store _oldId = SessionID; diff --git a/libs/VNLib.Plugins.Sessions.VNCache/src/WebSessionIdFactoryImpl.cs b/libs/VNLib.Plugins.Sessions.VNCache/src/WebSessionIdFactoryImpl.cs index 9480dc6..b71d4ea 100644 --- a/libs/VNLib.Plugins.Sessions.VNCache/src/WebSessionIdFactoryImpl.cs +++ b/libs/VNLib.Plugins.Sessions.VNCache/src/WebSessionIdFactoryImpl.cs @@ -103,7 +103,7 @@ namespace VNLib.Plugins.Sessions.VNCache private string ComputeSessionIdFromCookie(string sessionId) { //Buffer to copy data to - using UnsafeMemoryHandle<char> buffer = Memory.UnsafeAlloc<char>(_bufferSize, true); + using UnsafeMemoryHandle<char> buffer = MemoryUtil.UnsafeAlloc<char>(_bufferSize, true); //Writer to accumulate data ForwardOnlyWriter<char> writer = new(buffer.Span); |