Fix for ticket Astn#109 - validate request.id property to conform the json-rpc 2.0 standard

Pedro López Cabanillas · Pedro López Cabanillas · commit f42192d02e67 · 2019-09-26T11:52:52.000+02:00
diff --git a/AustinHarris.JsonRpcTestN/Test.cs b/AustinHarris.JsonRpcTestN/Test.cs
@@ -1899,6 +1899,15 @@ public void TestWrongParamType()
             Assert.IsTrue(result.Result.Contains("\"code\":-32603"));
         }
 
+        [Test()]
+        public void TestWrongIdType()
+        {
+            string request = @"{method:'TestOptionalParamdouble',params:{input:5},id:{what:4,that:3}}";
+            var result = JsonRpcProcessor.Process(request);
+            result.Wait();
+            Assert.IsTrue(result.Result.Contains("error"));
+            Assert.IsTrue(result.Result.Contains("\"code\":-32600"));
+        }
 
         private static void AssertJsonAreEqual(string expectedJson, string actualJson)
         {
diff --git a/Json-Rpc/JsonRpcProcessor.cs b/Json-Rpc/JsonRpcProcessor.cs
@@ -93,6 +93,11 @@ private static string ProcessInternal(string sessionId, string jsonRpc, object j
                     jsonResponse.Error = handler.ProcessParseException(jsonRpc,
                         new JsonRpcException(-32600, "Invalid Request", "Missing property 'method'"));
                 }
+                else if (!isSimpleValueType(jsonRequest.Id))
+                {
+                    jsonResponse.Error = handler.ProcessParseException(jsonRpc,
+                        new JsonRpcException(-32600, "Invalid Request", "Id property must be either null or string or integer."));
+                }
                 else
                 {
                     jsonResponse.Id = jsonRequest.Id;
@@ -174,5 +179,15 @@ private static bool isSingleRpc(string json)
             }
             return true;
         }
+
+        private static bool isSimpleValueType(object property)
+        {
+            if (property == null)
+                return true;
+            return property.GetType() == typeof(System.String) ||
+                property.GetType() == typeof(System.Int64) ||
+                property.GetType() == typeof(System.Int32) ||
+                property.GetType() == typeof(System.Int16);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1899,6 +1899,15 @@ public void TestWrongParamType()`
`1899`	`1899`	`Assert.IsTrue(result.Result.Contains("\"code\":-32603"));`
`1900`	`1900`	`}`
`1901`	`1901`
	`1902`	`+ [Test()]`
	`1903`	`+ public void TestWrongIdType()`
	`1904`	`+ {`
	`1905`	`+ string request = @"{method:'TestOptionalParamdouble',params:{input:5},id:{what:4,that:3}}";`
	`1906`	`+ var result = JsonRpcProcessor.Process(request);`
	`1907`	`+ result.Wait();`
	`1908`	`+ Assert.IsTrue(result.Result.Contains("error"));`
	`1909`	`+ Assert.IsTrue(result.Result.Contains("\"code\":-32600"));`
	`1910`	`+ }`
`1902`	`1911`
`1903`	`1912`	`private static void AssertJsonAreEqual(string expectedJson, string actualJson)`
`1904`	`1913`	`{`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,11 @@ private static string ProcessInternal(string sessionId, string jsonRpc, object j`
`93`	`93`	`jsonResponse.Error = handler.ProcessParseException(jsonRpc,`
`94`	`94`	`new JsonRpcException(-32600, "Invalid Request", "Missing property 'method'"));`
`95`	`95`	`}`
	`96`	`+ else if (!isSimpleValueType(jsonRequest.Id))`
	`97`	`+ {`
	`98`	`+ jsonResponse.Error = handler.ProcessParseException(jsonRpc,`
	`99`	`+ new JsonRpcException(-32600, "Invalid Request", "Id property must be either null or string or integer."));`
	`100`	`+ }`
`96`	`101`	`else`
`97`	`102`	`{`
`98`	`103`	`jsonResponse.Id = jsonRequest.Id;`
`@@ -174,5 +179,15 @@ private static bool isSingleRpc(string json)`
`174`	`179`	`}`
`175`	`180`	`return true;`
`176`	`181`	`}`
	`182`	`+`
	`183`	`+ private static bool isSimpleValueType(object property)`
	`184`	`+ {`
	`185`	`+ if (property == null)`
	`186`	`+ return true;`
	`187`	`+ return property.GetType() == typeof(System.String) \|\|`
	`188`	`+ property.GetType() == typeof(System.Int64) \|\|`
	`189`	`+ property.GetType() == typeof(System.Int32) \|\|`
	`190`	`+ property.GetType() == typeof(System.Int16);`
	`191`	`+ }`
`177`	`192`	`}`
`178`	`193`	`}`