client-v2.15.0 parser fix

vbilopav · vbilopav · commit 38129ecbcfc2 · 2025-03-07T19:04:45.000+01:00
diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml
@@ -43,8 +43,8 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        tag_name: v2.20.0-client-v2.14.0
-        release_name: "AOT Client v2.14.0 NpgsqlRest v2.20.0"
+        tag_name: v2.20.0-client-v2.15.0
+        release_name: "AOT Client v2.15.0 NpgsqlRest v2.20.0"
         draft: true
         prerelease: true
 
diff --git a/NpgsqlRestClient/DefaultParser.cs b/NpgsqlRestClient/DefaultParser.cs
@@ -1,7 +1,5 @@
 ﻿using System;
 using System.Security.Claims;
-using System.Text;
-using Microsoft.AspNetCore.Authorization.Infrastructure;
 using Microsoft.Extensions.Primitives;
 using NpgsqlRest;
 
@@ -22,43 +20,51 @@ public class DefaultResponseParser(
     private readonly Dictionary<string, StringValues>? customClaims = customClaims;
     private readonly Dictionary<string, string?>? customParameters = customParameters;
 
+    private const string @null = "null";
+    private const char @open = '{';
+    private const char @close = '}';
+    private const char @quote = '"';
+    private const char @arrOpen = '[';
+    private const char @arrClose = ']';
+    private const char @comma = ',';
+
     public ReadOnlySpan<char> Parse(ReadOnlySpan<char> input, RoutineEndpoint endpoint, HttpContext context)
     {
         Dictionary<string, string> replacements = [];
 
         if (userIdParameterName is not null)
         {
             var value = context.User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
-            replacements.Add(userIdParameterName, value is null ? "NULL" : string.Concat('"', value, '"')); 
+            replacements.Add(userIdParameterName, value is null ? @null : string.Concat(@quote, value, @quote)); 
         }
         if (userNameParameterName is not null)
         {
             var value = context.User.Identity?.Name;
-            replacements.Add(userNameParameterName, value is null ? "NULL" : string.Concat('"', value, '"'));
+            replacements.Add(userNameParameterName, value is null ? @null : string.Concat(@quote, value, @quote));
         }
         if (userRolesParameterName is not null)
         {
-            var value = context.User.FindAll(c => string.Equals(c.Type, ClaimTypes.Role, StringComparison.Ordinal))?.Select(r => string.Concat('"', r.Value, '"'));
-            replacements.Add(userRolesParameterName, value is null ? "NULL" : string.Concat('[', string.Join(',', value), ']'));
+            var value = context.User.FindAll(c => string.Equals(c.Type, ClaimTypes.Role, StringComparison.Ordinal))?.Select(r => string.Concat(@quote, r.Value, @quote));
+            replacements.Add(userRolesParameterName, value is null ? @null : string.Concat(@arrOpen, string.Join(@comma, value), @arrClose));
         }
         if (ipAddressParameterName is not null)
         {
             var value = App.GetClientIpAddress(context.Request);
-            replacements.Add(ipAddressParameterName, value is null ? "NULL" : string.Concat('"', value, '"'));
+            replacements.Add(ipAddressParameterName, value is null ? @null : string.Concat(@quote, value, @quote));
         }
         if (customClaims is not null)
         {
             foreach (var (key, value) in customClaims)
             {
                 var claim = context.User.FindFirst(key);
-                replacements.Add(key, claim is null ? "NULL" : string.Concat('"', claim.Value, '"'));
+                replacements.Add(key, claim is null ? @null : string.Concat(@quote, claim.Value, @quote));
             }
         }
         if (customParameters is not null)
         {
             foreach (var (key, value) in customParameters)
             {
-                replacements.Add(key, value is null ? "NULL" : string.Concat('"', value, '"'));
+                replacements.Add(key, value is null ? @null : string.Concat(@quote, value, @quote));
             }
         }
         return FormatString(input, replacements);
@@ -86,7 +92,7 @@ public static ReadOnlySpan<char> FormatString(ReadOnlySpan<char> input, Dictiona
         for (int i = 0; i < inputLength; i++)
         {
             var ch = input[i];
-            if (ch == '{')
+            if (ch == @open)
             {
                 if (inside is true)
                 {
@@ -97,7 +103,7 @@ public static ReadOnlySpan<char> FormatString(ReadOnlySpan<char> input, Dictiona
                 continue;
             }
 
-            if (ch == '}' && inside is true)
+            if (ch == @close && inside is true)
             {
                 inside = false;
                 if (lookup.TryGetValue(input[(startIndex + 1)..i], out var value))
@@ -130,7 +136,7 @@ public static ReadOnlySpan<char> FormatString(ReadOnlySpan<char> input, Dictiona
         for(int i = 0; i < inputLength; i++)
         {
             var ch = input[i];
-            if (ch == '{')
+            if (ch == @open)
             {
                 if (inside is true)
                 {
@@ -142,7 +148,7 @@ public static ReadOnlySpan<char> FormatString(ReadOnlySpan<char> input, Dictiona
                 continue;
             }
 
-            if (ch == '}' && inside is true)
+            if (ch == @close && inside is true)
             {
                 inside = false;
                 if (lookup.TryGetValue(input[(startIndex + 1)..i], out var value))
diff --git a/NpgsqlRestClient/NpgsqlRestClient.csproj b/NpgsqlRestClient/NpgsqlRestClient.csproj
@@ -8,7 +8,7 @@
     <InvariantGlobalization>true</InvariantGlobalization>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
     <PublishAot>true</PublishAot>
-    <Version>2.14.0</Version>
+    <Version>2.15.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/NpgsqlRestClient/appsettings.json b/NpgsqlRestClient/appsettings.json
@@ -1,5 +1,5 @@
 /*
-  2.14.0.0
+  2.15.0.0
 */
 {
   //
diff --git a/client.md b/client.md
@@ -91,6 +91,21 @@ Example: override Auth:CookieName config npgsqlrest --auth:cookiename=Test
 
 ## Changelog
 
+## 2.15.0
+
+- Versions:
+
+```
+.NET                  9.0.2
+Client Build          2.15.0.0
+Serilog.AspNetCore    9.0.0.0
+Npgsql                9.0.3.0
+NpgsqlRest            2.20.0.0
+NpgsqlRest.HttpFiles  1.3.0.0
+NpgsqlRest.TsClient   1.18.0.0
+NpgsqlRest.CrudSource 1.2.0.0
+```
+
 ## 2.14.0
 
 This fix contains a fix for edge cases of parse method when using multiple curly braces.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:25.04 AS builder
 WORKDIR /app
 RUN apt-get update && \
     apt-get install -y --no-install-recommends wget ca-certificates && \
-    wget https://github.com/vb-consulting/NpgsqlRest/releases/download/v2.20.0-client-v2.14.0/npgsqlrest-linux64 -O npgsqlrest && \
+    wget https://github.com/vb-consulting/NpgsqlRest/releases/download/v2.20.0-client-v2.15.0/npgsqlrest-linux64 -O npgsqlrest && \
     chmod +x npgsqlrest
 
 FROM ubuntu:25.04
diff --git a/npm/package.json b/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "npgsqlrest",
-  "version": "2.14.0",
+  "version": "2.15.0",
   "description": "Automatic REST API for PostgreSQL Databases Client Build",
   "scripts": {
     "postinstall": "node postinstall.js",
diff --git a/npm/postinstall.js b/npm/postinstall.js
@@ -6,7 +6,7 @@ const os = require("os");
 const https = require("https");
 
 const downloadDir = "../.bin/";
-const downloadFrom = "https://github.com/vb-consulting/NpgsqlRest/releases/download/v2.20.0-client-v2.14.0/";
+const downloadFrom = "https://github.com/vb-consulting/NpgsqlRest/releases/download/v2.20.0-client-v2.15.0/";
 
 function download(url, to, done) {
     https.get(url, (response) => {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Security.Claims;`
`3`		`-using System.Text;`
`4`		`-using Microsoft.AspNetCore.Authorization.Infrastructure;`
`5`	`3`	`using Microsoft.Extensions.Primitives;`
`6`	`4`	`using NpgsqlRest;`
`7`	`5`
`@@ -22,43 +20,51 @@ public class DefaultResponseParser(`
`22`	`20`	`private readonly Dictionary<string, StringValues>? customClaims = customClaims;`
`23`	`21`	`private readonly Dictionary<string, string?>? customParameters = customParameters;`
`24`	`22`
	`23`	`+ private const string @null = "null";`
	`24`	`+ private const char @open = '{';`
	`25`	`+ private const char @close = '}';`
	`26`	`+ private const char @quote = '"';`
	`27`	`+ private const char @arrOpen = '[';`
	`28`	`+ private const char @arrClose = ']';`
	`29`	`+ private const char @comma = ',';`
	`30`	`+`
`25`	`31`	`public ReadOnlySpan<char> Parse(ReadOnlySpan<char> input, RoutineEndpoint endpoint, HttpContext context)`
`26`	`32`	`{`
`27`	`33`	`Dictionary<string, string> replacements = [];`
`28`	`34`
`29`	`35`	`if (userIdParameterName is not null)`
`30`	`36`	`{`
`31`	`37`	`var value = context.User.FindFirst(ClaimTypes.NameIdentifier)?.Value;`
`32`		`- replacements.Add(userIdParameterName, value is null ? "NULL" : string.Concat('"', value, '"'));`
	`38`	`+ replacements.Add(userIdParameterName, value is null ? @null : string.Concat(@quote, value, @quote));`
`33`	`39`	`}`
`34`	`40`	`if (userNameParameterName is not null)`
`35`	`41`	`{`
`36`	`42`	`var value = context.User.Identity?.Name;`
`37`		`- replacements.Add(userNameParameterName, value is null ? "NULL" : string.Concat('"', value, '"'));`
	`43`	`+ replacements.Add(userNameParameterName, value is null ? @null : string.Concat(@quote, value, @quote));`
`38`	`44`	`}`
`39`	`45`	`if (userRolesParameterName is not null)`
`40`	`46`	`{`
`41`		`- var value = context.User.FindAll(c => string.Equals(c.Type, ClaimTypes.Role, StringComparison.Ordinal))?.Select(r => string.Concat('"', r.Value, '"'));`
`42`		`- replacements.Add(userRolesParameterName, value is null ? "NULL" : string.Concat('[', string.Join(',', value), ']'));`
	`47`	`+ var value = context.User.FindAll(c => string.Equals(c.Type, ClaimTypes.Role, StringComparison.Ordinal))?.Select(r => string.Concat(@quote, r.Value, @quote));`
	`48`	`+ replacements.Add(userRolesParameterName, value is null ? @null : string.Concat(@arrOpen, string.Join(@comma, value), @arrClose));`
`43`	`49`	`}`
`44`	`50`	`if (ipAddressParameterName is not null)`
`45`	`51`	`{`
`46`	`52`	`var value = App.GetClientIpAddress(context.Request);`
`47`		`- replacements.Add(ipAddressParameterName, value is null ? "NULL" : string.Concat('"', value, '"'));`
	`53`	`+ replacements.Add(ipAddressParameterName, value is null ? @null : string.Concat(@quote, value, @quote));`
`48`	`54`	`}`
`49`	`55`	`if (customClaims is not null)`
`50`	`56`	`{`
`51`	`57`	`foreach (var (key, value) in customClaims)`
`52`	`58`	`{`
`53`	`59`	`var claim = context.User.FindFirst(key);`
`54`		`- replacements.Add(key, claim is null ? "NULL" : string.Concat('"', claim.Value, '"'));`
	`60`	`+ replacements.Add(key, claim is null ? @null : string.Concat(@quote, claim.Value, @quote));`
`55`	`61`	`}`
`56`	`62`	`}`
`57`	`63`	`if (customParameters is not null)`
`58`	`64`	`{`
`59`	`65`	`foreach (var (key, value) in customParameters)`
`60`	`66`	`{`
`61`		`- replacements.Add(key, value is null ? "NULL" : string.Concat('"', value, '"'));`
	`67`	`+ replacements.Add(key, value is null ? @null : string.Concat(@quote, value, @quote));`
`62`	`68`	`}`
`63`	`69`	`}`
`64`	`70`	`return FormatString(input, replacements);`
`@@ -86,7 +92,7 @@ public static ReadOnlySpan<char> FormatString(ReadOnlySpan<char> input, Dictiona`
`86`	`92`	`for (int i = 0; i < inputLength; i++)`
`87`	`93`	`{`
`88`	`94`	`var ch = input[i];`
`89`		`- if (ch == '{')`
	`95`	`+ if (ch == @open)`
`90`	`96`	`{`
`91`	`97`	`if (inside is true)`
`92`	`98`	`{`
`@@ -97,7 +103,7 @@ public static ReadOnlySpan<char> FormatString(ReadOnlySpan<char> input, Dictiona`
`97`	`103`	`continue;`
`98`	`104`	`}`
`99`	`105`
`100`		`- if (ch == '}' && inside is true)`
	`106`	`+ if (ch == @close && inside is true)`
`101`	`107`	`{`
`102`	`108`	`inside = false;`
`103`	`109`	`if (lookup.TryGetValue(input[(startIndex + 1)..i], out var value))`
`@@ -130,7 +136,7 @@ public static ReadOnlySpan<char> FormatString(ReadOnlySpan<char> input, Dictiona`
`130`	`136`	`for(int i = 0; i < inputLength; i++)`
`131`	`137`	`{`
`132`	`138`	`var ch = input[i];`
`133`		`- if (ch == '{')`
	`139`	`+ if (ch == @open)`
`134`	`140`	`{`
`135`	`141`	`if (inside is true)`
`136`	`142`	`{`
`@@ -142,7 +148,7 @@ public static ReadOnlySpan<char> FormatString(ReadOnlySpan<char> input, Dictiona`
`142`	`148`	`continue;`
`143`	`149`	`}`
`144`	`150`
`145`		`- if (ch == '}' && inside is true)`
	`151`	`+ if (ch == @close && inside is true)`
`146`	`152`	`{`
`147`	`153`	`inside = false;`
`148`	`154`	`if (lookup.TryGetValue(input[(startIndex + 1)..i], out var value))`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- 2.14.0.0`
	`2`	`+ 2.15.0.0`
`3`	`3`	`*/`
`4`	`4`	`{`
`5`	`5`	`//`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "npgsqlrest",`
`3`		`- "version": "2.14.0",`
	`3`	`+ "version": "2.15.0",`
`4`	`4`	`"description": "Automatic REST API for PostgreSQL Databases Client Build",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"postinstall": "node postinstall.js",`