Merge pull request #1723 from riganti/static-command-validate-argtype…

…-4.2 Validate static command argument type before deserialization (4.2)
riganti · Oct 22, 2023 · 9d804f1 · 9d804f1
2 parents b7d57f0 + 38e1983
commit 9d804f1
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/Framework/Framework/Hosting/StaticCommandExecutor.cs b/src/Framework/Framework/Hosting/StaticCommandExecutor.cs
@@ -60,13 +60,26 @@ IDotvvmRequestContext context
             IDotvvmRequestContext context
         )
         {
+            var parameters = plan.Method.GetParameters();
+            object? DeserializeArgument(Type type, int index)
+            {
+                var parameterType =
+                    plan.Method.IsStatic ? parameters[index].ParameterType :
+                    index == 0 ? plan.Method.DeclaringType :
+                    parameters[index - 1].ParameterType;
+                if (!parameterType!.IsAssignableFrom(type))
+                    throw new Exception($"Argument {index} has an invalid type");
+                var arg = arguments.Dequeue();
+                return arg.ToObject(type, this.jsonDeserializer);
+            }
             var methodArgs = new List<object?>();
             var methodArgsPaths = argumentValidationPaths is null ? null : new List<string?>();
             foreach (var a in plan.Arguments)
             {
+                var index = methodArgs.Count;
                 var (value, path) = a.Type switch {
                     StaticCommandParameterType.Argument =>
-                        ((object?)arguments.Dequeue().ToObject((Type)a.Arg!, this.jsonDeserializer), argumentValidationPaths?.Dequeue()),
+                        (DeserializeArgument((Type)a.Arg!, index), argumentValidationPaths?.Dequeue()),
                     StaticCommandParameterType.Constant or StaticCommandParameterType.DefaultValue =>
                         (a.Arg, null),
                     StaticCommandParameterType.Inject =>