From b7258ccd64eb756cee537c9b41e65b26f750b8ca Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Wed, 15 Feb 2023 09:33:48 +1000 Subject: [PATCH] Allow dashes in ethstats password (#5090) Signed-off-by: Simon Dudley --- .../java/org/hyperledger/besu/ethstats/util/NetstatsUrl.java | 2 +- .../org/hyperledger/besu/ethstats/util/NetstatsUrlTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/util/NetstatsUrl.java b/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/util/NetstatsUrl.java index 00f6d9bba7f..7ff46e0f67c 100644 --- a/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/util/NetstatsUrl.java +++ b/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/util/NetstatsUrl.java @@ -26,7 +26,7 @@ @Value.Immutable public interface NetstatsUrl { - Pattern NETSTATS_URL_REGEX = Pattern.compile("([-\\w]+):([\\w]+)?@([-.\\w]+)(:([\\d]+))?"); + Pattern NETSTATS_URL_REGEX = Pattern.compile("([-\\w]+):([-\\w]+)?@([-.\\w]+)(:([\\d]+))?"); String getNodeName(); diff --git a/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/util/NetstatsUrlTest.java b/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/util/NetstatsUrlTest.java index 4d0a8c6aa06..a59f4fd872a 100644 --- a/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/util/NetstatsUrlTest.java +++ b/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/util/NetstatsUrlTest.java @@ -21,7 +21,7 @@ public class NetstatsUrlTest { - private final String VALID_NETSTATS_URL = "Dev-Node-1:secret@127.0.0.1:3001"; + private final String VALID_NETSTATS_URL = "Dev-Node-1:secret-with-dashes@127.0.0.1:3001"; private final String CONTACT = "contact@mail.fr"; @@ -34,7 +34,7 @@ public void buildWithValidParams() { assertThat(netstatsUrl.getHost()).isEqualTo("127.0.0.1"); assertThat(netstatsUrl.getNodeName()).isEqualTo("Dev-Node-1"); assertThat(netstatsUrl.getPort()).isEqualTo(3001); - assertThat(netstatsUrl.getSecret()).isEqualTo("secret"); + assertThat(netstatsUrl.getSecret()).isEqualTo("secret-with-dashes"); assertThat(netstatsUrl.getContact()).isEqualTo(CONTACT); }