-
+
min
diff --git a/fickit-backend.yml b/fickit-backend.yml
index 16a57215..def65aaa 100644
--- a/fickit-backend.yml
+++ b/fickit-backend.yml
@@ -237,7 +237,7 @@ services:
- /var/lib/fic/generator:/srv/GENERATOR:ro
- /var/lib/fic/pki:/srv/PKI
- /var/lib/fic/settings:/srv/SETTINGS
- - /var/lib/fic/submissions:/srv/submissions:ro
+ - /var/lib/fic/submissions:/srv/submissions
- /var/lib/fic/sync:/srv/SYNC
- /var/lib/fic/teams:/srv/TEAMS
net: /run/netns/fic-admin
@@ -278,7 +278,10 @@ services:
binds:
- /etc/hosts:/etc/hosts:ro
- /var/lib/fic/generator:/srv/GENERATOR:ro
+ # Uncomment this to disallow registrations
- /var/lib/fic/teams:/srv/TEAMS:ro
+ # Uncomment this to allow registrations
+ #- /var/lib/fic/teams:/srv/TEAMS
- /var/lib/fic/secrets/mysql_password:/run/secrets/mysql_password:ro
- /var/lib/fic/settingsdist:/srv/SETTINGSDIST:ro
- /var/lib/fic/submissions:/srv/submissions
diff --git a/libfic/db.go b/libfic/db.go
index ae6826ae..0a96120e 100644
--- a/libfic/db.go
+++ b/libfic/db.go
@@ -414,6 +414,7 @@ CREATE TABLE IF NOT EXISTS exercice_solved(
}
if _, err := db.Exec(`
CREATE TABLE IF NOT EXISTS exercice_tries(
+ id_try INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
id_exercice INTEGER NOT NULL,
id_team INTEGER NOT NULL,
time TIMESTAMP NOT NULL,
@@ -423,6 +424,26 @@ CREATE TABLE IF NOT EXISTS exercice_tries(
FOREIGN KEY(id_exercice) REFERENCES exercices(id_exercice),
FOREIGN KEY(id_team) REFERENCES teams(id_team)
) DEFAULT CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;
+`); err != nil {
+ return err
+ }
+ if _, err := db.Exec(`
+CREATE TABLE IF NOT EXISTS exercice_tries_flags(
+ id_try INTEGER NOT NULL,
+ id_flag INTEGER NOT NULL,
+ FOREIGN KEY(id_try) REFERENCES exercice_tries(id_try) ON DELETE CASCADE,
+ FOREIGN KEY(id_flag) REFERENCES exercice_flags(id_flag) ON DELETE CASCADE
+) DEFAULT CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;
+`); err != nil {
+ return err
+ }
+ if _, err := db.Exec(`
+CREATE TABLE IF NOT EXISTS exercice_tries_mcq(
+ id_try INTEGER NOT NULL,
+ id_mcq INTEGER NOT NULL,
+ FOREIGN KEY(id_try) REFERENCES exercice_tries(id_try) ON DELETE CASCADE,
+ FOREIGN KEY(id_mcq) REFERENCES exercice_mcq(id_mcq) ON DELETE CASCADE
+) DEFAULT CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;
`); err != nil {
return err
}
diff --git a/libfic/exercice.go b/libfic/exercice.go
index c9979fcb..d6b38121 100644
--- a/libfic/exercice.go
+++ b/libfic/exercice.go
@@ -3,6 +3,7 @@ package fic
import (
"errors"
"fmt"
+ "log"
"math"
"time"
)
@@ -444,11 +445,25 @@ func (e *Exercice) GetOrdinal() (int, error) {
}
// NewTry registers a solving attempt for the given Team.
-func (e *Exercice) NewTry(t *Team, cksum []byte) error {
- if _, err := DBExec("INSERT INTO exercice_tries (id_exercice, id_team, time, cksum) VALUES (?, ?, ?, ?)", e.Id, t.Id, time.Now(), cksum); err != nil {
- return err
+func (e *Exercice) NewTry(t *Team, cksum []byte, flags ...Flag) (int64, error) {
+ if res, err := DBExec("INSERT INTO exercice_tries (id_exercice, id_team, time, cksum) VALUES (?, ?, ?, ?)", e.Id, t.Id, time.Now(), cksum); err != nil {
+ return 0, err
} else {
- return nil
+ return res.LastInsertId()
+ }
+}
+
+func (e *Exercice) NewTryFlag(tryid int64, flags ...Flag) {
+ for _, flag := range flags {
+ if fk, ok := flag.(*FlagKey); ok {
+ if _, err := DBExec("INSERT INTO exercice_tries_flags (id_try, id_flag) VALUES (?, ?)", tryid, fk.Id); err != nil {
+ log.Println("Unable to add detailed try: ", err.Error())
+ }
+ } else if fm, ok := flag.(*MCQ); ok {
+ if _, err := DBExec("INSERT INTO exercice_tries_mcq (id_try, id_mcq) VALUES (?, ?)", tryid, fm.Id); err != nil {
+ log.Println("Unable to add detailed try: ", err.Error())
+ }
+ }
}
}
@@ -550,7 +565,7 @@ func (e *Exercice) MCQSolved() (res []int64) {
// CheckResponse, given both flags and MCQ responses, figures out if thoses are correct (or if they are previously solved).
// In the meanwhile, CheckResponse registers good answers given (but it does not mark the challenge as solved at the end).
func (e *Exercice) CheckResponse(cksum []byte, respflags map[int]string, respmcq map[int]bool, t *Team) (bool, error) {
- if err := e.NewTry(t, cksum); err != nil {
+ if tryId, err := e.NewTry(t, cksum); err != nil {
return false, err
} else if flags, err := e.GetFlagKeys(); err != nil {
return false, err
@@ -565,6 +580,10 @@ func (e *Exercice) CheckResponse(cksum []byte, respflags map[int]string, respmcq
// Check MCQs
for _, mcq := range mcqs {
+ if mcq.HasOneEntry(respmcq) {
+ e.NewTryFlag(tryId, mcq)
+ }
+
if d := mcq.Check(respmcq); d > 0 {
if !PartialValidation || t.HasPartiallySolved(mcq) == nil {
valid = false
@@ -589,15 +608,21 @@ func (e *Exercice) CheckResponse(cksum []byte, respflags map[int]string, respmcq
for _, flag := range flags {
if res, ok := respflags[flag.Id]; !ok && (!PartialValidation || t.HasPartiallySolved(flag) == nil) {
valid = valid && flag.IsOptionnal()
- } else if flag.Check([]byte(res)) != 0 {
- if !PartialValidation || t.HasPartiallySolved(flag) == nil {
- valid = valid && flag.IsOptionnal()
+ } else if ok {
+ if len(res) > 0 {
+ e.NewTryFlag(tryId, flag)
}
- } else {
- err := flag.FoundBy(t)
- if err == nil {
- // err is unicity issue, probably flag already found
- goodResponses += 1
+
+ if flag.Check([]byte(res)) != 0 {
+ if !PartialValidation || t.HasPartiallySolved(flag) == nil {
+ valid = valid && flag.IsOptionnal()
+ }
+ } else {
+ err := flag.FoundBy(t)
+ if err == nil {
+ // err is unicity issue, probably flag already found
+ goodResponses += 1
+ }
}
}
}
diff --git a/libfic/exercice_history.go b/libfic/exercice_history.go
index 63dab2dd..763c48d7 100644
--- a/libfic/exercice_history.go
+++ b/libfic/exercice_history.go
@@ -68,7 +68,8 @@ func (e *Exercice) AppendHistoryItem(tId int64, kind string, secondary *int64) e
if kind == "tries" {
bid := make([]byte, 5)
binary.LittleEndian.PutUint32(bid, rand.Uint32())
- return (&Exercice{Id: e.Id}).NewTry(team, bid)
+ _, err = (&Exercice{Id: e.Id}).NewTry(team, bid)
+ return err
} else if kind == "hint" && secondary != nil {
return team.OpenHint(&EHint{Id: *secondary})
} else if kind == "wchoices" && secondary != nil {
diff --git a/libfic/flag.go b/libfic/flag.go
index 06373495..2e419bf1 100644
--- a/libfic/flag.go
+++ b/libfic/flag.go
@@ -14,6 +14,9 @@ type Flag interface {
Check(val interface{}) int
IsOptionnal() bool
FoundBy(t *Team) error
+ NbTries() (int64, error)
+ TeamsOnIt() ([]int64, error)
+ DeleteTries() error
}
// GetFlag returns a list of flags comming with the challenge.
diff --git a/libfic/flag_key.go b/libfic/flag_key.go
index 905d1942..40da9348 100644
--- a/libfic/flag_key.go
+++ b/libfic/flag_key.go
@@ -230,6 +230,54 @@ func (k *FlagKey) RecoverId() (Flag, error) {
}
}
+// NbTries returns the flag resolution statistics.
+func (k *FlagKey) NbTries() (tries int64, err error) {
+ err = DBQueryRow("SELECT COUNT(*) AS tries FROM exercice_tries_flags WHERE id_flag = ?", k.Id).Scan(&tries)
+ return
+}
+
+func (k *FlagKey) TeamsOnIt() ([]int64, error) {
+ if rows, err := DBQuery("SELECT DISTINCT M.id_team FROM exercice_tries_flags F INNER JOIN exercice_tries T ON T.id_try = F.id_try INNER JOIN teams M ON M.id_team = T.id_team WHERE id_flag = ?", k.Id); err != nil {
+ return nil, err
+ } else {
+ defer rows.Close()
+
+ teams := []int64{}
+ for rows.Next() {
+ var idteam int64
+ if err := rows.Scan(&idteam); err != nil {
+ return nil, err
+ }
+ teams = append(teams, idteam)
+ }
+
+ return teams, nil
+ }
+}
+
+func (k *FlagKey) DeleteTries() error {
+ if rows, err := DBQuery("SELECT id_try FROM exercice_tries_flags WHERE id_flag = ?", k.Id); err != nil {
+ return err
+ } else {
+ defer rows.Close()
+
+ for rows.Next() {
+ var idtry int64
+ err = rows.Scan(&idtry)
+ if err != nil {
+ return err
+ }
+
+ _, err = DBExec("DELETE FROM exercice_tries WHERE id_try = ?", idtry)
+ if err != nil {
+ return err
+ }
+ }
+
+ return nil
+ }
+}
+
// AddFlagKey creates and fills a new struct Flag, from a hashed flag, and registers it into the database.
func (k *FlagKey) Create(e *Exercice) (Flag, error) {
// Check the regexp compile
diff --git a/libfic/flag_label.go b/libfic/flag_label.go
index 6d103f7f..eec13522 100644
--- a/libfic/flag_label.go
+++ b/libfic/flag_label.go
@@ -71,6 +71,18 @@ func (k *FlagLabel) RecoverId() (Flag, error) {
}
}
+func (k *FlagLabel) NbTries() (int64, error) {
+ return 0, nil
+}
+
+func (k *FlagLabel) TeamsOnIt() ([]int64, error) {
+ return nil, nil
+}
+
+func (k *FlagLabel) DeleteTries() error {
+ return nil
+}
+
// AddFlagLabel creates and fills a new struct Flag and registers it into the database.
func (k *FlagLabel) Create(e *Exercice) (Flag, error) {
if res, err := DBExec("INSERT INTO exercice_flag_labels (id_exercice, ordre, label, variant) VALUES (?, ?, ?, ?)", e.Id, k.Order, k.Label, k.Variant); err != nil {
diff --git a/libfic/mcq.go b/libfic/mcq.go
index 04bf3fd9..3129ec80 100644
--- a/libfic/mcq.go
+++ b/libfic/mcq.go
@@ -136,6 +136,54 @@ func (m *MCQ) RecoverId() (Flag, error) {
}
}
+// NbTries returns the MCQ resolution statistics.
+func (m *MCQ) NbTries() (tries int64, err error) {
+ err = DBQueryRow("SELECT COUNT(*) AS tries FROM exercice_tries_mcq WHERE id_mcq = ?", m.Id).Scan(&tries)
+ return
+}
+
+func (m *MCQ) TeamsOnIt() ([]int64, error) {
+ if rows, err := DBQuery("SELECT DISTINCT M.id_team FROM exercice_tries_mcq F INNER JOIN exercice_tries T ON T.id_try = F.id_try INNER JOIN teams M ON M.id_team = T.id_team WHERE id_mcq = ?", m.Id); err != nil {
+ return nil, err
+ } else {
+ defer rows.Close()
+
+ teams := []int64{}
+ for rows.Next() {
+ var idteam int64
+ if err := rows.Scan(&idteam); err != nil {
+ return nil, err
+ }
+ teams = append(teams, idteam)
+ }
+
+ return teams, nil
+ }
+}
+
+func (m *MCQ) DeleteTries() error {
+ if rows, err := DBQuery("SELECT id_try FROM exercice_tries_mcq WHERE id_mcq = ?", m.Id); err != nil {
+ return err
+ } else {
+ defer rows.Close()
+
+ for rows.Next() {
+ var idtry int64
+ err = rows.Scan(&idtry)
+ if err != nil {
+ return err
+ }
+
+ _, err = DBExec("DELETE FROM exercice_tries WHERE id_try = ?", idtry)
+ if err != nil {
+ return err
+ }
+ }
+
+ return nil
+ }
+}
+
// Create registers a MCQ into the database and recursively add its entries.
func (m *MCQ) Create(e *Exercice) (Flag, error) {
if res, err := DBExec("INSERT INTO exercice_mcq (id_exercice, ordre, title) VALUES (?, ?, ?)", e.Id, m.Order, m.Title); err != nil {
@@ -319,6 +367,24 @@ func (m *MCQ) IsOptionnal() bool {
return false
}
+// Check if the given vals contains at least a response for the given MCQ.
+func (m *MCQ) HasOneEntry(v interface{}) bool {
+ var vals map[int]bool
+ if va, ok := v.(map[int]bool); !ok {
+ return false
+ } else {
+ vals = va
+ }
+
+ for _, n := range m.Entries {
+ if _, ok := vals[n.Id]; ok {
+ return true
+ }
+ }
+
+ return false
+}
+
// Check if the given vals are the expected ones to validate this flag.
func (m *MCQ) Check(v interface{}) int {
var vals map[int]bool