Skip to content
This repository was archived by the owner on Mar 3, 2020. It is now read-only.

Added multiple choice feature and several minor scoring bug fixes. #549

Open
archang31 wants to merge 19 commits into
base: dev
Choose a base branch
from
Open

Added multiple choice feature and several minor scoring bug fixes. #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d87382e
Multiple Bugs fixed and Multiple choice feature added.
Aug 4, 2017
2571c80
Minor Changes
Aug 4, 2017
72e51e4
Merge branch 'dev' of https://github.com/facebook/fbctf into dev
Aug 4, 2017
3653593
Merge of upstream
Aug 4, 2017
a004212
Minor merge stray commands
Aug 4, 2017
ed94646
Merge remote-tracking branch 'upstream/dev' into dev
archang31 Aug 8, 2017
7ba47b9
Updated to fix issue with 'custom_text' from other committed code.
archang31 Aug 9, 2017
f335928
Multiple Bugs fixed and Multiple choice feature added.
Aug 4, 2017
f568f5e
Updated to fix issue with 'custom_text' from other committed code.
archang31 Aug 9, 2017
c2969ba
Merge branch 'dev' of github.com:ArchAng31/fbctf into dev
archang31 Aug 9, 2017
1d0026c
Added Multiple Choice Feature
Jul 24, 2017
2cc956f
Fixed liveimport and scripts to handle new function parameters.
archang31 Aug 24, 2017
650e7a1
Added Multiple Choice Feature
archang31 Sep 3, 2017
f41bf83
Fixed liveimport and scripts to handle new function parameters.
archang31 Sep 3, 2017
5bff5bc
Added in missing function
archang31 Sep 3, 2017
c31c593
Merge branch 'add_multiple_choice' of github.com:ArchAng31/fbctf into…
archang31 Sep 3, 2017
7c96f55
Updated test cases and schema to reflect new features.
archang31 Sep 6, 2017
8a64f20
Updated admin.js and fb-ctf.js to eliminate grunt js warnings. Some c…
archang31 Sep 9, 2017
af51d66
Updated package.json as well
archang31 Sep 9, 2017
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
6 changes: 6 additions & 0 deletions database/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ CREATE TABLE `levels` (
`flag` text NOT NULL,
`hint` text NOT NULL,
`penalty` int(11) NOT NULL,
`wrong_answer_penalty` int(11) NOT NULL DEFAULT 0,
`is_short_answer` tinyint(1) NOT NULL DEFAULT 1,
`answer_choice_1` text DEFAULT NULL,
`answer_choice_2` text DEFAULT NULL,
`answer_choice_3` text DEFAULT NULL,
`answer_choice_4` text DEFAULT NULL,
`created_ts` timestamp NOT NULL DEFAULT 0,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
Expand Down
6 changes: 6 additions & 0 deletions database/test_schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ CREATE TABLE `levels` (
`flag` text NOT NULL,
`hint` text NOT NULL,
`penalty` int(11) NOT NULL,
`wrong_answer_penalty` int(11) NOT NULL DEFAULT 0,
`is_short_answer` tinyint(1) NOT NULL DEFAULT 1,
`answer_choice_1` text DEFAULT NULL,
`answer_choice_2` text DEFAULT NULL,
`answer_choice_3` text DEFAULT NULL,
`answer_choice_4` text DEFAULT NULL,
`created_ts` timestamp NOT NULL DEFAULT 0,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
Expand Down
25 changes: 18 additions & 7 deletions extra/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ function ok_log() {
function dl() {
local __url=$1
local __dest=$2
sudo curl --retry 5 --retry-delay 15 -sSL "$__url" -o "$__dest"
}

if [ -n "$(which wget)" ]; then
sudo wget -q "$__url" -O "$__dest"
else
sudo curl -s "$__url" -o "$__dest"
fi
function dl_pipe() {
local __url=$1
curl --retry 5 --retry-delay 15 -sSL "$__url"
}

function package_repo_update() {
Expand All @@ -53,7 +53,7 @@ function package() {

function install_unison() {
cd /
curl -sL https://www.archlinux.org/packages/extra/x86_64/unison/download/ | sudo tar Jx
dl_pipe "https://www.archlinux.org/packages/extra/x86_64/unison/download/" | sudo tar Jx
}

function repo_osquery() {
Expand Down Expand Up @@ -280,12 +280,23 @@ function install_composer() {
local __path=$1

cd $__path
curl -sS https://getcomposer.org/installer | php
dl_pipe "https://getcomposer.org/installer" | php
hhvm composer.phar install
sudo mv composer.phar /usr/bin
sudo chmod +x /usr/bin/composer.phar
}

function install_nodejs() {
log "Removing node.js legacy version"
sudo DEBIAN_FRONTEND=noninteractive apt-get remove --purge nodejs -y

log "Downloading and setting node.js version 6.x repo information"
dl_pipe "https://deb.nodesource.com/setup_6.x" | sudo -E bash -

log "Installing node.js"
package nodejs
}

function import_empty_db() {
local __u="ctf"
local __p="ctf"
Expand Down
6 changes: 1 addition & 5 deletions extra/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ package_repo_update

package git
package curl
package wget
package rsync

# Check for available memory, should be over 1GB
Expand Down Expand Up @@ -307,11 +306,8 @@ fi
fi

package ca-certificates
package npm
log "Updating npm"
sudo npm install -g npm@lts

package nodejs-legacy
install_nodejs

log "Installing all required npm node_modules"
sudo npm install --prefix "$CTF_PATH"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"dependencies": {
"d3": "^3.5.16",
"dropkickjs": "^2.1.10",
"dropkickjs": "2.1.10",
"hoverintent-jqplugin": "^0.2.1",
"jquery": "^2.2.3",
"keycode": "^2.1.1",
Expand Down
Loading