diff --git a/server/dbdata/userauth.go b/server/dbdata/userauth.go index 44ac09b..190e863 100644 --- a/server/dbdata/userauth.go +++ b/server/dbdata/userauth.go @@ -1,6 +1,9 @@ package dbdata -import "reflect" +import ( + "reflect" + "regexp" +) var authRegistry = make(map[string]reflect.Type) @@ -13,3 +16,8 @@ func makeInstance(name string) interface{} { v := reflect.New(authRegistry[name]).Elem() return v.Interface() } + +func ValidateIpPort(addr string) bool { + RegExp := regexp.MustCompile(`^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\:([0-9]|[1-9]\d{1,3}|[1-5]\d{4}|6[0-5]{2}[0-3][0-5])$$`) + return RegExp.MatchString(addr) +} diff --git a/server/dbdata/userauth_radius.go b/server/dbdata/userauth_radius.go index 13b627d..ef6691e 100644 --- a/server/dbdata/userauth_radius.go +++ b/server/dbdata/userauth_radius.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "reflect" - "regexp" "time" "layeh.com/radius" @@ -71,8 +70,3 @@ func (auth AuthRadius) checkUser(name string, pwd string, authData map[string]in } return nil } - -func ValidateIpPort(addr string) bool { - RegExp := regexp.MustCompile(`^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\:([0-9]|[1-9]\d{1,3}|[1-5]\d{4}|6[0-5]{2}[0-3][0-5])$$`) - return RegExp.MatchString(addr) -}