Use Bad_TooManyArguments when too many arguments are provided (#1197)

fixes #1196
eclipse-milo · Dec 20, 2023 · cd80e2e · cd80e2e
1 parent f1ce134
commit cd80e2e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/...va/org/eclipse/milo/opcua/sdk/server/api/methods/AbstractMethodInvocationHandlerTest.java b/...va/org/eclipse/milo/opcua/sdk/server/api/methods/AbstractMethodInvocationHandlerTest.java
@@ -64,4 +64,29 @@ public void implementationCanValidateArguments() throws UaException {
         }
     }
 
+    @Test
+    void wrongNumberOfArguments() throws ExecutionException, InterruptedException {
+        // too few arguments
+        {
+            CallMethodResult result = client.call(new CallMethodRequest(
+                Identifiers.ObjectsFolder,
+                NodeId.parse("ns=2;s=onlyAcceptsPositiveInputs()"),
+                new Variant[]{}
+            )).get();
+
+            assertEquals(StatusCodes.Bad_ArgumentsMissing, result.getStatusCode().getValue());
+        }
+
+        // too many arguments
+        {
+            CallMethodResult result = client.call(new CallMethodRequest(
+                Identifiers.ObjectsFolder,
+                NodeId.parse("ns=2;s=onlyAcceptsPositiveInputs()"),
+                new Variant[]{new Variant(1), new Variant(2)}
+            )).get();
+
+            assertEquals(StatusCodes.Bad_TooManyArguments, result.getStatusCode().getValue());
+        }
+    }
+
 }
diff --git a/...n/java/org/eclipse/milo/opcua/sdk/server/api/methods/AbstractMethodInvocationHandler.java b/...n/java/org/eclipse/milo/opcua/sdk/server/api/methods/AbstractMethodInvocationHandler.java
@@ -64,9 +64,12 @@ public final CallMethodResult invoke(AccessContext accessContext, CallMethodRequ
             Variant[] inputArgumentValues = request.getInputArguments();
             if (inputArgumentValues == null) inputArgumentValues = new Variant[0];
 
-            if (inputArgumentValues.length != getInputArguments().length) {
+            if (inputArgumentValues.length < getInputArguments().length) {
                 throw new UaException(StatusCodes.Bad_ArgumentsMissing);
             }
+            if (inputArgumentValues.length > getInputArguments().length) {
+                throw new UaException(StatusCodes.Bad_TooManyArguments);
+            }
 
             StatusCode[] inputDataTypeCheckResults = new StatusCode[inputArgumentValues.length];
 
@@ -250,7 +253,8 @@ protected abstract Variant[] invoke(
      * @param inputArgumentValues the input values provided by the client for the current method call.
      * @throws InvalidArgumentException if one or more input argument values are invalid.
      */
-    protected void validateInputArgumentValues(Variant[] inputArgumentValues) throws InvalidArgumentException {}
+    protected void validateInputArgumentValues(Variant[] inputArgumentValues) throws InvalidArgumentException {
+    }
 
     /**
      * Extends {@link AccessContext} to provide additional context to implementations of