未验证 提交 5eb9f4e8 编写于 作者: C colynn.liu 提交者: GitHub

Merge pull request #182 from go-atomci/feat-update-auth-layout

fix: public pkg clean log print
......@@ -100,7 +100,7 @@ func (a *AuthController) Authenticate() {
log.Log.Debug("externalAccountInfo user: %s", externalAccountInfo.User)
} else {
log.Log.Error("login authenticate error: %v", authErr.Error())
http.Error(a.Ctx.ResponseWriter, authErr.Error(), http.StatusInternalServerError)
http.Error(a.Ctx.ResponseWriter, "用户不存在或密码错误", http.StatusInternalServerError)
return
}
......
......@@ -19,7 +19,6 @@ package ldap
import (
"fmt"
"github.com/go-atomci/atomci/internal/middleware/log"
"github.com/go-atomci/atomci/pkg/auth"
"github.com/astaxie/beego"
......@@ -66,10 +65,7 @@ func (p *Provider) Authenticate(user, password string) (*auth.ExternalAccount, e
authVerify, resp, err := client.Authenticate(user, password)
if !authVerify {
if err != nil {
log.Log.Error("authVerify error: %s", err.Error())
}
return nil, fmt.Errorf("域帐号或密码错误,或请联系管理员")
return nil, fmt.Errorf("authVerify error: %v", err)
}
// TODO: resp add verification
......
......@@ -19,7 +19,6 @@ package local
import (
"fmt"
"github.com/go-atomci/atomci/internal/middleware/log"
"github.com/go-atomci/atomci/pkg/auth"
"golang.org/x/crypto/bcrypt"
......@@ -47,8 +46,7 @@ func NewProvider(opts ...Option) auth.Provider {
func (p *Provider) Authenticate(loginUser, password string) (*auth.ExternalAccount, error) {
_, err := CompareHashAndPassword(p.password, password)
if err != nil {
log.Log.Error("comparehas password, error: %v", err.Error())
return nil, fmt.Errorf("用户不存在或密码错误")
return nil, fmt.Errorf("comparehas password, error: %v", err.Error())
}
return &auth.ExternalAccount{
Name: p.name,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册