mirror of
				https://github.com/ClusterCockpit/cc-backend
				synced 2025-11-04 09:35:07 +01:00 
			
		
		
		
	Repair broken error handlng
This commit is contained in:
		@@ -152,11 +152,11 @@ func (auth *Authentication) Login(
 | 
				
			|||||||
	onfailure func(rw http.ResponseWriter, r *http.Request, loginErr error)) http.Handler {
 | 
						onfailure func(rw http.ResponseWriter, r *http.Request, loginErr error)) http.Handler {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 | 
						return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 | 
				
			||||||
		err := errors.New("no authenticator applied")
 | 
					 | 
				
			||||||
		username := r.FormValue("username")
 | 
							username := r.FormValue("username")
 | 
				
			||||||
		var dbUser *schema.User
 | 
							var dbUser *schema.User
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if username != "" {
 | 
							if username != "" {
 | 
				
			||||||
 | 
								var err error
 | 
				
			||||||
			dbUser, err = repository.GetUserRepository().GetUser(username)
 | 
								dbUser, err = repository.GetUserRepository().GetUser(username)
 | 
				
			||||||
			if err != nil && err != sql.ErrNoRows {
 | 
								if err != nil && err != sql.ErrNoRows {
 | 
				
			||||||
				log.Errorf("Error while loading user '%v'", username)
 | 
									log.Errorf("Error while loading user '%v'", username)
 | 
				
			||||||
@@ -170,7 +170,7 @@ func (auth *Authentication) Login(
 | 
				
			|||||||
				continue
 | 
									continue
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			user, err = authenticator.Login(user, rw, r)
 | 
								user, err := authenticator.Login(user, rw, r)
 | 
				
			||||||
			if err != nil {
 | 
								if err != nil {
 | 
				
			||||||
				log.Warnf("user login failed: %s", err.Error())
 | 
									log.Warnf("user login failed: %s", err.Error())
 | 
				
			||||||
				onfailure(rw, r, err)
 | 
									onfailure(rw, r, err)
 | 
				
			||||||
@@ -203,7 +203,7 @@ func (auth *Authentication) Login(
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		log.Debugf("login failed: no authenticator applied")
 | 
							log.Debugf("login failed: no authenticator applied")
 | 
				
			||||||
		onfailure(rw, r, err)
 | 
							onfailure(rw, r, errors.New("no authenticator applied"))
 | 
				
			||||||
	})
 | 
						})
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user