mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Make LDAP be able to skip local 2FA (#16954)
This PR extends #16594 to allow LDAP to be able to be set to skip local 2FA too. The technique used here would be extensible to PAM and SMTP sources. Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
		@@ -107,7 +107,7 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	log.Trace("Basic Authorization: Attempting SignIn for %s", uname)
 | 
			
		||||
	u, err := UserSignIn(uname, passwd)
 | 
			
		||||
	u, source, err := UserSignIn(uname, passwd)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		if !models.IsErrUserNotExist(err) {
 | 
			
		||||
			log.Error("UserSignIn: %v", err)
 | 
			
		||||
@@ -115,6 +115,10 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore
 | 
			
		||||
		return nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if skipper, ok := source.Cfg.(LocalTwoFASkipper); ok && skipper.IsSkipLocalTwoFA() {
 | 
			
		||||
		store.GetData()["SkipLocalTwoFA"] = true
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	log.Trace("Basic Authorization: Logged in user %-v", u)
 | 
			
		||||
 | 
			
		||||
	return u
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user