Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FEATURE: Defining multiple flags in challenge for CTFd #137

Merged
merged 4 commits into from
Mar 18, 2024
Merged

FEATURE: Defining multiple flags in challenge for CTFd #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f2ab94
FEATURE: Defining multiple flags in challenge for CTFd
meelunae Mar 15, 2024
69098fc
Changed way single flag is handled
meelunae Mar 15, 2024
1acf25f
Linting changes
meelunae Mar 15, 2024
6c43731
Rephrase and extend documentation
bkimminich Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ desired configuration in a file with the following format:
```yaml
ctfFramework: CTFd | FBCTF | RootTheBox
juiceShopUrl: https://juice-shop.herokuapp.com
ctfKey: https://raw.githubusercontent.com/bkimminich/juice-shop/master/ctf.key # can also be actual key instead URL
ctfKey: https://raw.githubusercontent.com/bkimminich/juice-shop/master/ctf.key # can also be actual key or comma-separated list of keys (CTFd only) instead of URL
countryMapping: https://raw.githubusercontent.com/bkimminich/juice-shop/master/config/fbctf.yml # ignored for CTFd and RootTheBox
insertHints: none | free | paid
insertHintUrls: none | free | paid # optional for FBCTF; "paid" handled as "free" for CTFd
Expand Down
2 changes: 1 addition & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const questions = [
{
type: 'input',
name: 'ctfKey',
message: 'Secret key <or> URL to ctf.key file?',
message: 'URL to ctf.key file <or> secret key <or> (CTFd only) comma-separated list of secret keys?',
default: 'https://raw.githubusercontent.com/bkimminich/juice-shop/master/ctf.key'
},
{
Expand Down
5 changes: 4 additions & 1 deletion lib/generators/ctfd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ function createCtfdExport (challenges, { insertHints, insertHintUrls, insertHint
}
*/

// In the flags section of the returned data we iterate through the result of string splitting by comma, and compute the hash of the single flag key + challenge name.
// Format expected is: challenge3,challenge description,category3,100,dynamic,visible,0,"flag1,flag2,flag3","tag1,tag2,tag3","hint1,hint2,hint3","{""initial"":100, ""minimum"":10, ""decay"":10}"
// If we provide a single key with no commas, we do not incapsulate the output in a "" pair.
return new Promise((resolve, reject) => {
try {
const data = []
Expand All @@ -55,7 +58,7 @@ function createCtfdExport (challenges, { insertHints, insertHintUrls, insertHint
type: 'standard',
state: 'visible',
max_attempts: 0,
flags: hmacSha1(ctfKey, challenge.name),
flags: ctfKey.split(',').length === 1 ? hmacSha1(ctfKey, challenge.name) : `"${ctfKey.split(',').map(key => `${hmacSha1(key, challenge.name)}`).join(',')}"`,
tags: challenge.tags ? `"${challenge.tags}"` : '',
hints: insertChallengeHints(challenge),
// hint_cost: insertChallengeHintCosts(challenge),
Expand Down
Loading