Commit Graph

348 Commits

Author SHA1 Message Date
Z. Cliffe Schreuders
c10a35691e Merge major changes from Semester 2 into master 2019-06-18 14:37:47 +01:00
Cliffe
1cf570cdd9 Merge pull request #144 from dezull/windows-on-esxi
Fix windows image not built properly for ESXi
2019-04-22 13:21:11 +01:00
Cliffe
f5b62ceea7 Merge pull request #137 from Th3Prim3/CTF_addons
CTF addons
2019-04-20 12:49:22 +01:00
Dzul Nizam
ba3b911e84 Fix windows image not built properly for ESXi 2019-04-18 08:54:48 +08:00
Cliffe
17e6f5cfdd Merge pull request #134 from Th3Prim3/master
CTFd Export/Import Fix (fixes #129)
2019-03-27 20:19:04 +00:00
Th3Prim3
3bd144ed4a Merge pull request #3 from Th3Prim3/master
Fix flags.json and link hrefs.
2019-03-21 12:11:33 -05:00
Jason Zeller
94bd07b2bc Fix flags.json and link hrefs. 2019-03-21 12:09:16 -05:00
Z. Cliffe Schreuders
1240edda1b spacing #138 2019-03-18 23:34:17 +00:00
redwiz666@gmail.com
7591dc74fd Added ESXi Support 2019-03-15 20:50:58 -05:00
Jason Zeller
455cb08fbe Replaced individual list generators with generic that allows future use. Added ncrack vulnerability. 2019-03-13 15:25:15 -05:00
Jason Zeller
14e865b74f Initial import of custom password generators and matching vulnerabilities. 2019-03-13 13:49:38 -05:00
Jason Zeller
f454f9af7f Removed Python requirement. Hardcoded hash for 'adminpassword'. Updated python script to be standalone. 2019-03-13 12:02:05 -05:00
Th3Prim3
9bc2362004 Merge pull request #2 from cliffe/master
Merge to latest
2019-03-12 12:08:33 -05:00
Jason Zeller
0e7bd6598e Spacing issue. 2019-03-12 11:40:17 -05:00
Jason Zeller
1d44dce074 CTFd import was broken during CTFd rewrite. This makes SecGen compatible with CTFd v2.0.2+. 2019-03-12 11:38:33 -05:00
Z. Cliffe Schreuders
531a04336b lab updates 2019-03-01 17:44:16 +00:00
Z. Cliffe Schreuders
4ba06f9424 lab updates 2019-02-25 17:13:14 +00:00
Z. Cliffe Schreuders
e33306ffa0 bundle version 1 2019-02-20 09:28:34 +00:00
ts
eddb9640f3 static oVirt networking: debian_server gets eth0 2019-02-18 11:21:40 +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
2f4703b199 --no-test flag 2019-02-15 18:01:30 +00:00
Z. Cliffe Schreuders
9a3ff20136 lab updates 2019-02-14 15:18:41 +00:00
Z. Cliffe Schreuders
53bba11133 lab updates (and related modules)
(cherry picked from commit 665b0589c8)
2019-02-14 14:59:50 +00:00
ts
4ee93f7e49 added test string for Vagrantfile 2019-02-14 14:58:33 +00:00
ts
d5adcf4cca added retry loop for test_service_up? and increased sleep time as some web applications were failing. 2019-02-05 18:53:10 +00:00
ts
1894847499 post_provision_test, replaced gem_exec with open3 2019-02-05 18:15:59 +00:00
ts
1a61db5b1f tests: net/http moved to superclass, updated website tests 2019-02-05 17:27:39 +00:00
ts
b0881938f0 fixed mysql tests + update parameterised_website tests 2019-02-05 16:28:51 +00:00
ts
9574ba5601 Tests: local software modules (chkrootkit / nmap) 2019-02-05 11:46:14 +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
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
ts
1fffa4b05c (WiP) Created proftpd_133c_backdoor testing script - Needs testing! 2019-02-02 01:27:50 +00:00
ts
1c4a9aebf1 randomly generated json_inputs filenames now include module_name 2019-02-02 00:17:06 +00:00
Z. Cliffe Schreuders
123e336de0 Merge branch 'stretch_kde_update' of https://github.com/cliffe/secgen 2019-01-31 14:49:12 +00:00
Z. Cliffe Schreuders
665b0589c8 lab updates (and related modules) 2019-01-26 20:11:17 +00:00
ts
cc73c3c48d Exit elegantly from local.rb generators that have no parameters with ctrl-d 2019-01-21 14:30:37 +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
7c245d4c5b fix: recursive array encoding 2019-01-14 17:14:46 +00:00
ts
498bc87e9f Fix: the utf-8 encoding broke arrays of hashes (e.g. organisation['employees'=>[{...},{...},{...}]]) - now working again. 2019-01-14 16:54:17 +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
Z. Cliffe Schreuders
582efe77b8 lab updates 2018-12-07 13:04:44 +00:00
Z. Cliffe Schreuders
d107d7582d line lists 2018-12-06 15:45:12 +00:00
Z. Cliffe Schreuders
1cbdd32145 lab updates 2018-12-06 15:16:24 +00:00
Z. Cliffe Schreuders
8ae094d73b remove potentially offensive passwords 2018-12-06 14:28:24 +00:00
Jason Zeller
6e93a28e5a Fix issue with uploads folder 2018-11-23 14:40:54 -06:00