domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Move login related structs and functions to models/login (#17093)

Browse source 
* Move login related structs and functions to models/login

* Fix test

* Fix lint

* Fix lint

* Fix lint of windows

* Fix lint

* Fix test

* Fix test

* Only load necessary fixtures when preparing unit tests envs

* Fix lint

* Fix test

* Fix test

* Fix error log

* Fix error log

* Fix error log

* remove unnecessary change

* fix error log

* merge main branch
This commit is contained in:
Lunny Xiao 2021-09-24 19:32:56 +08:00 • committed by GitHub
parent 4a2655098f
commit 5842a55b31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
142 changed files with 1050 additions and 907 deletions
Download patch file Download diff file Expand all files Collapse all files

6
services/auth/source/pam/assert_interface_test.go
View file

@ -5,7 +5,7 @@
package pam_test
import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/login"
"code.gitea.io/gitea/services/auth"
"code.gitea.io/gitea/services/auth/source/pam"
)
@ -15,8 +15,8 @@ import (
type sourceInterface interface {
auth.PasswordAuthenticator
models.LoginConfig
models.LoginSourceSettable
login.Config
login.SourceSettable
}
var _ (sourceInterface) = &pam.Source{}

7
services/auth/source/pam/source.go
View file

@ -6,6 +6,7 @@ package pam
import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/login"
"code.gitea.io/gitea/modules/json"
)
@ -22,7 +23,7 @@ type Source struct {
EmailDomain string
// reference to the loginSource
loginSource *models.LoginSource
loginSource *login.Source
}
// FromDB fills up a PAMConfig from serialized format.
@ -36,10 +37,10 @@ func (source *Source) ToDB() ([]byte, error) {
}
// SetLoginSource sets the related LoginSource
func (source *Source) SetLoginSource(loginSource *models.LoginSource) {
func (source *Source) SetLoginSource(loginSource *login.Source) {
source.loginSource = loginSource
}
func init() {
models.RegisterLoginTypeConfig(models.LoginPAM, &Source{})
login.RegisterTypeConfig(login.PAM, &Source{})
}

11
services/auth/source/pam/source_authenticate.go
View file

@ -9,6 +9,7 @@ import (
"strings"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/login"
"code.gitea.io/gitea/modules/auth/pam"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/services/mailer"
@ -18,11 +19,11 @@ import (
// Authenticate queries if login/password is valid against the PAM,
// and create a local user if success when enabled.
func (source *Source) Authenticate(user *models.User, login, password string) (*models.User, error) {
pamLogin, err := pam.Auth(source.ServiceName, login, password)
func (source *Source) Authenticate(user *models.User, userName, password string) (*models.User, error) {
pamLogin, err := pam.Auth(source.ServiceName, userName, password)
if err != nil {
if strings.Contains(err.Error(), "Authentication failure") {
return nil, models.ErrUserNotExist{Name: login}
return nil, models.ErrUserNotExist{Name: userName}
}
return nil, err
}
@ -54,9 +55,9 @@ func (source *Source) Authenticate(user *models.User, login, password string) (*
Name: username,
Email: email,
Passwd: password,
LoginType: models.LoginPAM,
LoginType: login.PAM,
LoginSource: source.loginSource.ID,
LoginName: login, // This is what the user typed in
LoginName: userName, // This is what the user typed in
IsActive: true,
}