Commit Graph

9 Commits

Author SHA1 Message Date
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
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
31a006f8c0 irc2 conflict with debian strech, not all stretch modules 2019-02-15 17:31:59 +00:00
ts
606f267b2c more port check tests... 2019-02-02 17:23:42 +00:00
Z. Cliffe Schreuders
e5767caad6 fix conflict based on name 2019-02-01 20:20:43 +00: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
ce502abcdb Hackerbot, labs, and associated changes 2017-09-28 16:35:28 +01:00