Fix rendering of multiple difficulty modes in init template

Signed-off-by: Robert Detjens <[email protected]>

Author: detjensrobert

src/asset_files/rcds.yaml.j2

@@ -32,49 +32,51 @@ defaults:
 # challenges use dynamic scoring; for static points set both min and max to the
 # same value.
 points:
-  {% for pts in points -%}
+  {%- for pts in points %}
   - difficulty: "{{ pts.difficulty }}"
     min: {{ pts.min }}
     max: {{ pts.max }}
-  {%- else -%}
+  {%- else %}
   []
-  {% endfor %}
+  {%- endfor %}
 
 # Control what challenges are deployed in each environment profile.
 deploy:
-  {% for name, _conf in profiles | items -%}
+  {%- for name, _conf in profiles | items %}
   {{ name }}: {}
-  {%- else -%}
+  {%- else %}
   {}
-  {% endfor %}
+  {%- endfor %}
 
 # Separate environment profiles to allow for multiple independent deployments
 # of challenges, e.g. staging and production to test challenges internally
 # before going live for all users.
 profiles:
-  {% for name, p in profiles | items -%}
+  {%- for name, p in profiles | items %}
   {{ name }}:
     # Used to push challenge information into the frontend/scoreboard.
-    frontend_url: {{ p.frontend_url }}
-    frontend_token: {{ p.frontend_token }}
+    frontend_url: "{{ p.frontend_url }}"
+    frontend_token: "{{ p.frontend_token }}"
     # Root domain to expose all challenges under.
-    challenges_domain: {{ p.challenges_domain }}
-    # TODO: kubeconfig
-    kubecontext: {{ p.kubecontext }}
+    challenges_domain: "{{ p.challenges_domain }}"
+    # Kubernetes kubeconfig and context name of cluster for this profile.
+    {% if p.kubeconfig -%}
+    kubeconfig: "{{ p.kubeconfig }}"
+    {%- endif -%}
+    kubecontext: "{{ p.kubecontext }}"
     # Credentials for the public challenge file asset bucket.
     s3:
-      bucket_name: {{ p.s3.bucket_name }}
-      endpoint: {{ p.s3.endpoint }}
-      region: {{ p.s3.region }}
-      access_key: {{ p.s3.access_key }}
-      secret_key: {{ p.s3.secret_key }}
+      bucket_name: "{{ p.s3.bucket_name }}"
+      endpoint: "{{ p.s3.endpoint }}"
+      region: "{{ p.s3.region }}"
+      access_key: "{{ p.s3.access_key }}"
+      secret_key: "{{ p.s3.secret_key }}"
     # Config for the environment's external-dns deployment.
     dns:
       # Place external-dns configuration options here;
       # this yaml will be passed directly to external-dns without modification
       # Reference: https://github.com/bitnami/charts/tree/main/bitnami/external-dns
-  {%- else -%}
+  {%- else %}
   {}
