From dd8b751c6206091b7d0d052b2ffcd4e57ab78070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Do=C4=9Fan=20Can=20Bak=C4=B1r?= Date: Mon, 18 Mar 2024 14:26:25 +0300 Subject: [PATCH 1/3] update regex --- libs/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/types.go b/libs/types.go index fb96a9f..0545ea5 100644 --- a/libs/types.go +++ b/libs/types.go @@ -46,7 +46,7 @@ const ( Unknown ) -var domainRegex = regexp.MustCompile(`^(?i)[a-z0-9-]+(\.[a-z0-9-]+)+\.?$`) +var domainRegex = regexp.MustCompile(`^(?i)[a-z0-9-_]+(\.[a-z0-9-]+)+\.?$`) func MapToResults(output []*Response) ([]*Result, error) { results := make([]*Result, 0, len(output)) From 69629512bb00f72483df925a53a227a71f1a5433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Do=C4=9Fan=20Can=20Bak=C4=B1r?= Date: Wed, 3 Apr 2024 15:50:45 +0300 Subject: [PATCH 2/3] use `govalidator.IsDNSName` --- libs/types.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/types.go b/libs/types.go index 0545ea5..35258c9 100644 --- a/libs/types.go +++ b/libs/types.go @@ -2,7 +2,6 @@ package asnmap import ( "net" - "regexp" "strconv" "strings" "time" @@ -46,8 +45,6 @@ const ( Unknown ) -var domainRegex = regexp.MustCompile(`^(?i)[a-z0-9-_]+(\.[a-z0-9-]+)+\.?$`) - func MapToResults(output []*Response) ([]*Result, error) { results := make([]*Result, 0, len(output)) for _, res := range output { @@ -121,7 +118,7 @@ func IdentifyInput(input string) InputType { return ASN case checkIfASNId(input): return ASNID - case domainRegex.MatchString(input): + case govalidator.IsDNSName(input): return Domain default: return Org From 671babc78e93285e6d7a057ef4556076ffe47a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Do=C4=9Fan=20Can=20Bak=C4=B1r?= Date: Wed, 3 Apr 2024 16:21:51 +0300 Subject: [PATCH 3/3] Revert "use `govalidator.IsDNSName`" This reverts commit 69629512bb00f72483df925a53a227a71f1a5433. --- libs/types.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/types.go b/libs/types.go index 35258c9..0545ea5 100644 --- a/libs/types.go +++ b/libs/types.go @@ -2,6 +2,7 @@ package asnmap import ( "net" + "regexp" "strconv" "strings" "time" @@ -45,6 +46,8 @@ const ( Unknown ) +var domainRegex = regexp.MustCompile(`^(?i)[a-z0-9-_]+(\.[a-z0-9-]+)+\.?$`) + func MapToResults(output []*Response) ([]*Result, error) { results := make([]*Result, 0, len(output)) for _, res := range output { @@ -118,7 +121,7 @@ func IdentifyInput(input string) InputType { return ASN case checkIfASNId(input): return ASNID - case govalidator.IsDNSName(input): + case domainRegex.MatchString(input): return Domain default: return Org