- {$settings.title}
+ {$challengeInfo.title}
Classement
diff --git a/frontend/ui/src/routes/rules.svelte b/frontend/ui/src/routes/rules.svelte
index 02d09e19..e32da6dd 100644
--- a/frontend/ui/src/routes/rules.svelte
+++ b/frontend/ui/src/routes/rules.svelte
@@ -6,12 +6,13 @@
Icon,
} from 'sveltestrap';
+ import { challengeInfo } from '../stores/challengeinfo.js';
import { settings } from '../stores/settings.js';
- {$settings.title}
+ {$challengeInfo.title}
Règles générales
diff --git a/frontend/ui/src/stores/challengeinfo.js b/frontend/ui/src/stores/challengeinfo.js
new file mode 100644
index 00000000..ad984b53
--- /dev/null
+++ b/frontend/ui/src/stores/challengeinfo.js
@@ -0,0 +1,22 @@
+import { readable, writable } from 'svelte/store';
+
+function createChallengeStore() {
+ const { subscribe, set, update } = writable({});
+
+ return {
+ subscribe,
+ update: (res_challenge, cb) => {
+ if (res_challenge.status === 200) {
+ res_challenge.json().then((challenge) => {
+ update((s) => (Object.assign({}, challenge)));
+
+ if (cb) {
+ cb(challenge);
+ }
+ });
+ }
+ },
+ }
+}
+
+export const challengeInfo = createChallengeStore();
diff --git a/libfic/zqsd.go b/libfic/zqsd.go
index 66118fa1..6bd0cd23 100644
--- a/libfic/zqsd.go
+++ b/libfic/zqsd.go
@@ -20,7 +20,7 @@ type ChallengeZQDS struct {
type SessionZQDS struct {
Name string `json:"name"`
Description string `json:"description"`
- Scenario string `json:"scenario"`
+ Scenario string `json:"scenario,omitempty"`
YourMission string `json:"your_mission"`
Rules string `json:"rules"`
Start time.Time `json:"start"`
@@ -28,7 +28,7 @@ type SessionZQDS struct {
Challenges []*ChallengeZQDS `json:"challenges"`
}
-func GenZQDSSessionFile(s *settings.Settings) (*SessionZQDS, error) {
+func GenZQDSSessionFile(c *settings.ChallengeInfo, s *settings.Settings) (*SessionZQDS, error) {
themes, err := GetThemes()
if err != nil {
return nil, err
@@ -58,11 +58,10 @@ func GenZQDSSessionFile(s *settings.Settings) (*SessionZQDS, error) {
}
return &SessionZQDS{
- Name: "Challenge Forensic",
- Description: "",
- Scenario: "",
- YourMission: "",
- Rules: "",
+ Name: c.Title,
+ Description: c.Description,
+ Rules: c.Rules,
+ YourMission: c.YourMission,
Start: s.Start,
End: s.End,
Challenges: challenges,
diff --git a/settings/challenge.go b/settings/challenge.go
new file mode 100644
index 00000000..6c39b5ed
--- /dev/null
+++ b/settings/challenge.go
@@ -0,0 +1,59 @@
+package settings
+
+import (
+ "encoding/json"
+ "os"
+)
+
+// ChallengeFile is the expected name of the file containing the challenge infos.
+const ChallengeFile = "challenge.json"
+
+// ChallengeInfo stores common descriptions and informations about the challenge.
+type ChallengeInfo struct {
+ // Title is the displayed name of the challenge.
+ Title string `json:"title"`
+ // Authors is the group name of people making the challenge.
+ Authors string `json:"authors"`
+ // VideoLink is the link to explaination videos when the challenge is over.
+ VideosLink string `json:"videoslink"`
+
+ // Description gives an overview of the challenge.
+ Description string `json:"description"`
+ // Rules tell the player some help.
+ Rules string `json:"rules"`
+ // YourMission is a small introduction to understand the goals.
+ YourMission string `json:"your_mission"`
+}
+
+// ReadChallenge parses the file at the given location.
+func ReadChallengeInfo(path string) (*ChallengeInfo, error) {
+ var s ChallengeInfo
+ if fd, err := os.Open(path); err != nil {
+ return nil, err
+ } else {
+ defer fd.Close()
+ jdec := json.NewDecoder(fd)
+
+ if err := jdec.Decode(&s); err != nil {
+ return &s, err
+ }
+
+ return &s, nil
+ }
+}
+
+// SaveChallenge saves challenge at the given location.
+func SaveChallengeInfo(path string, s *ChallengeInfo) error {
+ if fd, err := os.Create(path); err != nil {
+ return err
+ } else {
+ defer fd.Close()
+ jenc := json.NewEncoder(fd)
+
+ if err := jenc.Encode(s); err != nil {
+ return err
+ }
+
+ return nil
+ }
+}
diff --git a/settings/settings.go b/settings/settings.go
index b2d74d24..a16f5207 100644
--- a/settings/settings.go
+++ b/settings/settings.go
@@ -22,12 +22,6 @@ var SettingsDir string = "./SETTINGS"
// Settings represents the settings panel.
type Settings struct {
- // Title is the displayed name of the challenge.
- Title string `json:"title"`
- // Authors is the group name of people making the challenge.
- Authors string `json:"authors"`
- // VideoLink is the link to explaination videos when the challenge is over.
- VideosLink string `json:"videoslink"`
// WorkInProgress indicates if the current challenge is under development or if it is in production.
WorkInProgress bool `json:"wip,omitempty"`