From 24a536d1450f6214dda8bc87645b4c8643e9e173 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 14 May 2019 21:52:18 +0800
Subject: [PATCH] Remove macaron dependent on models (#6940)
---
models/login_source.go | 8 ++++++--
models/mail.go | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/models/login_source.go b/models/login_source.go
index 69602b8b16..9b8173b84d 100644
--- a/models/login_source.go
+++ b/models/login_source.go
@@ -11,10 +11,10 @@ import (
"fmt"
"net/smtp"
"net/textproto"
+ "regexp"
"strings"
"github.com/Unknwon/com"
- "github.com/go-macaron/binding"
"github.com/go-xorm/core"
"github.com/go-xorm/xorm"
@@ -384,6 +384,10 @@ func composeFullName(firstname, surname, username string) string {
}
}
+var (
+ alphaDashDotPattern = regexp.MustCompile("[^\\w-\\.]")
+)
+
// LoginViaLDAP queries if login/password is valid against the LDAP directory pool,
// and create a local user if success when enabled.
func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoRegister bool) (*User, error) {
@@ -408,7 +412,7 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR
sr.Username = login
}
// Validate username make sure it satisfies requirement.
- if binding.AlphaDashDotPattern.MatchString(sr.Username) {
+ if alphaDashDotPattern.MatchString(sr.Username) {
return nil, fmt.Errorf("Invalid pattern for attribute 'username' [%s]: must be valid alpha or numeric or dash(-_) or dot characters", sr.Username)
}
diff --git a/models/mail.go b/models/mail.go
index b3e1e0d833..6be0df95ba 100644
--- a/models/mail.go
+++ b/models/mail.go
@@ -33,7 +33,7 @@ const (
var templates *template.Template
-// InitMailRender initializes the macaron mail renderer
+// InitMailRender initializes the mail renderer
func InitMailRender(tmpls *template.Template) {
templates = tmpls
}