252 Commits

Author	SHA1	Message	Date
Z. Cliffe Schreuders	e779347aa1	affinity groups	2018-10-25 21:42:26 +01:00
Z. Cliffe Schreuders	d5e317bc02	affinity groups	2018-10-25 20:50:57 +01:00
Z. Cliffe Schreuders	ccd1de8280	affinity groups	2018-10-25 16:24:47 +01:00
Z. Cliffe Schreuders	667939ca17	limit scope of working directory change	2018-10-24 20:55:15 +01:00
ts	4cdd0ba3ec	Reverted networking to use manual static instead of vagrant ovirt4 plugin	2018-10-24 17:43:30 +01:00
Z. Cliffe Schreuders	0ec53b2cc5	networking	2018-10-24 00:51:51 +01:00
Z. Cliffe Schreuders	b564ffd9a4	networking	2018-10-23 16:18:28 +01:00
Z. Cliffe Schreuders	382b6ed03e	networking	2018-10-23 14:31:18 +01:00
ts	03cf17ed8c	Template updates	2018-10-23 11:09:29 +01:00
ts	26a0b6dffc	snoop changes	2018-10-19 16:13:09 +01:00
ts	81440f7b4c	Remove snort conflict + ignore errors + don't delete after failure + stdlib in secgen	2018-10-19 13:46:50 +01:00
ts	fdeb28e246	Stretch update merge: mysql & php for stretch, module conflicts and general cleanup	2018-10-19 13:46:50 +01:00
ts	9761cecdc8	ovirt authz now passed as a parameter, added to example.conf	2018-10-19 13:46:49 +01:00
ts	f0bb2a26e1	Testing script, stretch fixes + code review	2018-10-19 13:46:49 +01:00
Z. Cliffe Schreuders	465876094c	verbose librarian output	2018-10-18 12:46:40 +01:00
ts	c4f2d54bcc	Strip trailing spaces from GemExe.exe args	2018-09-28 08:41:18 +01:00
ts	927e878c4a	Fix for duplicate received_inputs from module outputs on conflict resolution (2/2)	2018-09-26 15:43:32 +01:00
Z. Cliffe Schreuders	2dc5c6d743	updates to metadata	2018-09-26 14:41:19 +01:00
ts	e7adc14b02	Fix for duplicate received_inputs from module outputs on conflict resolution	2018-09-26 12:35:27 +01:00
ts	20c95167e8	revert: change from wns branch...	2018-09-26 09:32:48 +01:00
thomashaw	009974793c	Vagrantfile update, no longer appending to /etc/network/interfaces for stretch kde + server as we've got 1 nic not 2.	2018-09-24 18:30:01 +01:00
ts	5208ae5cc7	Squashed WNS + IRI DL work	2018-09-21 12:34:26 +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