Commit Graph

129 Commits

Author SHA1 Message Date
thomashaw
a45ea10342 Merge branch 'auto_grading071220' into auto_grading180621
# Conflicts:
#	lib/batch/batch_secgen.rb
#	lib/readers/system_reader.rb
#	lib/schemas/scenario_schema.xsd
#	lib/templates/Puppetfile.erb
#	modules/generators/structured_content/metactf_challenge/secgen_metadata.xml
#	modules/utilities/unix/ctf/metactf/manifests/configure.pp
#	modules/utilities/unix/ctf/metactf/manifests/install.pp
2021-06-18 10:13:07 +01:00
thomashaw
4294811702 Pin apt puppet module to 7.4.0 as the latest version is incompatible with the version of puppet on our base templates 2021-04-22 16:48:24 +01:00
thomashaw
0e5e97d140 auto_grading huge merge (2) 2020-12-07 12:39:10 +00:00
Z. Cliffe Schreuders
718f667264 ovirt base updates
Co-Authored-By: Josh1438 <Josh1438@Josh1438>
2020-02-28 14:19:19 +00:00
Z. Cliffe Schreuders
918c1c345d ovirt default ram increase 2020-02-07 15:07:41 +00:00
Z. Cliffe Schreuders
687ebe9b7b more RAM for VMs by default 2020-01-28 15:56:52 +00:00
Z. Cliffe Schreuders
b3ff73d763 error when template not available 2020-01-22 14:32:37 +00:00
Z. Cliffe Schreuders
6c0117f774 check base is available 2020-01-15 14:14:13 +00:00
Z. Cliffe Schreuders
fceb2a5316 lab updates 2019-10-10 11:01:12 +01:00
Z. Cliffe Schreuders
df05e51344 Windows 7 support in oVirt -- depends on changes to vagrant winssh, the ovirt-plugin, and the basebox having SSH, puppet, and rsync -- possibly breaks old baseboxes that don't have these installed, but SSH is required rather than WinRM due to proxy limitations 2019-09-20 10:47:51 +01:00
Z. Cliffe Schreuders
0fe526e844 fix vm name 2019-09-16 14:00:41 +01:00
Z. Cliffe Schreuders
86672c94fd Windows 7 using WinSSH 2019-09-16 10:58:02 +01:00
Cliffe
fa087c6a0f Merge pull request #150 from emlynbutterfield/windowsbasebox
Windows vagrant basebox and windows accounts
2019-09-10 15:01:20 +01:00
Z. Cliffe Schreuders
eee1a3725a Windows XP SP3 on oVirt -- needs VirtualBox base added 2019-07-23 14:59:08 +01:00
Z. Cliffe Schreuders
98c89444aa rename base 2019-07-09 16:18:52 +01:00
Emlyn Butterfield
e546271ad7 Merge branch 'master' of https://github.com/emlynbutterfield/SecGen 2019-07-09 10:50:20 +01:00
Emlyn Butterfield
ccae583695 Windows base box 2019-07-09 10:47:24 +01:00
Z. Cliffe Schreuders
c10a35691e Merge major changes from Semester 2 into master 2019-06-18 14:37:47 +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
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
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
ts
eddb9640f3 static oVirt networking: debian_server gets eth0 2019-02-18 11:21:40 +00:00
ts
4ee93f7e49 added test string for Vagrantfile 2019-02-14 14:58:33 +00:00
ts
9574ba5601 Tests: local software modules (chkrootkit / nmap) 2019-02-05 11:46:14 +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
ts
f5aec23f48 (WiP) - Need to create Cutter module and fix the angr stuff then merge to ctf_challenges branch. 2018-11-16 10:20:09 +00:00
Z. Cliffe Schreuders
0ac3e39a84 networking 2018-10-27 10:45:12 +01:00
Z. Cliffe Schreuders
52bcda91df networking 2018-10-26 17:28:12 +01:00
Z. Cliffe Schreuders
fec643de7d networking and lab updates 2018-10-26 17:24:21 +01:00
Z. Cliffe Schreuders
24055e9bf9 networking 2018-10-26 16:40:15 +01:00
Z. Cliffe Schreuders
f2b2596733 networking 2018-10-26 15:40:52 +01:00
Z. Cliffe Schreuders
a0efe049dd networking 2018-10-26 14:08:53 +01:00
Z. Cliffe Schreuders
f543db5529 networking 2018-10-26 09:01:08 +01:00
ts
4cdd0ba3ec Reverted networking to use manual static instead of vagrant ovirt4 plugin 2018-10-24 17:43:30 +01:00
Z. Cliffe Schreuders
b564ffd9a4 networking 2018-10-23 16:18:28 +01:00
Z. Cliffe Schreuders
382b6ed03e networking 2018-10-23 14:31:18 +01:00
ts
03cf17ed8c Template updates 2018-10-23 11:09:29 +01:00
ts
26a0b6dffc snoop changes 2018-10-19 16:13:09 +01:00
ts
81440f7b4c Remove snort conflict + ignore errors + don't delete after failure + stdlib in secgen 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
634efdcc83 Stretch update merge: mysql & php for stretch, module conflicts and general cleanup 2018-10-09 09:09:12 +01:00