-  {% endfor %}
-
+  {%- endfor %}
 {# comment to preserve trailing newline -#}

src/init/example_values.rs

@@ -3,7 +3,7 @@
 pub static FLAG_REGEX: &str = "ctf{.*}";
 
 pub static REGISTRY_DOMAIN: &str = "ghcr.io/youraccount";
-pub static REGISTRY_BUILD_USER: &str = "admin";
+pub static REGISTRY_BUILD_USER: &str = "build_user";
 pub static REGISTRY_BUILD_PASS: &str = "notrealcreds";
 pub static REGISTRY_CLUSTER_USER: &str = "cluster_user";
 pub static REGISTRY_CLUSTER_PASS: &str = "alsofake";
@@ -12,9 +12,12 @@ pub static DEFAULTS_DIFFICULTY: &str = "easy";
 pub static DEFAULTS_RESOURCES_CPU: i64 = 1;
 pub static DEFAULTS_RESOURCES_MEMORY: &str = "500M";
 
-pub static POINTS_DIFFICULTY: &str = "easy";
-pub static POINTS_MIN: i64 = 200;
-pub static POINTS_MAX: i64 = 500;
+pub static POINTS_EASY_DIFFICULTY: &str = "easy";
+pub static POINTS_EASY_MIN: i64 = 200;
+pub static POINTS_EASY_MAX: i64 = 500;
+pub static POINTS_HARD_DIFFICULTY: &str = "hard";
+pub static POINTS_HARD_MIN: i64 = 300;
+pub static POINTS_HARD_MAX: i64 = 600;
 
 pub static PROFILES_PROFILE_NAME: &str = "default";
 pub static PROFILES_FRONTEND_URL: &str = "https://ctf.coolguy.invalid";

src/init/mod.rs

@@ -4,11 +4,12 @@ use itertools::Itertools;
 use minijinja;
 use regex::Regex;
 use serde;
+use serde_yaml_ng::Value;
 use std::collections::HashMap;
 use std::fmt;
 use tracing::{debug, error, info, trace, warn};
 
-use crate::configparser::config;
+use crate::configparser::config::{self, ProfileConfig, S3Config};
 use crate::utils::render_strict;
 
 pub mod example_values;
@@ -85,17 +86,17 @@ pub fn interactive_init() -> inquire::error::InquireResult<config::RcdsConfig> {
                     difficulty: inquire::Text::new("Difficulty class:")
                         .with_validator(inquire::required!("Please provide a name."))
                         .with_help_message("The name of the difficulty class.")
-                        .with_placeholder(example_values::POINTS_DIFFICULTY)
+                        .with_placeholder(example_values::POINTS_EASY_DIFFICULTY)
                         .prompt()?,
                     min: inquire::CustomType::<i64>::new("Minimum points:")
                         .with_error_message("Please type a valid number.") // default parser calls std::u64::from_str
                         .with_help_message("The minimum number of points that challenges within this difficulty class are worth.") // too long to format
-                        .with_default(example_values::POINTS_MIN)
+                        .with_default(example_values::POINTS_EASY_MIN)
                         .prompt()?,
                     max: inquire::CustomType::<i64>::new("Maximum points:")
                         .with_error_message("Please type a valid number.") // default parser calls std::u64::from_str
                         .with_help_message("The maximum number of points that challenges within this difficulty class are worth.") // too long to format
-                        .with_default(example_values::POINTS_MAX)
+                        .with_default(example_values::POINTS_EASY_MAX)
                         .prompt()?,
                 };
                 points.push(points_obj);
@@ -265,19 +266,44 @@ pub fn example_init() -> config::RcdsConfig {
                 memory: example_values::DEFAULTS_RESOURCES_MEMORY.to_string(),
             },
         },
-        points: vec![config::ChallengePoints {
-            difficulty: example_values::POINTS_DIFFICULTY.to_string(),
-            min: example_values::POINTS_MIN,
-            max: example_values::POINTS_MAX,
-        }],
+        points: vec![
+            config::ChallengePoints {
+                difficulty: example_values::POINTS_EASY_DIFFICULTY.to_string(),
+                min: example_values::POINTS_EASY_MIN,
+                max: example_values::POINTS_EASY_MAX,
+            },
+            config::ChallengePoints {
+                difficulty: example_values::POINTS_HARD_DIFFICULTY.to_string(),
+                min: example_values::POINTS_HARD_MIN,
+                max: example_values::POINTS_HARD_MAX,
+            },
+        ],
 
         deploy: HashMap::from([(
             example_values::PROFILES_PROFILE_NAME.to_string(),
             config::ProfileDeploy {
                 challenges: HashMap::new(),
             },
         )]),
-        profiles: HashMap::from([]),
+
+        profiles: HashMap::from([(
+            example_values::PROFILES_PROFILE_NAME.to_string(),
+            ProfileConfig {
+                frontend_url: example_values::PROFILES_FRONTEND_URL.to_string(),
+                frontend_token: example_values::PROFILES_FRONTEND_TOKEN.to_string(),
+                challenges_domain: example_values::PROFILES_CHALLENGES_DOMAIN.to_string(),
+                kubeconfig: None,
+                kubecontext: example_values::PROFILES_KUBECONTEXT.to_string(),
+                s3: S3Config {
+                    bucket_name: example_values::PROFILES_S3_BUCKET_NAME.to_string(),
+                    endpoint: example_values::PROFILES_S3_ENDPOINT.to_string(),
+                    region: example_values::PROFILES_S3_REGION.to_string(),
+                    access_key: example_values::PROFILES_S3_ACCESSKEY.to_string(),
+                    secret_key: example_values::PROFILES_S3_SECRETACCESSKEY.to_string(),
+                },
+                dns: Value::Null,
+            },
+        )]),
     }
 }