netutil: imp code, errors

AdguardTeam · Feb 17, 2023 · ce2b431 · ce2b431
1 parent d438e02
commit ce2b431
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/netutil/addr.go b/netutil/addr.go
@@ -368,7 +368,7 @@ const MaxServiceLabelLen = 16
 func ValidateServiceNameLabel(label string) (err error) {
 	defer makeLabelError(&err, label, LabelKindSRV)
 
-	if label == "" {
+	if label == "" || label == "_" {
 		return ErrLabelIsEmpty
 	} else if r := rune(label[0]); r != '_' {
 		return &RuneError{
@@ -432,10 +432,6 @@ func ValidateSRVDomainName(name string) (err error) {
 			err = ValidateServiceNameLabel(l)
 		} else {
 			err = ValidateHostnameLabel(l)
-			if err != nil {
-				replaceKind(err, LabelKindSRV)
-				replaceKind(err.(*LabelError).Err, LabelKindSRV)
-			}
 		}
 		if err != nil {
 			return err

diff --git a/netutil/addr_test.go b/netutil/addr_test.go
@@ -455,7 +455,7 @@ func TestValidateSRVDomainName(t *testing.T) {
 		in:        "example..com",
 		wantErrAs: new(errors.Error),
 		wantErrMsg: `bad service domain name "example..com": ` +
-			`bad service name label "": label is empty`,
+			`bad hostname label "": label is empty`,
 	}, {
 		name:      "bad_label_first_symbol",
 		in:        "example._-a.com",
@@ -480,6 +480,12 @@ func TestValidateSRVDomainName(t *testing.T) {
 		wantErrAs: new(*netutil.AddrError),
 		wantErrMsg: `bad service domain name "example._.com": ` +
 			`bad service name label "_": label is empty`,
+	}, {
+		name:      "bad_hostname_label",
+		in:        "-srv.com",
+		wantErrAs: new(*netutil.AddrError),
+		wantErrMsg: `bad service domain name "-srv.com": ` +
+			`bad hostname label "-srv": bad hostname label rune '-'`,
 	}}
 
 	for _, tc := range testCases {

diff --git a/netutil/error.go b/netutil/error.go
@@ -29,7 +29,8 @@ const (
 	ErrNotAReversedSubnet errors.Error = "not a reversed ip network"
 )
 
-// AddrKind is the kind of address or address part used for error reporting.
+// AddrKind is a convenient alias for string describing the kind of address and
+// used for error reporting.
 type AddrKind = string
 
 // Kinds of addresses for [AddrError].
@@ -97,7 +98,8 @@ func makeAddrError(errPtr *error, addr string, k AddrKind) {
 	}
 }
 
-// LabelKind is the kind of label of a name used for error reporting.
+// LabelKind is a convenient alias for string describing the kind of label of a
+// name and used for error reporting.
 type LabelKind = string
 
 // Kinds of labels for [LabelError].
@@ -208,7 +210,7 @@ func (err *RuneError) Error() (msg string) {
 	return fmt.Sprintf("bad %s rune %q", err.Kind, err.Rune)
 }
 
-// replaceKind replaces the Kind field of err with newKind if err is
+// replaceKind replaces the Kind field of err with newKind.  err must be of type
 // [*LabelError], [*AddrError], [*LengthError], or [*RuneError].
 func replaceKind(err error, newKind string) {
 	switch err := err.(type) {
@@ -221,6 +223,6 @@ func replaceKind(err error, newKind string) {
 	case *RuneError:
 		err.Kind = newKind
 	default:
-		// Go on.
+		panic(fmt.Errorf("unexpected error type %T", err))
 	}
 }