Commit Graph

78 Commits

Author SHA1 Message Date
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
thomashaw
0a385a8183 Vagrantfile update, no longer appending to /etc/network/interfaces for stretch kde + server as we've got 1 nic not 2. 2018-10-05 17:27:05 +01:00
ts
9d66ea9215 Squashed WNS + IRI DL work 2018-10-05 17:27:05 +01:00
Z. Cliffe Schreuders
f0bf31ff28 WiP 2018-08-19 23:54:30 +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
thomashaw
c8aee26974 Merge remote-tracking branch 'upstream/ids_lab_squashed' into week_4_merge_branch
# Conflicts:
#	lib/templates/Vagrantfile.erb
2017-10-21 10:52:02 +01:00
Z. Cliffe Schreuders
e78458c882 IDS lab 2017-10-20 16:52:17 +01:00
thomashaw
0033a7c642 network-ranges => scenario passthrough / rework 2017-10-18 14:57:53 +01:00
thomashaw
69cf1c57b8 added - and shorter server name for IRI labs 2017-10-05 15:11:50 +01:00
thomashaw
46e4d26915 Vagrantfile.erb: Renamed SPICE => spice 2017-10-05 14:36:00 +01:00
thomashaw
7cfde8317a Rework WIP: Testing changes so far. Still need to rework network-ranges passthrough hack with something more flexible. 2017-10-05 14:24:56 +01:00
Z. Cliffe Schreuders
ce502abcdb Hackerbot, labs, and associated changes 2017-09-28 16:35:28 +01:00
thomashaw
cef610bf04 oVirt now uses VM memory allocation based on command line options. Added missing options to usage. Added default memory allocations for oVirt VMs based on base type. 2017-09-28 15:32:47 +01:00
thomashaw
d43fe74492 Vagrantfile: oVirt hostname, replace _ with - in full hostname string, rather than just system_name. Fixes error when prefix contains underscores. 2017-09-28 13:47:22 +01:00
thomashaw
01baa313fc ovirt-integration: reverting cloud-init change and included it in base template instead 2017-09-26 18:58:13 +01:00
thomashaw
8e38813db2 Updates: SecGen => oVirt Integration 2017-09-26 18:55:09 +01:00
thomashaw
0c13e77c23 Vagrantfile fix 2017-09-21 16:33:57 +01:00
thomashaw
abc7e28893 ovirt integration: removed ovirt-vmname option + build the vm name based on prefix and <system_name> 2017-09-21 15:44:23 +01:00
thomashaw
f42555350b secgen.rb: adding --network-ranges 2017-09-21 15:44:23 +01:00
thomashaw
447059ce20 WIP: templates in bases 2017-09-21 15:44:23 +01:00
thomashaw
f58fb0d2b4 WIP: ovirt templates -> bases 2017-09-21 15:44:23 +01:00
Gajendra
4ac2cd3ddc oVirt provider spinup with multiple options - ovirturl, ovirtpass, ovirtuser, ovirt-vmname, ovirtcluster, ovirttemplate etc 2017-09-21 15:44:23 +01:00
thomashaw
bbb82382f7 Puppetfile.erb: enforce puppetlabs-stdlib 4.18.0 due to undefined resource problem in version 4.19.0 2017-08-23 13:53:40 +01:00
thomashaw
f44680051e more vagrantfile.erb whitespace updates 2017-06-30 22:56:07 +01:00
thomashaw
76d7fa08ab vagrantfile.erb whitespace updates 2017-06-30 22:53:49 +01:00
thomashaw
7a6334fb00 PR_90 changes: added cpu_word_size to differentiate between 32/64bit systems in bases, refactored vagrantfile.erb to include this, changed windows 'config.vm.network' settings to use the system name rather than config. 2017-06-30 22:46:54 +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
thomashaw
d437d839df Provisioning via rsync rather than VirtualBox Shared Folders due to giving away selected modules 2017-04-11 11:14:39 +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
Mihai Ordean
d9391d384f added check to verify if leaked files is empty 2017-03-13 15:10:17 +00:00
Mihai Ordean
ad869c82dc added options to customize VirtualBox hw support from command line 2017-03-13 10:41:54 +00:00
thomashaw
32091ed0fe Special Character work + generator/encoder superclass refactor.
The full Vagrantfile facter string has been encoded in b64 for now, would be nice to b64 the individual arguments rather than the whole string.
2017-03-01 19:19:54 +00:00
thomashaw
f8a97b2842 Parameterised Cleanup Module 2017-01-17 16:11:50 +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
Z. Cliffe Schreuders
f8ba19ad75 datastores for storing and reusing calculated values 2017-01-07 21:21:17 +00:00
thomashaw
87e029fdd3 change [0] for .first 2016-12-22 20:23:44 +00:00
thomashaw
17f425b37f Multiple leaked files, new secgen_functions module encapsulating the file_leak and overshare.erb logic. Updated old modules to use the new resource type. 2016-12-08 10:43:48 +00:00
thomashaw
d197421c11 Vagrantfile removed encoders + generators as they don't need to be on the box 2016-12-06 16:52:53 +00:00
thomashaw
7d7d2e2677 Rework: Moved hello_world to messages. Changed write_fact to output_type. Updated PATH constants to DIR. Changed string generators to more specific message_generator in strings_to_leak. 2016-12-05 17:15:55 +00:00
thomashaw
733c871072 Additional parameterisation. New modules: parameterised_accounts, generators and an account_encoder. Added plenty of parameters/default_inputs to currently existing vulnerability modules. 2016-11-30 18:09:22 +00:00
Z. Cliffe Schreuders
518485f61d cleanup Vagrantfile output 2016-10-18 22:31:58 +01:00
Z. Cliffe Schreuders
e63aa00e0a parameterisation 2016-10-18 21:19:47 +01:00
Z. Cliffe Schreuders
8bbdc885a3 Merge branches 'master' and 'parameterisation' of https://github.com/cliffe/SecGen 2016-09-05 08:56:59 +01:00
Jjk422
f9b2cd548f Correcting pull request errors, only one out of --total-memory or --memory-per-vm is selected (first to be inputted) and shows error message if both inputted.
Also removed defaults so that vms automatically decide on values if not specified.
2016-08-31 09:37:01 +01:00
Z. Cliffe Schreuders
9f0bd61726 Parameterisation 2016-08-30 23:18:31 +01:00
Z. Cliffe Schreuders
6b96ef6476 Parameterisation 2016-08-29 23:06:57 +01: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
Z. Cliffe Schreuders
d8d624cd03 Merge remote-tracking branch 'origin/parameterisation' into parameterisation
Conflicts:
	lib/objects/module.rb
	lib/objects/system.rb
	lib/readers/module_reader.rb
	lib/schemas/scenario_schema.xsd
	modules/vulnerabilities/unix/local/writeable_shadow/secgen_metadata.xml
	scenarios/simple_examples/writeable_shadow_vulnerability.xml
2016-08-17 23:13:28 +01:00