Merge pull request #279 from aau-network-security/enable-description-#264

Enable description #264

Author: mrtrkmn

store/exercise.go

@@ -164,6 +164,8 @@ type FlagConfig struct {
 	EnvVar string `yaml:"env"`
 	Static string `yaml:"static"`
 	Points uint   `yaml:"points"`
+	Description string `yaml:"description"`
+	Category string `yaml:"category"`
 }
 
 func (fc FlagConfig) Validate() error {

svcs/ctfd/ctfd.go

@@ -262,7 +262,7 @@ func (ctf *ctfd) configureInstance() error {
 	for id, flag := range ctf.conf.Flags {
 		value := ctf.flagPool.AddFlag(flag, id+1)
 
-		if err := ctf.createFlag(flag.Name, value, flag.Points); err != nil {
+		if err := ctf.createFlag(flag.Name,value,flag.Description,flag.Category,flag.Points); err != nil {
 			return err
 		}
 
@@ -329,7 +329,7 @@ func (nc *nonceClient) getNonce(path string) (string, error) {
 	return string(matches[0][1]), nil
 }
 
-func (ctf *ctfd) createFlag(name, flag string, points uint) error {
+func (ctf *ctfd) createFlag(name,flagValue,description,category string,points uint) error {
 	endpoint := ctf.nc.baseUrl() + "/admin/chal/new"
 
 	nonce, err := ctf.nc.getNonce(endpoint)
@@ -342,11 +342,11 @@ func (ctf *ctfd) createFlag(name, flag string, points uint) error {
 	values := map[string]string{
 		"name":         name,
 		"value":        fmt.Sprintf("%d", points),
-		"key":          flag,
+		"key":          flagValue,
 		"nonce":        nonce,
 		"key_type[0]":  "static",
-		"category":     "",
-		"description":  "",
+		"category":     category,
+		"description":  description,
 		"max_attempts": "",
 		"chaltype":     "standard",
 	}