Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions server/router/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -632,8 +632,8 @@ func CheckQRCode(ctx *gin.Context) {
return
}

// Send OK if QR code is right
if options.QRCode == qrReq.Code {
// Send OK or reject empty values
if qrReq.Code != "" && options.QRCode != "" && options.QRCode == qrReq.Code {
ctx.JSON(http.StatusOK, gin.H{"ok": 1})
} else {
ctx.JSON(http.StatusOK, gin.H{"ok": 0})
Expand Down Expand Up @@ -663,8 +663,9 @@ func CheckTrackQRCode(ctx *gin.Context) {
return
}

// Send OK if QR code is right
if options.TrackQRCodes[track] == qrReq.Code {
// Send OK or reject empty values
expected := options.TrackQRCodes[track]
if qrReq.Code != "" && expected != "" && expected == qrReq.Code {
ctx.JSON(http.StatusOK, gin.H{"ok": 1})
} else {
ctx.JSON(http.StatusOK, gin.H{"ok": 0})
Expand Down
19 changes: 8 additions & 11 deletions server/router/judge.go
Original file line number Diff line number Diff line change
Expand Up @@ -1052,17 +1052,14 @@ func AddJudgeFromQR(ctx *gin.Context) {
return err
}

// Make sure the code is correct
if qrReq.Track == "" {
if qrReq.Code != options.QRCode {
ctx.JSON(http.StatusBadRequest, gin.H{"error": "invalid QR code"})
return err
}
} else {
if qrReq.Code != options.TrackQRCodes[qrReq.Track] {
ctx.JSON(http.StatusBadRequest, gin.H{"error": "invalid QR code"})
return err
}
// Make sure the code is correct and reject empty code
expectedCode := options.QRCode
if qrReq.Track != "" {
expectedCode = options.TrackQRCodes[qrReq.Track]
}
if qrReq.Code == "" || expectedCode == "" || qrReq.Code != expectedCode {
ctx.JSON(http.StatusBadRequest, gin.H{"error": "invalid QR code"})
return err
}

// Check if the judge already exists
Expand Down
Loading