158 Commits

Author	SHA1	Message	Date
ts	e312445907	added tidy statements to ensure the 000-default.conf is removed from apache	2019-02-18 17:07:54 +00:00
ts	754013ca6b	apache_stretch: always remove 000-default.conf	2019-02-18 13:50:34 +00:00
ts	9d664ad677	Merge branch 'post_tests' into s2progress ... # Conflicts: # modules/generators/structured_content/hackerbot_config/hbauthentication/secgen_metadata.xml # modules/generators/structured_content/hackerbot_config/hbauthentication/templates/intro.md.erb # modules/generators/structured_content/hackerbot_config/hbauthentication/templates/lab.xml.erb # modules/vulnerabilities/unix/access_control_misconfigurations/suid_root_bash/suid_root_bash.pp # modules/vulnerabilities/unix/access_control_misconfigurations/suid_root_vi/suid_root_vi.pp # modules/vulnerabilities/unix/web_training/dvwa/files/DVWA-master/vulnerabilities/csp/help/help.php # modules/vulnerabilities/unix/web_training/dvwa/manifests/apache.pp # scenarios/ctf/basic_narrative.xml # scenarios/labs/websec_lab_env.xml # scenarios/security_audit/team_project.xml	2019-02-15 18:18:30 +00:00
ts	930c056234	apache_stretch_compatible: now works with 2 vhosts like wheezy, enables stretch base for on basic_narrative.xml	2019-02-15 17:58:09 +00:00
ts	31a006f8c0	irc2 conflict with debian strech, not all stretch modules	2019-02-15 17:31:59 +00:00
ts	fda7a01dff	Semester 2 team project scenario required changes	2019-02-07 14:32:14 +00:00
ts	d655b3d226	updated tests + team project	2019-02-07 11:11:50 +00:00
ts	1a61db5b1f	tests: net/http moved to superclass, updated website tests	2019-02-05 17:27:39 +00:00
ts	4dfd3e03eb	parameterised_website/secgen_tests: more sensible test order	2019-02-05 16:29:39 +00:00
ts	b0881938f0	fixed mysql tests + update parameterised_website tests	2019-02-05 16:28:51 +00:00
ts	4c67181466	Test faiures read exit code instead of "FAILED" or "PASSED" strings	2019-02-04 17:38:00 +00:00
ts	714b2c7b66	Test faiures read exit code instead of "FAILED" or "PASSED" strings	2019-02-04 17:29:38 +00:00
ts	fcb2dc0e9b	Added NTP test. Refactored html match from parameterised_website into the superclass	2019-02-04 16:52:31 +00:00
ts	db7a9daa8a	popa3d and port check	2019-02-02 17:50:23 +00:00
ts	606f267b2c	more port check tests...	2019-02-02 17:23:42 +00:00
ts	17ed03a327	Testing most service modules for open port [todo.. NTP and popa3d]	2019-02-02 17:22:50 +00:00
ts	3279c50637	Tests now working! Added for all ftp services and vulnerabilities.	2019-02-02 02:31:20 +00:00
Z. Cliffe Schreuders	e5767caad6	fix conflict based on name	2019-02-01 20:20:43 +00:00
ts	723813fb11	wordpress_2x on stretch + wheezy both http and https, apache now autoredirects to https if it's enabled	2019-01-22 10:38:31 +00:00
ts	439d66d087	fixed negative regex match so we no longer need a conflict in parameterised_website for webapps (necessary for basic_narrative.xml)	2019-01-21 11:52:39 +00:00
ts	8c5b5f8670	Updated names for consistency	2019-01-18 16:31:34 +00:00
ts	1c8162959c	parameterised_website: conflict with webapps	2019-01-18 16:06:37 +00:00
ts	bc39277610	Old unrealirc versions won't build on Stretch so adding conflict	2019-01-18 14:50:35 +00:00
ts	275681109e	services/parameterised_website: main_page_paragraph_content fix, navbar and contact page fixes	2019-01-14 18:06:03 +00:00
ts	9a8f19ea47	Merge fix: renamed files to remove merge branch name	2019-01-11 13:07:08 +00:00
ts	5bce99b86c	Merge branch 'ctf_challenges_merge' into january_19_merge ... # Conflicts: # lib/helpers/constants.rb # modules/utilities/unix/languages/java_wheezy_compatible/java/spec/spec_helper.rb~upstream_stretch_kde_update	2019-01-11 13:02:39 +00:00
ts	1302237027	Merge remote-tracking branch 'upstream/stretch_kde_update' into january_19_merge	2019-01-11 12:01:38 +00:00
ts	f7d3fabba9	Testing script, stretch fixes + code review	2018-11-16 10:27:10 +00:00
ts	c5db8da1c9	Adding samba conflicts	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	f0bb2a26e1	Testing script, stretch fixes + code review	2018-10-19 13:46:49 +01:00
ts	be1be16c4f	Adding samba conflicts	2018-10-09 12:43:21 +01:00
ts	634efdcc83	Stretch update merge: mysql & php for stretch, module conflicts and general cleanup	2018-10-09 09:09:12 +01:00
ts	ff75b56c6b	Testing script, stretch fixes + code review	2018-10-05 17:27:12 +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	7c85582867	Temp fix: updated tomcat httpd to servlet to avoid conflicts.	2018-10-05 17:27:05 +01:00
ts	0565b0e82c	more stable tomcat url#	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	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	950d0d4237	Temp fix: updated tomcat httpd to servlet to avoid conflicts.	2018-09-26 09:52:49 +01:00
ts	0ca88194b1	more stable tomcat url#	2018-09-21 16:50:29 +01:00
ts	5208ae5cc7	Squashed WNS + IRI DL work	2018-09-21 12:34:26 +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
ts	512d6ee03d	Merge fix - updating apache scenario references and requires to .*apache	2018-02-15 12:23:53 +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
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