731 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	3435c4a256	Bugfix: proftpd.erb template referred to local variable $secgen_parameters instead of @secgen_parameters (declared and parsed in configure.pp file)	2018-06-22 12:37:48 +01:00
thomashaw	aafaa3d648	fixed puppet resource naming conflict	2018-06-20 19:14:46 +01:00
thomashaw	84065c2c75	added ovirt_template attribute to base type in scenario schema	2018-06-20 17:44:22 +01:00
thomashaw	4f0484f463	Fixed issue where .tr! call on string encoder args containing strings of integers , e.g. "123".tr!(...) returns nil.	2018-06-20 17:39:13 +01:00
ts	4a1e065724	Updated README.md to include vagrant-ovirt4 dependencies	2018-04-20 10:56:43 +01:00
thomashaw	9b4dd9cc2b	post-merge bugfix	2018-03-20 13:50:24 +00: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
Z. Cliffe Schreuders	25d19b983f	dvwa module	2018-02-19 23:36:17 +00:00
ts	512d6ee03d	Merge fix - updating apache scenario references and requires to .*apache	2018-02-15 12:23:53 +00:00
ts	7c125425d2	Merge fix	2018-02-15 12:19:40 +00:00
ts	56f543ade1	removed test_scenario.xml	2018-02-15 12:11:11 +00:00
ts	38797f18b6	Merge fixes	2018-02-15 11:44:30 +00:00
ts	2f501bb964	parameterised_website conflicts with itself	2018-02-15 11:25:02 +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	282c68d207	vm and scenario name change	2018-02-07 18:34:45 +00:00
ts	01eb9c8941	vm name change	2018-02-07 18:33:16 +00:00
ts	1dce75be57	wip changes to tmp_team_project	2018-02-07 18:07:50 +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	df2636a9f3	minor ui changes	2018-02-07 15:43:58 +00:00
ts	eb1c678149	minor ui changes	2018-02-07 15:39:08 +00:00
ts	c09c4c3a92	Changing layout for contacts + adding tmp_team_project_scenario.xml with single nic	2018-02-07 15:21:35 +00:00
ts	5cebfb4a7e	WiP: nicer themes, changed leeds beckett businesses to look better	2018-02-07 14:49:48 +00:00
ts	6d0f7097dd	WiP: Random themes	2018-02-07 14:25:14 +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	948a494f32	website: wip	2018-02-06 11:09:55 +00:00
thomashaw	2391bab6d3	WiP	2018-02-05 17:24:56 +00:00
thomashaw	3434518086	selector	2018-02-05 16:04:24 +00:00
thomashaw	95bcdfe865	organisations: added intro_paragraph parameter	2018-02-05 15:19:15 +00:00
thomashaw	23af572707	random line selector and example organisations	2018-02-05 15:18:38 +00:00
thomashaw	89263d28a7	Merge branch 'upstream/master'	2018-02-05 12:59:05 +00:00
Cliffe	c17a26406b	Physical access in schema	2018-01-25 15:30:28 +00:00
Cliffe	553ac3ac8c	Rename VM	2018-01-25 15:24:15 +00:00
Cliffe	a0325f6c3d	Desktop root requires "physical" access (not shell)	2018-01-25 15:21:51 +00:00
Cliffe	60767030b9	Date bump	2018-01-23 19:09:59 +00:00
thomashaw	5ddc9b541f	tomcat server	2018-01-11 18:52:06 +00:00
Z. Cliffe Schreuders	52a1bb2620	lab update	2018-01-04 13:58:24 +00:00
Z. Cliffe Schreuders	b921a4dff9	always exclude previously selected IP address ranges	2018-01-04 12:47:59 +00:00
Z. Cliffe Schreuders	e97bfa7553	lab update	2018-01-04 12:43:56 +00:00
Z. Cliffe Schreuders	647ebb8dd9	lab update	2018-01-03 16:10:29 +00:00
Z. Cliffe Schreuders	7f9ca77ef3	ovirt libs edit	2018-01-03 11:34:14 +00:00