Unmatched CLI options not confused as parameters (#4791)

Reject values resembling option names as part of multi-value CLI options

CHANGELOG.md

@@ -14,6 +14,7 @@ For information on changes in released versions of Teku, see the [releases page]
 ### Breaking Changes
 
 ### Additions and Improvements
+* Updated CLI options ensuring unmatched options aren't confused as parameters.
 
 ### Bug Fixes
 * Updated to log4j 2.16.0.

teku/src/main/java/tech/pegasys/teku/cli/BeaconNodeCommand.java

@@ -204,18 +204,19 @@ public BeaconNodeCommand(
     metricCategoryConverter.addCategories(StandardMetricCategory.class);
   }
 
-  private CommandLine registerConverters(final CommandLine commandLine) {
+  private CommandLine configureCommandLine(final CommandLine commandLine) {
     return commandLine
         .registerConverter(MetricCategory.class, metricCategoryConverter)
-        .registerConverter(UInt64.class, UInt64::valueOf);
+        .registerConverter(UInt64.class, UInt64::valueOf)
+        .setUnmatchedOptionsAllowedAsOptionParameters(false);
   }
 
   private CommandLine getConfigFileCommandLine(final ConfigFileCommand configFileCommand) {
-    return registerConverters(new CommandLine(configFileCommand));
+    return configureCommandLine(new CommandLine(configFileCommand));
   }
 
   private CommandLine getCommandLine() {
-    return registerConverters(new CommandLine(this));
+    return configureCommandLine(new CommandLine(this));
   }
 
   public int parse(final String[] args) {

teku/src/test/java/tech/pegasys/teku/cli/BeaconNodeCommandTest.java

@@ -82,6 +82,18 @@ public void unknownOptionShouldDisplayShortHelpMessage() {
     assertThat(str).doesNotContain("Default");
   }
 
+  @Test
+  public void unmatchedOptionsNotAllowedAsOptionParameters() {
+    final String[] args = {"--eth1-endpoints http://localhost:8545 --foo"};
+
+    beaconNodeCommand.parse(args);
+    String str = getCommandLineOutput();
+    assertThat(str).contains("Unknown option");
+    assertThat(str).contains("To display full help:");
+    assertThat(str).contains("--help");
+    assertThat(str).doesNotContain("Default");
+  }
+
   @Test
   public void invalidValueShouldDisplayShortHelpMessage() {
     final String[] args = {"--metrics-enabled=bob"};