admin&sync: insert format helper in database
This commit is contained in:
parent
971273a185
commit
2a6fbd4e32
@ -190,6 +190,7 @@ func deleteExerciceHint(hint fic.EHint, _ []byte) (interface{}, error) {
|
|||||||
|
|
||||||
type uploadedKey struct {
|
type uploadedKey struct {
|
||||||
Label string
|
Label string
|
||||||
|
Help string
|
||||||
Key string
|
Key string
|
||||||
Hash []byte
|
Hash []byte
|
||||||
}
|
}
|
||||||
@ -204,7 +205,7 @@ func createExerciceKey(exercice fic.Exercice, body []byte) (interface{}, error)
|
|||||||
return nil, errors.New("Key not filled")
|
return nil, errors.New("Key not filled")
|
||||||
}
|
}
|
||||||
|
|
||||||
return exercice.AddRawKey(uk.Label, uk.Key)
|
return exercice.AddRawKey(uk.Label, uk.Help, uk.Key)
|
||||||
}
|
}
|
||||||
|
|
||||||
func showExerciceKey(key fic.Key, _ fic.Exercice, body []byte) (interface{}, error) {
|
func showExerciceKey(key fic.Key, _ fic.Exercice, body []byte) (interface{}, error) {
|
||||||
@ -223,6 +224,7 @@ func updateExerciceKey(key fic.Key, exercice fic.Exercice, body []byte) (interfa
|
|||||||
key.Label = uk.Label
|
key.Label = uk.Label
|
||||||
}
|
}
|
||||||
|
|
||||||
|
key.Help = uk.Help
|
||||||
key.Checksum = uk.Hash
|
key.Checksum = uk.Hash
|
||||||
|
|
||||||
if _, err := key.Update(); err != nil {
|
if _, err := key.Update(); err != nil {
|
||||||
|
@ -95,17 +95,17 @@
|
|||||||
<button ng-click="deleteKey()" class="btn btn-danger"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></button>
|
<button ng-click="deleteKey()" class="btn btn-danger"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group row" ng-show="key.id">
|
<div class="form-group row">
|
||||||
<input type="text" id="kvalue{{key.id}}" ng-model="key.value" class="col form-control" placeholder="Condensat">
|
<input type="text" id="khelp{{key.id}}" ng-model="key.help" class="col form-control" placeholder="Indication de formatage">
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span></button>
|
<button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-group row" ng-show="key.id">
|
||||||
|
<input type="text" id="kvalue{{key.id}}" ng-model="key.value" class="col form-control" placeholder="Condensat">
|
||||||
|
</div>
|
||||||
<div class="form-group row" ng-show="!key.id">
|
<div class="form-group row" ng-show="!key.id">
|
||||||
<input type="text" id="kvalue{{key.id}}" ng-model="key.key" class="col form-control" placeholder="Chaîne à valider">
|
<input type="text" id="kvalue{{key.id}}" ng-model="key.key" class="col form-control" placeholder="Chaîne à valider">
|
||||||
<div class="col-auto">
|
|
||||||
<button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span></button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -40,7 +40,7 @@ func SyncExerciceKeys(i Importer, exercice fic.Exercice) (errs []string) {
|
|||||||
errs = append(errs, fmt.Sprintf("%q: WARNING flag #%d: non-printable characters in flag, is this really expected?", path.Base(exercice.Path), nline + 1))
|
errs = append(errs, fmt.Sprintf("%q: WARNING flag #%d: non-printable characters in flag, is this really expected?", path.Base(exercice.Path), nline + 1))
|
||||||
}
|
}
|
||||||
|
|
||||||
if k, err := exercice.AddRawKey(flag.Label, flag.Raw); err != nil {
|
if k, err := exercice.AddRawKey(flag.Label, flag.Help, flag.Raw); err != nil {
|
||||||
errs = append(errs, fmt.Sprintf("%q: error flag #%d: %s", path.Base(exercice.Path), nline + 1, err))
|
errs = append(errs, fmt.Sprintf("%q: error flag #%d: %s", path.Base(exercice.Path), nline + 1, err))
|
||||||
continue
|
continue
|
||||||
} else {
|
} else {
|
||||||
@ -67,7 +67,7 @@ func SyncExerciceKeys(i Importer, exercice fic.Exercice) (errs []string) {
|
|||||||
errs = append(errs, fmt.Sprintf("%q: WARNING flag UCQ #%d: non-printable characters in flag, is this really expected?", path.Base(exercice.Path), nline + 1))
|
errs = append(errs, fmt.Sprintf("%q: WARNING flag UCQ #%d: non-printable characters in flag, is this really expected?", path.Base(exercice.Path), nline + 1))
|
||||||
}
|
}
|
||||||
|
|
||||||
if k, err := exercice.AddRawKey(flag.Label, flag.Raw); err != nil {
|
if k, err := exercice.AddRawKey(flag.Label, flag.Help, flag.Raw); err != nil {
|
||||||
errs = append(errs, fmt.Sprintf("%q: error flag UCQ #%d: %s", path.Base(exercice.Path), nline + 1, err))
|
errs = append(errs, fmt.Sprintf("%q: error flag UCQ #%d: %s", path.Base(exercice.Path), nline + 1, err))
|
||||||
continue
|
continue
|
||||||
} else {
|
} else {
|
||||||
|
@ -160,6 +160,7 @@ CREATE TABLE IF NOT EXISTS exercice_keys(
|
|||||||
id_key INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
|
id_key INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
|
||||||
id_exercice INTEGER NOT NULL,
|
id_exercice INTEGER NOT NULL,
|
||||||
type VARCHAR(255) NOT NULL,
|
type VARCHAR(255) NOT NULL,
|
||||||
|
help VARCHAR(255) NOT NULL,
|
||||||
cksum BINARY(64) NOT NULL,
|
cksum BINARY(64) NOT NULL,
|
||||||
FOREIGN KEY(id_exercice) REFERENCES exercices(id_exercice)
|
FOREIGN KEY(id_exercice) REFERENCES exercices(id_exercice)
|
||||||
) DEFAULT CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;
|
) DEFAULT CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;
|
||||||
|
@ -290,7 +290,7 @@ func (f EFile) GetDepends() ([]Key, error) {
|
|||||||
if err := rows.Scan(&d); err != nil {
|
if err := rows.Scan(&d); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
deps = append(deps, Key{d, f.IdExercice, "", []byte{}})
|
deps = append(deps, Key{d, f.IdExercice, "", "", []byte{}})
|
||||||
}
|
}
|
||||||
if err := rows.Err(); err != nil {
|
if err := rows.Err(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -14,13 +14,15 @@ type Key struct {
|
|||||||
IdExercice int64 `json:"idExercice"`
|
IdExercice int64 `json:"idExercice"`
|
||||||
// Label is the title of the flag as displayed to players
|
// Label is the title of the flag as displayed to players
|
||||||
Label string `json:"label"`
|
Label string `json:"label"`
|
||||||
|
// Help is a small piece of text that aims to add useful information like flag format, ...
|
||||||
|
Help string `json:"help"`
|
||||||
// Checksum is the expected hashed flag
|
// Checksum is the expected hashed flag
|
||||||
Checksum []byte `json:"value"`
|
Checksum []byte `json:"value"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetKeys returns a list of flags comming with the challenge.
|
// GetKeys returns a list of flags comming with the challenge.
|
||||||
func (e Exercice) GetKeys() ([]Key, error) {
|
func (e Exercice) GetKeys() ([]Key, error) {
|
||||||
if rows, err := DBQuery("SELECT id_key, id_exercice, type, cksum FROM exercice_keys WHERE id_exercice = ?", e.Id); err != nil {
|
if rows, err := DBQuery("SELECT id_key, id_exercice, type, help, cksum FROM exercice_keys WHERE id_exercice = ?", e.Id); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
} else {
|
} else {
|
||||||
defer rows.Close()
|
defer rows.Close()
|
||||||
@ -30,7 +32,7 @@ func (e Exercice) GetKeys() ([]Key, error) {
|
|||||||
var k Key
|
var k Key
|
||||||
k.IdExercice = e.Id
|
k.IdExercice = e.Id
|
||||||
|
|
||||||
if err := rows.Scan(&k.Id, &k.IdExercice, &k.Label, &k.Checksum); err != nil {
|
if err := rows.Scan(&k.Id, &k.IdExercice, &k.Label, &k.Help, &k.Checksum); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
keys = append(keys, k)
|
keys = append(keys, k)
|
||||||
@ -50,25 +52,25 @@ func getHashedKey(raw_value string) [blake2b.Size]byte {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// AddRawKey creates and fills a new struct Key, from a non-hashed flag, and registers it into the database.
|
// AddRawKey creates and fills a new struct Key, from a non-hashed flag, and registers it into the database.
|
||||||
func (e Exercice) AddRawKey(name string, raw_value string) (Key, error) {
|
func (e Exercice) AddRawKey(name string, help string, raw_value string) (Key, error) {
|
||||||
hash := getHashedKey(raw_value)
|
hash := getHashedKey(raw_value)
|
||||||
return e.AddKey(name, hash[:])
|
return e.AddKey(name, help, hash[:])
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddKey creates and fills a new struct Key, from a hashed flag, and registers it into the database.
|
// AddKey creates and fills a new struct Key, from a hashed flag, and registers it into the database.
|
||||||
func (e Exercice) AddKey(name string, checksum []byte) (Key, error) {
|
func (e Exercice) AddKey(name string, help string, checksum []byte) (Key, error) {
|
||||||
if res, err := DBExec("INSERT INTO exercice_keys (id_exercice, type, cksum) VALUES (?, ?, ?)", e.Id, name, checksum); err != nil {
|
if res, err := DBExec("INSERT INTO exercice_keys (id_exercice, type, help, cksum) VALUES (?, ?, ?, ?)", e.Id, name, help, checksum); err != nil {
|
||||||
return Key{}, err
|
return Key{}, err
|
||||||
} else if kid, err := res.LastInsertId(); err != nil {
|
} else if kid, err := res.LastInsertId(); err != nil {
|
||||||
return Key{}, err
|
return Key{}, err
|
||||||
} else {
|
} else {
|
||||||
return Key{kid, e.Id, name, checksum}, nil
|
return Key{kid, e.Id, name, help, checksum}, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update applies modifications back to the database.
|
// Update applies modifications back to the database.
|
||||||
func (k Key) Update() (int64, error) {
|
func (k Key) Update() (int64, error) {
|
||||||
if res, err := DBExec("UPDATE exercice_keys SET id_exercice = ?, type = ?, cksum = ? WHERE id_key = ?", k.IdExercice, k.Label, k.Checksum, k.Id); err != nil {
|
if res, err := DBExec("UPDATE exercice_keys SET id_exercice = ?, type = ?, help = ?, cksum = ? WHERE id_key = ?", k.IdExercice, k.Label, k.Help, k.Checksum, k.Id); err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
} else if nb, err := res.RowsAffected(); err != nil {
|
} else if nb, err := res.RowsAffected(); err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
|
Loading…
Reference in New Issue
Block a user