fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Fix submission replay possibility

Browse source
This commit is contained in:
nemunaire 2016-02-26 01:27:08 +01:00 • committed by Pierre-Olivier Mercier
parent a8031452f7
commit e9f2b166a6
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/submission.go
View file

@ -53,8 +53,10 @@ func treatSubmission(pathname string, team_id string, exercice_id string) {
log.Println(id, "[ERR]", err) log.Println(id, "[ERR]", err)
} else if theme, err := exercice.GetTheme(); err != nil { } else if theme, err := exercice.GetTheme(); err != nil {
log.Println(id, "[ERR]", err) log.Println(id, "[ERR]", err)
} else if s, tm, _ := team.HasSolved(exercice); s {
log.Printf("$s [WRN] Team %d ALREADY solved exercice %d ($s : $s)\n", id, team.Id, exercice.Id, theme.Name, exercice.Title)
} else { } else {
if solved, firstTry, err := exercice.CheckResponse(keys, team); err != nil { if solved, err := exercice.CheckResponse(keys, team); err != nil {
log.Println(id, "[ERR]", err) log.Println(id, "[ERR]", err)
} else if solved { } else if solved {
exercice.Solved(team) exercice.Solved(team)
@ -75,8 +77,8 @@ func treatSubmission(pathname string, team_id string, exercice_id string) {
log.Println(id, "[ERR]", err) log.Println(id, "[ERR]", err)
} }
// Write event // Write event (only on first try)
if firstTry { if tm.Unix() == 0 {
if lvl, err := exercice.GetLevel(); err != nil { if lvl, err := exercice.GetLevel(); err != nil {
log.Println(id, "[ERR]", err) log.Println(id, "[ERR]", err)
} else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s tente le <strong>%d<sup>e</sup></strong> challenge %s !", team.Name, lvl, theme.Name), "alert-warning"); err != nil { } else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s tente le <strong>%d<sup>e</sup></strong> challenge %s !", team.Name, lvl, theme.Name), "alert-warning"); err != nil {

15
libfic/exercice.go
View file

@ -190,19 +190,14 @@ func (e Exercice) TriedCount() int64 {
} }
} }
func (e Exercice) CheckResponse(resps map[string]string, t Team) (bool, bool, error) { func (e Exercice) CheckResponse(resps map[string]string, t Team) (bool, error) {
s, tm, _ := t.HasSolved(e)
if s {
return true, false, nil
}
if err := e.NewTry(t); err != nil { if err := e.NewTry(t); err != nil {
return false, false, err return false, err
} else if keys, err := e.GetKeys(); err != nil { } else if keys, err := e.GetKeys(); err != nil {
return false, false, err return false, err
} else { } else {
if len(keys) < 1 { if len(keys) < 1 {
return true, false, errors.New("Exercice with no key registered") return true, errors.New("Exercice with no key registered")
} }
valid := true valid := true
@ -217,6 +212,6 @@ func (e Exercice) CheckResponse(resps map[string]string, t Team) (bool, bool, er
} }
} }
return valid, tm.Unix() == 0, nil return valid, nil
} }
} }