diff options
Diffstat (limited to 'libs/VNLib.Plugins.Sessions.OAuth/src')
| -rw-r--r-- | libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionConfig.cs | 27 | ||||
| -rw-r--r-- | libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionProvider.cs | 6 |
2 files changed, 10 insertions, 23 deletions
diff --git a/libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionConfig.cs b/libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionConfig.cs index 9e612d5..ab36e25 100644 --- a/libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionConfig.cs +++ b/libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionConfig.cs @@ -22,10 +22,10 @@ * along with this program. If not, see https://www.gnu.org/licenses/. */ -using System; using System.Text.Json.Serialization; using VNLib.Plugins.Extensions.Loading; +using VNLib.Plugins.Extensions.Loading.Configuration; namespace VNLib.Plugins.Sessions.OAuth @@ -47,27 +47,12 @@ namespace VNLib.Plugins.Sessions.OAuth [JsonPropertyName("access_token_type")] public string TokenType { get; set; } = "Bearer"; - public void Validate() + public void OnValidate() { - if (MaxTokensPerApp < 1) - { - throw new ArgumentOutOfRangeException("max_tokens_per_app", "You must configure at least 1 Oatuh2 access token per application, or disable this plugin"); - } - - if (AccessTokenSize < 16) - { - throw new ArgumentOutOfRangeException("access_token_size", "You must configure an access token size of at least 16 bytes in length"); - } - - if (TokenLifeTimeSeconds < 1) - { - throw new ArgumentOutOfRangeException("token_valid_for_sec", "You must configure an access token lifetime"); - } - - if (string.IsNullOrWhiteSpace(CachePrefix)) - { - throw new ArgumentException("You must specify a cache prefix", "cache_prefix"); - } + Validate.Range(MaxTokensPerApp, 1, int.MaxValue); + Validate.Range(AccessTokenSize, 16, int.MaxValue); + Validate.Range(TokenLifeTimeSeconds, 1, int.MaxValue); + Validate.NotNull(CachePrefix, "You must specify a cache prefix"); } } }
\ No newline at end of file diff --git a/libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionProvider.cs b/libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionProvider.cs index bc06052..fe176d6 100644 --- a/libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionProvider.cs +++ b/libs/VNLib.Plugins.Sessions.OAuth/src/OAuth2SessionProvider.cs @@ -71,6 +71,8 @@ namespace VNLib.Plugins.Sessions.OAuth TokenStore = new(plugin.GetContextOptions()); _tokenTypeString = $"client_credential,{_tokenFactory.TokenType}"; + _maxConnections = config.GetValueOrDefault("max_connections", p => p.GetUInt32(), 1000u); + //Schedule interval plugin.ScheduleInterval(this, TimeSpan.FromMinutes(2)); @@ -168,7 +170,7 @@ namespace VNLib.Plugins.Sessions.OAuth session.Invalidate(); //Clears important security variables - InitNewSession(session, null); + InitNewSession(session, app: null); } return new SessionHandle(session, OnSessionReleases); @@ -198,7 +200,7 @@ namespace VNLib.Plugins.Sessions.OAuth await _sessions.CommitSessionAsync(newSession); //Init new token result to pass to client - return new OAuth2TokenResult() + return new OAuth2TokenResult { ExpiresSeconds = (int)_tokenFactory.SessionValidFor.TotalSeconds, TokenType = _tokenFactory.TokenType, |