checker: Refactor + ensure theme is not disabled
This commit is contained in:
parent
b9ded53920
commit
6e5fd70156
2 changed files with 129 additions and 42 deletions
|
@ -25,29 +25,73 @@ func treatWantChoices(pathname string, team *fic.Team) {
|
|||
|
||||
var ask wantChoices
|
||||
|
||||
if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
|
||||
cnt_raw, err := ioutil.ReadFile(pathname)
|
||||
if err != nil {
|
||||
log.Printf("%s [ERR] %s\n", id, err)
|
||||
} else if err = json.Unmarshal(cnt_raw, &ask); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
err = json.Unmarshal(cnt_raw, &ask)
|
||||
if err != nil {
|
||||
log.Printf("%s [ERR] %s\n", id, err)
|
||||
} else if ask.FlagId == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
if ask.FlagId == 0 {
|
||||
log.Printf("%s [WRN] Invalid content in wantChoices file: %s\n", id, pathname)
|
||||
os.Remove(pathname)
|
||||
} else if flag, err := fic.GetFlagKey(ask.FlagId); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
flag, err := fic.GetFlagKey(ask.FlagId)
|
||||
if err != nil {
|
||||
log.Printf("%s [ERR] %s\n", id, err)
|
||||
} else if !team.CanSeeFlag(flag) {
|
||||
return
|
||||
}
|
||||
|
||||
if !team.CanSeeFlag(flag) {
|
||||
log.Printf("%s [!!!] The team asks to display choices whereas it doesn't have access to the flag\n", id)
|
||||
} else if exercice, err := flag.GetExercice(); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
exercice, err := flag.GetExercice()
|
||||
if err != nil {
|
||||
log.Printf("%s [ERR] Unable to retrieve the flag's underlying exercice: %s\n", id, err)
|
||||
} else if !team.HasAccess(exercice) {
|
||||
return
|
||||
}
|
||||
|
||||
if !team.HasAccess(exercice) {
|
||||
log.Printf("%s [!!!] The team asks to display choices whereas it doesn't have access to the exercice\n", id)
|
||||
} else if exercice.Disabled {
|
||||
return
|
||||
}
|
||||
|
||||
if exercice.Disabled {
|
||||
log.Println("[!!!] The team submits something for a disabled exercice")
|
||||
} else if err = team.DisplayChoices(flag); err != nil {
|
||||
log.Printf("%s [ERR] %s\n", id, err)
|
||||
} else {
|
||||
appendGenQueue(fic.GenStruct{Id: id, Type: fic.GenTeam, TeamId: team.Id})
|
||||
if err = os.Remove(pathname); err != nil {
|
||||
log.Printf("%s [ERR] %s\n", id, err)
|
||||
return
|
||||
}
|
||||
|
||||
if exercice.IdTheme != nil {
|
||||
theme, err := fic.GetTheme(*exercice.IdTheme)
|
||||
if err != nil {
|
||||
log.Printf("%s [ERR] Unable to retrieve theme for exercice %d: %s\n", id, exercice.Id, err)
|
||||
return
|
||||
}
|
||||
|
||||
// Theme should not be locked
|
||||
if theme.Locked {
|
||||
log.Printf("%s [!!!] Want choice received for locked theme %d (fid=%d): %s\n", id, exercice.IdTheme, ask.FlagId, theme.Name)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
err = team.DisplayChoices(flag)
|
||||
if err != nil {
|
||||
log.Printf("%s [ERR] %s\n", id, err)
|
||||
return
|
||||
}
|
||||
|
||||
appendGenQueue(fic.GenStruct{Id: id, Type: fic.GenTeam, TeamId: team.Id})
|
||||
if err = os.Remove(pathname); err != nil {
|
||||
log.Printf("%s [ERR] %s\n", id, err)
|
||||
}
|
||||
}
|
||||
|
|
Reference in a new issue