Fix relative path validation regex in validateRelativePath

ssvlabs · Jan 21, 2024 · e8475ad · e8475ad
1 parent 9ccffcf
commit e8475ad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/core/hd_key_test.go b/core/hd_key_test.go
@@ -220,6 +220,13 @@ func TestDerivableKeyRelativePathDerivation(t *testing.T) {
 			err:         errors.New("invalid relative path. Example: /1/2/3"),
 			expectedKey: nil,
 		},
+		{
+			name:        "bad path (too short 2)",
+			seed:        _byteArray("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1fff"),
+			path:        "/0/9/", // after basePath
+			err:         errors.New("invalid relative path. Example: /1/2/3"),
+			expectedKey: nil,
+		},
 		{
 			name:        "not a relative path",
 			seed:        _byteArray("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1fff"),

diff --git a/core/master_derivable_key.go b/core/master_derivable_key.go
@@ -88,6 +88,6 @@ func (master *MasterDerivableKey) Derive(relativePath string) (*HDKey, error) {
 }
 
 func validateRelativePath(relativePath string) bool {
-	match, _ := regexp.MatchString(`^\/\d+\/\d+\/?\d*$`, relativePath)
+	match, _ := regexp.MatchString(`^\/\d+(\/\d+)(\/\d+)?$`, relativePath)
 	return match
 }