Commit Graph

19 Commits

Author SHA1 Message Date
ts
1302237027 Merge remote-tracking branch 'upstream/stretch_kde_update' into january_19_merge 2019-01-11 12:01:38 +00:00
Jason Zeller
6e93a28e5a Fix issue with uploads folder 2018-11-23 14:40:54 -06:00
ts
26a0b6dffc snoop changes 2018-10-19 16:13:09 +01:00
ts
f0bb2a26e1 Testing script, stretch fixes + code review 2018-10-19 13:46:49 +01:00
Z. Cliffe Schreuders
465876094c verbose librarian output 2018-10-18 12:46:40 +01:00
ts
ff75b56c6b Testing script, stretch fixes + code review 2018-10-05 17:27:12 +01:00
Z. Cliffe Schreuders
93fd85a155 export to CTFd scoreboard (adapted to suit SecGen VM based challenges) 2018-06-22 17:01:16 +01:00
Z. Cliffe Schreuders
4219937aa3 improved error handling and cleanup 2018-02-19 23:39:23 +00:00
thomashaw
6045c1f187 hackerbot merge - includes lots of other changes 2018-02-08 13:14:22 +00:00
thomashaw
f42555350b secgen.rb: adding --network-ranges 2017-09-21 15:44:23 +01:00
thomashaw
534a780726 Merge remote-tracking branch 'origin/pr/90'
# Conflicts:
#	README.md
#	lib/templates/Vagrantfile.erb
2017-06-30 15:21:22 +01:00
thomashaw
07eaad8199 Project Vagrantfile's now use relative paths. This enables distribution of project's without having to mess with paths. 2017-04-11 11:46:44 +01:00
Jjk422
7960914a79 Adds the Windows 2008 r2 server 64 bit basebox, allows for no license.
Will download ISO from microsoft site, will then build basebox (storing in VAGRANT_BASEBOX_STORAGE) and will then build with vagrant.
If Basebox is not present SecGen will prompt whether to use packer (requires download from packer website in README.md and for the binary to be in the system path) to build the Basebox.

*** Changes ***
constants.rb
51-57: Added the 2 constants PUPPET_VERSION: version of puppet to install on the newly generated system, and VAGRANT_BASEBOX_STORAGE which stores generated baseboxes (currently set to SecGen_root/.generated).

project_files_creator.rb
48-80: Added logic to check for existing basebox and to generate new basebox if not present.

base_metadata_schema.xsd
11: Added windows to platform options type
45-50: Added extra packer helper tags, packerfile_path (path to packer file in the layout of base_module_name/Packerfile_name) and product_key (will use a trial version if product key is not present)

vulnerability_metadata_schema.xsd
32: Added windows value to platformOptions type to allow for windows system implementation.

Vagrantfile.erb
21: Changed --hwvirtex to default of on without gui output, problems can occur if this is not set to on.
23,28,31: Removed - tags before ending %>, this was causing an error with the vagrantfile as the options were not being placed on different lines.
48-56: Added the use of winrm instead of the default ssh for the base module if the base module is windows.

puppet_install/LICENSE
Added Mozilla Public License Version 2.0 (GPL v3 compatable) that came with the puppet_install/windows.ps1 script, the script to install puppet can be rewritten with a more simple implementation, however this script should do error checking to add an extra level of stability to the puppet install.

puppet_install/windows.ps1
Will install puppet on the Windows machine.

virtualbox_guest_install/windows.bat
Will install the virtualbox guest additions on the Windows machine.

Autounattend.xml.erb
Aurounattend script that allows for setting out the system layout including system information, disk configuration and product keys.

Packerfile.erb
Packerfile that builds the machine via packer, was going to be fully parameterised with all options being in the SecGen metadata (it still can be converted to this easily) however this lead to a large SecGen_metadata file with multiple tags which were only used if the basebox is not present, therefore only the product_key and packerfile_path keys were added to the SecGen_metadata file. Although the product_key data may be moved to a central product_key file later on.

secgen_metadata.xml
SecGen metadata file for the new windows basebox.
2017-03-19 17:52:17 +00:00
Z. Cliffe Schreuders
6a14c417c6 marker.xml for marking CTF flags and providing hints (which have IDs so we don't have to give the same hint twice), also updated organisation of scenarios 2017-03-14 17:30:33 +00:00
thomashaw
e8f8dcece4 Team project work squashed + removed dead code 2017-02-17 14:59:07 +00:00
thomashaw
1522fd3ac9 Enable static IP address network IP address resolution & a fix for the duplicate modules being output when using multiple systems in Vagrantfile bug 2017-01-17 14:49:24 +00:00
Jjk422
42adbcb853 Added extra command line options to modify generated vms, need to be separated into a ruby class to ensure max values are not set (max ram larger then system ram) and to make sure that large ruby blocks are not in Vagrantfile.erb.
Options added are:
--memory-per-vm
--total-memory
--max-cpu-cores
--max-cpu-usage
2016-08-19 19:35:47 +01:00
egg82
49c19a0c21 Update project_files_creator.rb 2016-08-17 13:29:07 -06:00
Z. Cliffe Schreuders
b5b19fe1c5 Major overhaul of code base! 2016-06-09 00:03:04 +01:00