Implement config URL sanitization, add test

Author: oleg-ssvlabs

configs/benchmark.go

@@ -65,26 +65,32 @@ type Benchmark struct {
 	Network        string         `mapstructure:"network"`
 }
 
-func (b Benchmark) Validate() (bool, error) {
+func (b *Benchmark) Validate() (bool, error) {
 	if b.Consensus.Metrics.Peers.Enabled ||
 		b.Consensus.Metrics.Attestation.Enabled ||
 		b.Consensus.Metrics.Client.Enabled ||
 		b.Consensus.Metrics.Latency.Enabled {
-		if err := validateURL(b.Consensus.Address); err != nil {
+		url, err := sanitizeURL(b.Consensus.Address)
+		if err != nil {
 			return false, errors.Join(err, errors.New("consensus client address was not a valid URL"))
 		}
+		b.Consensus.Address = url
 	}
 
 	if b.Execution.Metrics.Peers.Enabled {
-		if err := validateURL(b.Execution.Address); err != nil {
+		url, err := sanitizeURL(b.Execution.Address)
+		if err != nil {
 			return false, errors.Join(err, errors.New("execution client address was not a valid URL"))
 		}
+		b.Execution.Address = url
 	}
 
 	if b.SSV.Metrics.Peers.Enabled || b.SSV.Metrics.Connections.Enabled {
-		if err := validateURL(b.SSV.Address); err != nil {
+		url, err := sanitizeURL(b.SSV.Address)
+		if err != nil {
 			return false, errors.Join(err, errors.New("SSV client address was not a valid URL"))
 		}
+		b.SSV.Address = url
 	}
 
 	network := network.Name(b.Network)

configs/config.go

@@ -2,6 +2,7 @@ package configs
 
 import (
 	"errors"
+	"fmt"
 	"net/url"
 )
 
@@ -12,19 +13,22 @@ type Config struct {
 	Analyzer  Analyzer  `mapstructure:"analyzer"`
 }
 
-func validateURL(str string) error {
+func sanitizeURL(str string) (string, error) {
 	parsedURL, err := url.Parse(str)
 	if err != nil {
-		return err
+		return "", err
 	}
-
+	var validationErr error
 	if parsedURL.Scheme == "" {
-		return errors.New("scheme was empty")
+		validationErr = errors.Join(validationErr, errors.New("scheme was empty"))
 	}
-
 	if parsedURL.Host == "" {
-		return errors.New("host was empty")
+		validationErr = errors.Join(validationErr, errors.New("host was empty"))
+	}
+
+	if validationErr != nil {
+		return "", validationErr
 	}
 
-	return nil
+	return fmt.Sprintf("%s://%s", parsedURL.Scheme, parsedURL.Host), nil
 }

configs/config_test.go

@@ -0,0 +1,86 @@
+package configs
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestSanitizeURL(t *testing.T) {
+	tests := []struct {
+		name, input, want, errMsg string
+		wantErr                   bool
+	}{
+		{
+			name:    "Valid URL with http",
+			input:   "http://example.com/path?query=123",
+			want:    "http://example.com",
+			wantErr: false,
+		},
+		{
+			name:    "Valid URL with https",
+			input:   "https://example.com",
+			want:    "https://example.com",
+			wantErr: false,
+		},
+		{
+			name:    "URL with no scheme",
+			input:   "example.com",
+			want:    "",
+			wantErr: true,
+			errMsg:  "scheme was empty",
+		},
+		{
+			name:    "URL with no scheme",
+			input:   "http://example.com/",
+			want:    "http://example.com",
+			wantErr: false,
+		},
+		{
+			name:    "URL with no host",
+			input:   "http://",
+			want:    "",
+			wantErr: true,
+			errMsg:  "host was empty",
+		},
+		{
+			name:    "Invalid URL format",
+			input:   "://example.com",
+			want:    "",
+			wantErr: true,
+			errMsg:  "missing protocol scheme",
+		},
+		{
+			name:    "URL with user info",
+			input:   "https://user:pass@example.com",
+			want:    "https://example.com",
+			wantErr: false,
+		},
+		{
+			name:    "Empty URL",
+			input:   "",
+			want:    "",
+			wantErr: true,
+			errMsg:  "scheme was empty",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := sanitizeURL(tt.input)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("sanitizeURL() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			if tt.wantErr && err != nil {
+				if !strings.Contains(err.Error(), tt.errMsg) {
+					t.Errorf("actual error = '%v', wantErrMsg: '%v'", err, tt.errMsg)
+				}
+			}
+
+			if got != tt.want {
+				t.Errorf("sanitizeURL() URL got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}