Commit Graph

179 Commits

Author SHA1 Message Date
thomashaw
39b24ce3c9 (wip) 2022-02-03 19:57:23 +00:00
thomashaw
be218c094f WIP - Testing local web_actioner changes 2021-12-15 01:30:29 +00:00
thomashaw
079b86cfb5 aa fix 2021-12-15 00:15:40 +00:00
thomashaw
52ce044078 static_experiment_rules.xml: webactioner includes correct POST data 2021-12-14 22:42:11 +00:00
thomashaw
f4e33d2d17 (wip) adding static flags to test alert trigger -> web request functionality 2021-12-14 22:32:42 +00:00
thomashaw
ffb900cb24 aaa fix 2021-11-22 17:02:28 +00:00
thomashaw
0a06435dc9 big_merge 2021-11-22 16:26:34 +00:00
Z. Cliffe Schreuders
f6856eb29a Better buster support 2021-11-19 13:50:19 +00:00
Z. Cliffe Schreuders
47848d8a00 fix apache module to use with Buster 2021-11-19 11:21:16 +00:00
thomashaw
2dfb506e3a java_buster_compatible 2021-11-15 21:14:55 +00:00
thomashaw
d9e47ae5a0 elk fix 2021-11-15 20:37:02 +00:00
thomashaw
7c71c45d29 ELK merge - includes new Elastalert, Logstash, Kibana, Elastalert, Auditbeat, Filebeat modules and other misc changes. 2021-11-15 19:17:11 +00:00
Z. Cliffe Schreuders
ce7f49bb5b conflict update 2021-10-01 01:22:55 +01:00
Z. Cliffe Schreuders
86bce6cc67 randomly vuln webapp updates
Co-Authored-By: Josh1438 <Josh1438@Josh1438>
2020-02-28 14:01:49 +00:00
Z. Cliffe Schreuders
49b4180a51 ftp modules conflict with eachother as they default to the same port 2020-01-22 14:40:09 +00:00
Z. Cliffe Schreuders
2236f4bf07 irc modules 2019-07-11 17:06:42 +01:00
Z. Cliffe Schreuders
d6dae20182 labtainer 2019-07-08 10:50:27 +01:00
Z. Cliffe Schreuders
c10a35691e Merge major changes from Semester 2 into master 2019-06-18 14:37:47 +01:00
Z. Cliffe Schreuders
c5b9fee0ed Merge branch 'master' of https://github.com/cliffe/SecGen 2019-04-21 00:04:47 +01:00
Z. Cliffe Schreuders
41d88c9038 wheezy server base update #140 2019-04-21 00:04:21 +01:00
Jason Zeller
0c4db67d1e Adds the ability to set the mode on images_to_leak to allow downloading. Useful if flags are embedded in the image. Also the template had some redundant paragraph tags that caused issues. 2019-03-13 18:58:16 -05:00
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