From b393602715774a5c7877f273646522407845208b Mon Sep 17 00:00:00 2001 From: d4rkr41n Date: Thu, 5 Dec 2019 15:24:27 -0600 Subject: [PATCH] Bug fixes, logic improvements --- README.md | 12 ++++++++++++ app.js | 2 +- config.json | 19 ++++++++++++++----- numFlagsGot.sh | 1 - 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 0f57601..4fe7f0e 100644 --- a/README.md +++ b/README.md @@ -1 +1,13 @@ # TinyCTF + +## How to use +Install dependancies, see below... +Add your teams and flags to the config.json file +Finally run app.js with node + +## Requirements +`npm install colors` +`npm install express` +`npm install path` +`npm install body-parser` +`npm install ejs` \ No newline at end of file diff --git a/app.js b/app.js index 4dfdbd4..806cec1 100644 --- a/app.js +++ b/app.js @@ -29,5 +29,5 @@ if(numActive != 1){ console.log(colors.yellow("[*] Loaded " + config.flags.length + " flags!")); // Mark Starting Time for Team -fs.appendFileSync('correctlog.txt', "(" + config.teamcfg.name + ")" + " Start (" + Date.now() + ')\n'); +fs.appendFileSync('correctlog.txt', "(" + config.teamcfg.teams[team].name + ")" + " Start (" + Date.now() + ')\n'); webserv.rundashserver(config.servercfg.dashboard.bindaddr, config.servercfg.dashboard.bindport,config.flags,config.teamcfg.teams[team].name); \ No newline at end of file diff --git a/config.json b/config.json index f90c240..f99dae8 100644 --- a/config.json +++ b/config.json @@ -22,14 +22,23 @@ "teamcfg" : { "teams" : [ {"name":"cyber1", "active":"1"}, - {"name":"cyber2", "active":"0"}, {"name":"cyber3", "active":"0"} ] }, "flags" : [ - {"flag":"cyber1", "value":"1"}, - {"flag":"cyber2", "value":"10"}, - {"flag":"cyber3", "value":"100"}, - {"flag":"cyber4", "value":"1000"} + {"flag":"ursneaky", "value":"1"}, + {"flag":"FISHAREHOT", "value":"1"}, + {"flag":"PlsNoHax", "value":"1"}, + {"flag":"iamroot1!", "value":"1"}, + {"flag":"ruaMAZEd?", "value":"1"}, + {"flag":"KALI", "value":"1"}, + {"flag":"redherring", "value":"1"}, + {"flag":"youcanpickyourlock", "value":"1"}, + {"flag":"youcanlockyourpick", "value":"1"}, + {"flag":"butyoucantpickyourfriendspick", "value":"1"}, + {"flag":"BombDefusalNovice", "value":"1"}, + {"flag":"ManyFailedAttempts", "value":"1"}, + {"flag":"Kaboom", "value":"1"}, + {"flag":"YouGotFar", "value":"1"} ] } diff --git a/numFlagsGot.sh b/numFlagsGot.sh index 4f058b6..b77d883 100755 --- a/numFlagsGot.sh +++ b/numFlagsGot.sh @@ -8,5 +8,4 @@ read -p "Pick a team: " tnum activeTeam="${MAPFILE[$tnum]}" -#activeTeam=$(cat config.json | grep \"name\" | grep \"active\"\:\"1\" | cut -d '"' -f 4 | awk '{print $1}' | sed "s/^/\(/" | sed "s/$/\)/") echo $(cat correctlog.txt | grep "$activeTeam" | grep -v "Start" | awk '{print $2$3$4}' | sort -u | wc -l) flags found \ No newline at end of file