changes [deploy]

rhombusgg · Sep 26, 2024 · ea4450a · ea4450a
1 parent 0d0d571
commit ea4450a
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 88 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rhombus/Cargo.toml b/rhombus/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rhombus"
-version = "0.2.6"
+version = "0.2.7"
 edition = "2021"
 description = "Next generation extendable CTF framework with batteries included"
 authors = ["Mark Bundschuh <[email protected]>"]

diff --git a/rhombus/frontend/app.tsx b/rhombus/frontend/app.tsx
@@ -631,38 +631,49 @@ const ChallengesComponent = ({
                                 stroke-width="2"
                                 stroke-linecap="round"
                                 stroke-linejoin="round"
-                                class="lucide lucide-layout-grid"
+                                class="lucide lucide-expand"
                               >
-                                <rect width="7" height="7" x="3" y="3" rx="1" />
-                                <rect
-                                  width="7"
-                                  height="7"
-                                  x="14"
-                                  y="3"
-                                  rx="1"
-                                />
-                                <rect
-                                  width="7"
-                                  height="7"
-                                  x="14"
-                                  y="14"
-                                  rx="1"
-                                />
-                                <rect
-                                  width="7"
-                                  height="7"
-                                  x="3"
-                                  y="14"
-                                  rx="1"
-                                />
+                                <path d="m21 21-6-6m6 6v-4.8m0 4.8h-4.8" />
+                                <path d="M3 16.2V21m0 0h4.8M3 21l6-6" />
+                                <path d="M21 7.8V3m0 0h-4.8M21 3l-6 6" />
+                                <path d="M3 7.8V3m0 0h4.8M3 3l6 6" />
                               </svg>
                             </button>
                           </div>
                         </div>
-                        <SolidMarkdown
+                        <div
                           class="prose dark:prose-invert"
-                          children={challenge.description}
-                        />
+                          innerHTML={challenge.description}
+                        ></div>
+                        <div class="flex gap-2 mt-4">
+                          <For each={challenge.attachments}>
+                            {(attachment) => (
+                              <a
+                                class="pr-2 py-1 pl-1 max-w-fit rounded-lg flex"
+                                style={`background-color: ${category.color}77`}
+                                href={attachment.url}
+                              >
+                                <div class="scale-75">
+                                  <svg
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    width="24"
+                                    height="24"
+                                    viewBox="0 0 24 24"
+                                    fill="none"
+                                    stroke="currentColor"
+                                    stroke-width="2"
+                                    stroke-linecap="round"
+                                    stroke-linejoin="round"
+                                    class="lucide lucide-paperclip"
+                                  >
+                                    <path d="m21.44 11.05-9.19 9.19a6 6 0 0 1-8.49-8.49l8.57-8.57A4 4 0 1 1 18 8.84l-8.59 8.57a2 2 0 0 1-2.83-2.83l8.49-8.48" />
+                                  </svg>
+                                </div>
+                                {attachment.name}
+                              </a>
+                            )}
+                          </For>
+                        </div>
                       </li>
                     );
                   }}
@@ -698,6 +709,10 @@ type ChallengesData = {
       points: number;
       solves: number;
     }[];
