Merge pull request #1019 from openkfw/adapt-api-joi-validation

Add all apostrophe types to api string validation
openkfw · Dec 10, 2021 · 1d68108 · 1d68108
2 parents a7be553 + e749f83
commit 1d68108
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml
@@ -45,17 +45,16 @@ jobs:
     strategy:
       matrix:
         node-version: [10.x]
-        project:
-          [
+        project: [
             frontend,
             api,
-            blockchain,
+            # blockchain,
             provisioning,
             e2e-test,
             excel-export-service,
             email-notification-service,
             storage-service,
-            logging-service
+            logging-service,
           ]
 
     defaults:
@@ -117,7 +116,7 @@ jobs:
             excel-export-service,
             email-notification-service,
             storage-service,
-            logging-service
+            logging-service,
           ]
         include:
           - project: frontend

diff --git a/api/src/lib/joiValidation.spec.ts b/api/src/lib/joiValidation.spec.ts
@@ -67,6 +67,15 @@ describe("JoiValidation: safe String", () => {
     expect(error.message).to.contain("fails to match the required pattern:");
   });
 
+  it("Accept a string including apostrophes", async () => {
+    const text = "Test '1234' it`s an \"example\"";
+
+    const { value, error } = Joi.validate(text, safeStringSchema);
+
+    expect(value).to.equal(text);
+    expect(error).to.equal(null);
+  });
+
   it("Accept a safe Id", async () => {
     const text = "Test1234";
     const controlValue = "Test1234";

diff --git a/api/src/lib/joiValidation.ts b/api/src/lib/joiValidation.ts
@@ -2,7 +2,7 @@ import * as Joi from "joi";
 import { isProductionEnvironment } from "../config";
 
 export const safeStringSchema = Joi.string()
-  .regex(/^([A-Za-zÀ-ÿ0-9-_!?@#$&*,.:/()[\] ]*)$/)
+  .regex(/^([A-Za-zÀ-ÿ0-9-_!?@#$&*,"`´'.:/()[\] ]*)$/)
   .max(250);
 export const safeIdSchema = Joi.string()
   .regex(/^([A-Za-zÀ-ÿ0-9-_]*)$/)