Commit Graph

242 Commits

Author SHA1 Message Date
ts
052d321d96 check for debian_server 2018-10-08 20:04:26 +01:00
ts
51652df863 check for debian_server 2018-10-08 19:47:32 +01:00
ts
cfd20339c6 Added privilege == various for wordpress meta-modules 2018-10-08 15:04:55 +01:00
ts
7bbeb8a2fa ovirt authz now passed as a parameter, added to example.conf 2018-10-05 17:27:12 +01:00
ts
ff75b56c6b Testing script, stretch fixes + code review 2018-10-05 17:27:12 +01:00
ts
d33ed14ba5 Strip trailing spaces from GemExe.exe args 2018-10-05 17:27:11 +01:00
ts
8407c30e49 Fix for duplicate received_inputs from module outputs on conflict resolution (2/2) 2018-10-05 17:27:05 +01:00
Z. Cliffe Schreuders
ac1936cbee updates to metadata 2018-10-05 17:27:05 +01:00
ts
5ab97f59cc Fix for duplicate received_inputs from module outputs on conflict resolution 2018-10-05 17:27:05 +01:00
ts
a7a8043fd3 revert: change from wns branch... 2018-10-05 17:27:05 +01:00
thomashaw
0a385a8183 Vagrantfile update, no longer appending to /etc/network/interfaces for stretch kde + server as we've got 1 nic not 2. 2018-10-05 17:27:05 +01:00
ts
9d66ea9215 Squashed WNS + IRI DL work 2018-10-05 17:27:05 +01:00
Z. Cliffe Schreuders
6e8d3262d4 Merge branch 'master' of https://github.com/cliffe/SecGen 2018-08-20 23:41:45 +01:00
Z. Cliffe Schreuders
1a90f1c67f update status when batch fails to create the project 2018-08-20 23:41:14 +01:00
Z. Cliffe Schreuders
f0bf31ff28 WiP 2018-08-19 23:54:30 +01:00
Z. Cliffe Schreuders
b6d9ed28dd print batch job list in json format 2018-08-01 15:15:26 +01:00
Z. Cliffe Schreuders
0a0d050020 Print id when adding batch job 2018-07-30 17:07:20 +01:00
Z. Cliffe Schreuders
b53408bce8 additional metadata for scenarios 2018-07-10 23:39:57 +01:00
Z. Cliffe Schreuders
6ee6cc26c4 README updates and spiltting into separate files 2018-07-05 12:01:51 +01:00
Z. Cliffe Schreuders
e7e0d288bc Merge branch 'ctfd_output' 2018-06-22 17:02:36 +01:00
Z. Cliffe Schreuders
93fd85a155 export to CTFd scoreboard (adapted to suit SecGen VM based challenges) 2018-06-22 17:01:16 +01:00
thomashaw
84065c2c75 added ovirt_template attribute to base type in scenario schema 2018-06-20 17:44:22 +01:00
Z. Cliffe Schreuders
a49793a4cb merge dvwa into master 2018-02-19 23:48:22 +00:00
Z. Cliffe Schreuders
4219937aa3 improved error handling and cleanup 2018-02-19 23:39:23 +00:00
ts
38797f18b6 Merge fixes 2018-02-15 11:44:30 +00:00
secgen server
e4114364f2 comment 2018-02-09 15:37:26 +00:00
secgen server
c7201f63cf timeout changes 2018-02-09 15:34:01 +00:00
thomashaw
6045c1f187 hackerbot merge - includes lots of other changes 2018-02-08 13:14:22 +00:00
ts
a003b81f69 wip changes 2018-02-07 17:59:24 +00:00
ts
5eda7c5d34 Merge branch 'team_project' into team_project_merge
# Conflicts:
#	.gitignore
#	modules/services/unix/http/parameterised_website/secgen_metadata.xml
2018-02-07 15:47:48 +00:00
ts
5cebfb4a7e WiP: nicer themes, changed leeds beckett businesses to look better 2018-02-07 14:49:48 +00:00
thomashaw
30193eb7c4 wip 2018-02-06 23:37:54 +00:00
thomashaw
7ea8c67925 website improvements wip 2018-02-06 21:35:13 +00:00
ts
db3a469731 pizza.json 2018-02-06 17:01:45 +00:00
ts
41a4cffd1e prepared business json files 2018-02-06 16:49:48 +00:00
ts
22bab8d8bf Clean organisation.json 2018-02-06 14:12:44 +00:00
thomashaw
2391bab6d3 WiP 2018-02-05 17:24:56 +00:00
thomashaw
23af572707 random line selector and example organisations 2018-02-05 15:18:38 +00:00
Cliffe
c17a26406b Physical access in schema 2018-01-25 15:30:28 +00:00
Z. Cliffe Schreuders
b921a4dff9 always exclude previously selected IP address ranges 2018-01-04 12:47:59 +00:00
Z. Cliffe Schreuders
7f9ca77ef3 ovirt libs edit 2018-01-03 11:34:14 +00:00
Z. Cliffe Schreuders
58ad4bd3af save outputs from SecGen even when SecGen fails to complete 2018-01-03 11:30:09 +00:00
Z. Cliffe Schreuders
220c1f2ec1 lab update 2017-12-08 15:50:20 +00:00
Z. Cliffe Schreuders
9eebd1fd1e lab update 2017-12-08 14:11:55 +00:00
Z. Cliffe Schreuders
2930d85917 lab update 2017-12-06 23:54:04 +00:00
thomashaw
d4c170508b OVirtFunctions::get_ovirt_connection(): fixed 2017-11-11 16:33:50 +00:00
thomashaw
86ec04fc3d Merge remote-tracking branch 'upstream/ids_rules_lab' into week_6_merge_branch 2017-11-10 10:57:24 +00:00
Z. Cliffe Schreuders
34be6e051f lab update 2017-11-09 10:06:02 +00:00
thomashaw
667bf8c5aa batch: cleanup 2017-11-06 13:20:06 +00:00
thomashaw
0111750afe batch: reordered for consistency 2017-11-06 13:19:06 +00:00