+    attachments: {
+      name: string;
+      url: string;
+    }[];
   }[];
   categories: {
     id: number;

diff --git a/rhombus/src/challenge_loader_plugin.rs b/rhombus/src/challenge_loader_plugin.rs
@@ -237,6 +237,19 @@ impl Plugin for ChallengeLoaderPlugin {
 
                     tracing::info!(name = challenge.name);
 
+                    let description = markdown::to_html_with_options(
+                        &challenge.description,
+                        &markdown::Options {
+                            compile: markdown::CompileOptions {
+                                allow_dangerous_html: true,
+                                allow_dangerous_protocol: true,
+                                ..markdown::CompileOptions::default()
+                            },
+                            ..markdown::Options::default()
+                        },
+                    )
+                    .unwrap();
+
                     _ = tx
                         .execute(
                             "
@@ -246,7 +259,7 @@ impl Plugin for ChallengeLoaderPlugin {
                             params!(
                                 id,
                                 challenge.name.as_str(),
-                                challenge.description.as_str(),
+                                description.as_str(),
                                 challenge.flag.as_str(),
                                 category_id,
                                 author_id,
@@ -314,7 +327,7 @@ impl Plugin for ChallengeLoaderPlugin {
 
                             let url = context
                                 .upload_provider
-                                .upload(src.file_name().unwrap().to_str().unwrap(), stream)
+                                .upload(&file.dst, stream)
                                 .await
                                 .unwrap();
 

diff --git a/rhombus/src/internal/routes/challenges.rs b/rhombus/src/internal/routes/challenges.rs
@@ -78,6 +78,10 @@ pub async fn route_challenges(
                 "points": division_points.points,
                 "solves": division_points.solves,
             })).collect::<serde_json::Value>(),
+            "attachments": challenge.attachments.iter().map(|attachment| json!({
+                "name": attachment.name,
+                "url": attachment.url,
+            })).collect::<serde_json::Value>(),
         })).collect::<serde_json::Value>(),
         "categories": challenge_data.categories.iter().map(|category| json!({
             "id": category.id,
@@ -167,19 +171,6 @@ pub async fn route_challenge_view(
         .find(|c| challenge.category_id.eq(&c.id))
         .unwrap();
 
-    let description = markdown::to_html_with_options(
-        &challenge.description,
-        &markdown::Options {
-            compile: markdown::CompileOptions {
-                allow_dangerous_html: true,
-                allow_dangerous_protocol: true,
-                ..markdown::CompileOptions::default()
-            },
-            ..markdown::Options::default()
-        },
-    )
-    .unwrap();
-
     Html(
         state
             .jinja
@@ -190,7 +181,6 @@ pub async fn route_challenge_view(
                 page,
                 user,
                 challenge,
-                description,
                 category,
                 team,
                 divisions => challenge_data.divisions,
@@ -260,19 +250,6 @@ pub async fn route_ticket_view(
         state.settings.read().await.default_ticket_template.clone()
     };
 
-    let description = markdown::to_html_with_options(
-        &challenge.description,
-        &markdown::Options {
-            compile: markdown::CompileOptions {
-                allow_dangerous_html: true,
-                allow_dangerous_protocol: true,
-                ..markdown::CompileOptions::default()
-            },
-            ..markdown::Options::default()
-        },
-    )
-    .unwrap();
-
     Html(
         state
             .jinja
@@ -283,7 +260,6 @@ pub async fn route_ticket_view(
                 page,
                 user,
                 challenge,
-                description,
                 category,
                 team,
                 ticket_template,

diff --git a/rhombus/static/app.js b/rhombus/static/app.js
diff --git a/rhombus/static/tailwind.css b/rhombus/static/tailwind.css
@@ -1466,10 +1466,6 @@ body {
   height: 100%;
 }
 
-.h-1 {
-  height: 0.25rem;
-}
-
 .h-10 {
   height: 2.5rem;
 }

diff --git a/rhombus/templates/challenge.html b/rhombus/templates/challenge.html
@@ -34,7 +34,9 @@
       </rhombus-tooltip>
     </div>
   </div>
-  <div class="mb-4 prose dark:prose-invert">{{ description | safe }}</div>
+  <div class="mb-4 prose dark:prose-invert">
+    {{ challenge.description | safe }}
+  </div>
   {% with solve=team.solves[challenge.id] %}
     {% if not solve %}
       <form

diff --git a/rhombus/templates/ticket.html b/rhombus/templates/ticket.html
@@ -11,7 +11,9 @@
       <span>{{ challenge.name }}</span>
     </div>
   </div>
-  <div class="mb-4 prose dark:prose-invert">{{ description | safe }}</div>
+  <div class="mb-4 prose dark:prose-invert">
+    {{ challenge.description | safe }}
+  </div>
   <div class="h-60 mb-2" id="editor"></div>
   <button
     class="p-2 rounded-lg"
-Original file line number
+Diff line change
@@ Expand Up / @@ -1466,10 +1466,6 @@ body { @@
       height: 100%;
     }
-    .h-1 {
-      height: 0.25rem;
-    }
     .h-10 {
       height: 2.5rem;
     }
@@ Expand Down @@