From 6da9d3b34fb0dd61cf8a81290e573e54851fcd07 Mon Sep 17 00:00:00 2001 From: vnugent Date: Sun, 24 Mar 2024 21:17:57 -0400 Subject: Squashed commit of the following: commit 0103116bdc79d2ea8cfeba99d78fed976373f0da Author: vnugent Date: Thu Mar 21 14:36:12 2024 -0400 chore: Update core ReadonlyJWK deserialization commit 2c07ebbbcfdbc0989685de2af85adb0dcf731d30 Author: vnugent Date: Sun Mar 10 21:58:28 2024 -0400 source tree project location updated commit f0c2f505c80d7bec0d674c67439f3f692d44bca7 Merge: d1c17d8 e548175 Author: vnugent Date: Sun Mar 10 16:49:17 2024 -0400 Merge remote-tracking branch 'origin/master' into develop commit d1c17d845d55bdb3c8c51b619ca2c6b5393bc08b Author: vnugent Date: Sat Mar 9 16:30:44 2024 -0500 package updates commit 7a263bf54b7967ddeb9f6b662339ec1c74546ce8 Author: vnugent Date: Sat Mar 9 14:19:31 2024 -0500 refactor: Overhaul secret loading. Remove VaultSharp as a dep commit 766e179d110db4f955fffce55f2b0ad41c139179 Author: vnugent Date: Wed Mar 6 21:35:35 2024 -0500 refactor: changed how service constructors are invoked, moved routing --- lib/VNLib.Plugins.Extensions.Loading/src/Secrets/VaultSecrets.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/VNLib.Plugins.Extensions.Loading/src/Secrets') diff --git a/lib/VNLib.Plugins.Extensions.Loading/src/Secrets/VaultSecrets.cs b/lib/VNLib.Plugins.Extensions.Loading/src/Secrets/VaultSecrets.cs index a5ba550..9be74ee 100644 --- a/lib/VNLib.Plugins.Extensions.Loading/src/Secrets/VaultSecrets.cs +++ b/lib/VNLib.Plugins.Extensions.Loading/src/Secrets/VaultSecrets.cs @@ -214,7 +214,7 @@ namespace VNLib.Plugins.Extensions.Loading /// public static PrivateKey GetPrivateKey(this ISecretResult secret) { - _ = secret ?? throw new ArgumentNullException(nameof(secret)); + ArgumentNullException.ThrowIfNull(secret); return new PrivateKey(secret); } @@ -228,15 +228,15 @@ namespace VNLib.Plugins.Extensions.Loading /// public static ReadOnlyJsonWebKey GetJsonWebKey(this ISecretResult secret) { - _ = secret ?? throw new ArgumentNullException(nameof(secret)); - + ArgumentNullException.ThrowIfNull(secret); + //Alloc buffer, utf8 so 1 byte per char using IMemoryHandle buffer = MemoryUtil.SafeAlloc(secret.Result.Length); //Get utf8 bytes int count = Encoding.UTF8.GetBytes(secret.Result, buffer.Span); - return new ReadOnlyJsonWebKey(buffer.Span[..count]); + return ReadOnlyJsonWebKey.FromUtf8Bytes(buffer.Span[..count]); } #nullable disable -- cgit