enforced return after abortwithstatus (#1419)

TUM-Dev · Dec 2, 2024 · d3a11f6 · d3a11f6
1 parent 039523d
commit d3a11f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/web/index.go b/web/index.go
@@ -178,6 +178,7 @@ func (d *IndexData) LoadLivestreams(c *gin.Context, daoWrapper dao.DaoWrapper) {
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		logger.Error("could not get current live streams", "err", err)
 		c.AbortWithStatusJSON(http.StatusNotFound, gin.H{"message": "Could not load current livestream from database."})
+		return
 	}
 
 	tumLiveContext := d.TUMLiveContext

diff --git a/web/saml.go b/web/saml.go
@@ -132,6 +132,7 @@ func configSaml(r *gin.Engine, daoWrapper dao.DaoWrapper) {
 			if len(s) == 0 || s[0] == "" {
 				logger.Error("Can't extract mwn id", "LRZ-ID", lrzID, "firstName", firstName, "lastName", lastName, "mwnID", matrNr)
 				c.AbortWithStatus(http.StatusInternalServerError)
+				return
 			}
 			matrNr = s[0]
 		}
@@ -145,6 +146,7 @@ func configSaml(r *gin.Engine, daoWrapper dao.DaoWrapper) {
 		if err != nil {
 			logger.Error("Could not upsert user", "err", err)
 			c.AbortWithStatus(http.StatusInternalServerError)
+			return
 		}
 		HandleValidLogin(c, &tools.SessionData{Userid: user.ID, SamlSubjectID: &subjectID})
 	})