Added more characters in URL_MAPPED_PARAMS_ALLOWED_CHARS = ' àèéùòì''…

…"@\[\]\{\}\(\)\=;&#\.:!\_\/,%\w\d\x2D\x3A'; Added more unit tests
danieleteti · Mar 4, 2020 · f99aa89 · f99aa89
1 parent cb46414
commit f99aa89
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 5 deletions.
diff --git a/sources/MVCFramework.Commons.pas b/sources/MVCFramework.Commons.pas
@@ -113,7 +113,7 @@   TMVCConstants = record
     LAST_AUTHORIZATION_HEADER_VALUE = '__DMVC_LAST_AUTHORIZATION_HEADER_VALUE_';
     SSE_RETRY_DEFAULT = 100;
     SSE_LAST_EVENT_ID = 'Last-Event-ID';
-    URL_MAPPED_PARAMS_ALLOWED_CHARS = ' àèéùòì@\[\]\{\}\(\)\=;&#\.\_\,%\w\d\x2D\x3A';
+    URL_MAPPED_PARAMS_ALLOWED_CHARS = ' àèéùòì''"@\[\]\{\}\(\)\=;&#\.:!\_\/,%\w\d\x2D\x3A';
     OneMiB = 1048576;
     OneKiB = 1024;
     DEFAULT_MAX_REQUEST_SIZE = OneMiB * 5; // 5 MiB

diff --git a/unittests/general/Several/LiveServerTestU.pas b/unittests/general/Several/LiveServerTestU.pas
@@ -1527,10 +1527,48 @@ procedure TServerTest.TestTypedSingle1;
 procedure TServerTest.TestTypedString1;
 var
   res: IRESTResponse;
+  lValues: array [0..7] of string;
+  s: string;
 begin
-  res := RESTClient.doGET('/typed/string1/daniele', []);
-  Assert.isTrue(res.ResponseCode = HTTP_STATUS.OK, 'Cannot route');
-  Assert.areEqual('daniele modified from server', res.BodyAsString);
+  lValues[0] := 'daniele';
+  lValues[1] := 'dan''iele';
+  lValues[2] := '"daniele"';
+  lValues[3] := '"daniele teti"';
+  lValues[4] := '"daniele" "teti"';
+  lValues[5] := '"daniele" "teti"!';
+  lValues[6] := ' _\"daniele" "teti"!/_ ';
+
+  for s in lValues do
+  begin
+    res := RESTClient.doGET('/typed/string1', [s]);
+    Assert.AreEqual(HTTP_STATUS.OK, res.ResponseCode, 'Cannot route when param is ' + s);
+    Assert.areEqual('*' + s + '*', res.BodyAsString);
+  end;
+
+//  res := RESTClient.doGET('/typed/string1/daniele', []);
+//  Assert.isTrue(res.ResponseCode = HTTP_STATUS.OK, 'Cannot route');
+//  Assert.areEqual('daniele modified from server', res.BodyAsString);
+//
+//  res := RESTClient.doGET('/typed/string1/dan''iele', []);
+//  Assert.isTrue(res.ResponseCode = HTTP_STATUS.OK, 'Cannot route');
+//  Assert.areEqual('dan''iele modified from server', res.BodyAsString);
+//
+//  res := RESTClient.doGET('/typed/string1/"the value"', []);
+//  Assert.isTrue(res.ResponseCode = HTTP_STATUS.OK, 'Cannot route');
+//  Assert.areEqual('"the value" modified from server', res.BodyAsString);
+//
+//  res := RESTClient.doGET('/typed/string1/"the:value"', []);
+//  Assert.isTrue(res.ResponseCode = HTTP_STATUS.OK, 'Cannot route');
+//  Assert.areEqual('"the value" modified from server', res.BodyAsString);
+//
+//  res := RESTClient.doGET('/typed/string1/"the:value!"', []);
+//  Assert.isTrue(res.ResponseCode = HTTP_STATUS.OK, 'Cannot route');
+//  Assert.areEqual('"the value" modified from server', res.BodyAsString);
+//
+//  res := RESTClient.doGET('/typed/string1/"the:value!?"', []);
+//  Assert.isTrue(res.ResponseCode = HTTP_STATUS.OK, 'Cannot route');
+//  Assert.areEqual('"the value" modified from server', res.BodyAsString);
+
 end;
 
 procedure TServerTest.TestWrongJSONBody;

diff --git a/unittests/general/TestServer/TestServerControllerU.pas b/unittests/general/TestServer/TestServerControllerU.pas
@@ -681,7 +681,7 @@ procedure TTestServerController.TestTypedActionInteger1(value: Integer);
 procedure TTestServerController.TestTypedActionString1(value: string);
 begin
   ContentType := TMVCMediaType.TEXT_PLAIN;
-  Render(value + ' modified from server');
+  Render('*' + value + '*');
 end;
 
 procedure TTestServerController.TestTypedActionTDate1(value: TDate);