[chore] better dns validation (#3644)

* add seperate PunifyValidate() function for properly validating domain names when converting to punycode

* rename function, strip port from domain validation

1 files changed, 0 insertions, 97 deletions

diff --git a/internal/util/punycode.go b/internal/util/punycode.go
deleted file mode 100644
index 3e9f71408..000000000
--- a/internal/util/punycode.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// GoToSocial
-// Copyright (C) GoToSocial Authors admin@gotosocial.org
-// SPDX-License-Identifier: AGPL-3.0-or-later
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package util
-
-import (
-	"net/url"
-	"strings"
-
-	"golang.org/x/net/idna"
-)
-
-// Punify converts the given domain to lowercase
-// then to punycode (for international domain names).
-//
-// Returns the resulting domain or an error if the
-// punycode conversion fails.
-func Punify(domain string) (string, error) {
-	domain = strings.ToLower(domain)
-	return idna.ToASCII(domain)
-}
-
-// DePunify converts the given punycode string
-// to its original unicode representation (lowercased).
-// Noop if the domain is (already) not puny.
-//
-// Returns an error if conversion fails.
-func DePunify(domain string) (string, error) {
-	out, err := idna.ToUnicode(domain)
-	return strings.ToLower(out), err
-}
-
-// URIMatches returns true if the expected URI matches
-// any of the given URIs, taking account of punycode.
-func URIMatches(expect *url.URL, uris ...*url.URL) (bool, error) {
-	// Normalize expect to punycode.
-	expectStr, err := PunifyURIToStr(expect)
-	if err != nil {
-		return false, err
-	}
-
-	for _, uri := range uris {
-		uriStr, err := PunifyURIToStr(uri)
-		if err != nil {
-			return false, err
-		}
-
-		if uriStr == expectStr {
-			// Looks good.
-			return true, nil
-		}
-	}
-
-	// Didn't match.
-	return false, nil
-}
-
-// PunifyURI returns a copy of the given URI
-// with the 'host' part converted to punycode.
-func PunifyURI(in *url.URL) (*url.URL, error) {
-	punyHost, err := Punify(in.Host)
-	if err != nil {
-		return nil, err
-	}
-	out := new(url.URL)
-	*out = *in
-	out.Host = punyHost
-	return out, nil
-}
-
-// PunifyURIToStr returns given URI serialized
-// with the 'host' part converted to punycode.
-func PunifyURIToStr(in *url.URL) (string, error) {
-	punyHost, err := Punify(in.Host)
-	if err != nil {
-		return "", err
-	}
-	oldHost := in.Host
-	in.Host = punyHost
-	str := in.String()
-	in.Host = oldHost
-	return str, nil
-}