220 Commits

Author	SHA1	Message	Date
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
thomashaw	c562e33c6e	batch: added list --success	2017-11-06 13:17:28 +00:00
thomashaw	a970ad5b45	batch: usage update	2017-11-06 13:15:38 +00:00
thomashaw	60f7618808	batch_secgen.rb: Threads have their own DB connections (fixes the message type 0xXX arrived from server while idle problem); List now accepts status types (e.g. --running, --failed/--error, --todo); and other minor tweaks	2017-11-06 13:05:09 +00:00
thomashaw	818752fef3	batch_secgen.rb: Threads have their own DB connections (fixes the message type 0xXX arrived from server while idle problem) --- test me w/ oVirt batch	2017-11-06 11:55:16 +00:00
thomashaw	0868b38516	oVirt retry loop (invalid credentials error): adding retries + catching connection exception	2017-11-03 14:01:45 +00:00
thomashaw	c6c319f4bc	oVirt retry loop: remove VMs that Vagrant created, but cannot find with destroy, via oVirt API	2017-11-03 11:57:15 +00:00
secgen server	16c99260ee	tests	2017-11-02 16:42:48 +00:00
thomashaw	87991f9f87	Retry loop improvements: pushing to test	2017-10-31 15:56:15 +00:00
thomashaw	de4a30b960	Retry loop improvements: pushing to test	2017-10-31 13:56:32 +00:00
thomashaw	2792221271	Retry loop improvements: pushing to test	2017-10-31 11:27:46 +00:00
thomashaw	94b72067d8	(oVirt) Minor fix for retry loop. Added timeout and proper handling.	2017-10-24 12:52:41 +01:00
thomashaw	c8aee26974	Merge remote-tracking branch 'upstream/ids_lab_squashed' into week_4_merge_branch ... # Conflicts: # lib/templates/Vagrantfile.erb	2017-10-21 10:52:02 +01:00
Z. Cliffe Schreuders	e78458c882	IDS lab	2017-10-20 16:52:17 +01:00
thomashaw	19cade10d3	Using process_helper gem instead of Open3.capture3 within gem_exec.rb so that vagrant up output is displayed in real-time.	2017-10-20 16:30:38 +01:00
thomashaw	08aad783df	Minor cleanup	2017-10-20 14:26:16 +01:00
thomashaw	8a0dceb12e	Minor changes to batch_secgen.rb	2017-10-20 13:03:13 +01:00
thomashaw	2172110037	batch_secgen: added README.md with setup instructions.	2017-10-20 13:02:54 +01:00
thomashaw	6e56a25be9	network changes cleanup - no need for <network/> changes	2017-10-18 15:03:26 +01:00
thomashaw	0033a7c642	network-ranges => scenario passthrough / rework	2017-10-18 14:57:53 +01:00
thomashaw	444d9ea9eb	batch_secgen: changed default option of random ip range exclusion to Y	2017-10-17 10:23:14 +01:00
secgen server	a95d957962	fixed destroy only broken vms	2017-10-13 16:20:24 +01:00
thomashaw	d62c15137f	Changes to retry destroy <failed_vm> and shortened hackerbot_server in system name to hb_server	2017-10-13 14:35:24 +01:00