Merge branch 'devel' into dependabot/github_actions/actions/setup-python-6

Author: ringabout

.github/workflows/action.yml

@@ -20,14 +20,14 @@ jobs:
 
     - name: Cache choosenim
       id: cache-choosenim
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/.choosenim
         key: ${{ runner.os }}-choosenim-${{ matrix.nim-version}}
 
     - name: Cache nimble
       id: cache-nimble
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/.nimble
         key: ${{ runner.os }}-nimble-${{ matrix.nim-version}}-${{ hashFiles('prologue.nimble') }}

.github/workflows/docs.yml

@@ -28,7 +28,7 @@ jobs:
         run: echo "::set-output name=dir::$(pip cache dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -55,14 +55,14 @@ jobs:
 
       - name: Cache choosenim
         id: cache-choosenim
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.choosenim
           key: ${{ runner.os }}-choosenim-stable
 
       - name: Cache nimble
         id: cache-nimble
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.nimble
           key: ${{ runner.os }}-nimble-${{ hashFiles('prologue.nimble') }}

prologue.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.6.6"
+version       = "0.6.8"
 author        = "ringabout"
 description   = "Prologue is an elegant and high performance web framework"
 license       = "Apache-2.0"
@@ -10,7 +10,7 @@ srcDir        = "src"
 # Dependencies
 requires "nim >= 2.0.0"
 requires "regex >= 0.20.0"
-requires "nimcrypto >= 0.5.4"
+requires "nimcrypto >= 0.6.0"
 requires "cookiejar >= 0.2.0"
 requires "httpx >= 0.3.7"
 requires "logue >= 0.2.0"

src/prologue/core/constants.nim

@@ -1,4 +1,4 @@
 const
-  PrologueVersion* = "0.6.6"            ## The current version of Prologue.
+  PrologueVersion* = "0.6.8"            ## The current version of Prologue.
   ProloguePrefix* = "PROLOGUE"          ## The helper prefix for environment variables.
   useAsyncHTTPServer* = defined(windows) or defined(usestd) ## Uses `asynchttpserver`.

src/prologue/core/form.nim

@@ -58,7 +58,7 @@ func parseFormPart*(body, contentType: string): FormPart =
     tail = data[pos ..< ^2] # 2 because of protocol newline after content disposition body
 
     if not head.startsWith("Content-Disposition"):
-      break
+      continue
 
     for line in head.splitLines:
       let header = line.parseHeader
@@ -96,7 +96,10 @@ func parseFormPart*(body, contentType: string): FormPart =
 
 func parseFormParams*(request: var Request, contentType: string) =
   ## Parses get or post or query parameters.
-  let mediaType = parseContentType(contentType)
+  let mediaType = try:
+      parseContentType(contentType)
+    except CatchableError:
+      MediaType(parameters: initTable[string, string]())
 
   if mediaType.mainType == "application" and mediaType.subType == "x-www-form-urlencoded":
     request.formParams = initFormPart()

src/prologue/signing/signing.nim

@@ -45,11 +45,11 @@ export signingbase
 
 
 type
-  BaseDigestType* = sha1 | sha2 | keccak | ripemd | blake2
+  BaseDigestType* = sha1 | sha224 | sha256 | sha384 | sha512 | sha512_224 | sha512_256 | keccak | ripemd | blake2
 
   BaseDigestMethodType* = enum
     Sha1Type,
-    Sha224Type, Sha384Type, Sha512Type, Sha512_224Type, Sha512_256Type
+    Sha224Type, Sha256Type, Sha384Type, Sha512Type, Sha512_224Type, Sha512_256Type
     Keccak224Type, Keccak256Type, Keccak384Type, Keccak512Type, Sha3_224Type,
         Sha3_256Type, Sha3_384Type, Sha3_512Type
     Ripemd128Type, Ripemd160Type, Ripemd256Type, Ripemd320Type
@@ -158,6 +158,8 @@ proc getSignatureEncode*(s: Signer | TimedSigner, value: openArray[
     result = getKeyDerivationEncode(s, sha1, value)
   of Sha224Type:
     result = getKeyDerivationEncode(s, sha224, value)
+  of Sha256Type:
+    result = getKeyDerivationEncode(s, sha256, value)
   of Sha384Type:
     result = getKeyDerivationEncode(s, sha384, value)
   of Sha512Type:
@@ -205,6 +207,8 @@ proc getSignatureDecode*(s: Signer | TimedSigner): string =
     result = getKeyDerivationDecode(s, sha1)
   of Sha224Type:
     result = getKeyDerivationDecode(s, sha224)
+  of Sha256Type:
+    result = getKeyDerivationDecode(s, sha256)
   of Sha384Type:
     result = getKeyDerivationDecode(s, sha384)
   of Sha512Type:

tests/server/tserver_application.nim

@@ -127,6 +127,15 @@ block:
     doAssert response.code == Http200, $response.code
     doAssert (waitFor response.body) == "<h1>Home</h1>"
 
+  # "can get /query?query=foo"
+  block:
+    let
+      route = "/query?query=foo"
+      response = waitFor client.get(fmt"http://{address}:{port}{route}")
+
+    doAssert response.code == Http200, $response.code
+    doAssert (waitFor response.body) == "foo"
+
   # "can get /loginget using get method"
   block:
     let

tests/start_server.nim

@@ -15,6 +15,10 @@ proc hello*(ctx: Context) {.async.} =
 proc home*(ctx: Context) {.async.} =
   resp "<h1>Home</h1>"
 
+proc query*(ctx: Context) {.async.} =
+  let query = ctx.getQueryParamsOption("query").get("")
+  resp query
+
 proc helloName*(ctx: Context) {.async.} =
   resp "<h1>Hello, " & ctx.getPathParams("name", "Prologue!") & "</h1>"
 
@@ -65,6 +69,7 @@ var app = newApp(settings = settings)
 with app:
   addRoute("/", home, HttpGet)
   addRoute("/home", home, HttpGet, middlewares = @[debugRequestMiddleware()])
+  addRoute("/query", query, HttpGet)
   addRoute("/hello", hello, HttpGet)
   addRoute("/redirect", redirectHome, HttpGet)
   addRoute("/loginget", loginGet, HttpGet)

tests/unit/tunit_core/tunit_form

@@ -1,5 +1,5 @@
 import ../../../src/prologue/core/form
-import tables, strutils
+import tables, strutils, strtabs
 
 block:
   const testmime =
@@ -40,3 +40,19 @@ block:
   let formPart = parseFormPart(testmime, contenttype)
   doAssert formPart.data["upload"].body.len == testfile.len
   doAssert formPart.data["upload"].body == testfile
+
+block:
+  # Test for file input field (issue: multipart/form-data not working)
+  # This tests that file inputs with filename parameter work correctly
+  const testmime =
+    "------WebKitFormBoundary7MA4YWxkTrZu0gW\13\10" &
+    "Content-Disposition: form-data; name=\"myfile\"; filename=\"test.txt\"\13\10" &
+    "Content-Type: text/plain\13\10" &
+    "\13\10" &
+    "Hello World\13\10" &
+    "------WebKitFormBoundary7MA4YWxkTrZu0gW--\13\10"
+  const contenttype = "multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW"
+  let formPart = parseFormPart(testmime, contenttype)
+  doAssert formPart.data.contains("myfile"), "myfile field should be present"
+  doAssert formPart.data["myfile"].body == "Hello World"
+  doAssert formPart.data["myfile"].params.getOrDefault("filename", "") == "test.txt"