Merge pull request #60 from egg82/patch-1

Allowing SecGen to be run on servers/droplets

lib/output/project_files_creator.rb

@@ -13,7 +13,7 @@ class ProjectFilesCreator
 # @param [Object] systems list of systems that have been defined and randomised
 # @param [Object] out_dir the directory that the project output should be stored into
 # @param [Object] scenario the file path used to as a basis
-  def initialize(systems, out_dir, scenario)
+  def initialize(systems, out_dir, scenario, gui_output)
     @systems = systems
     @out_dir = out_dir
 
@@ -24,6 +24,7 @@ class ProjectFilesCreator
     end
     @scenario = scenario
     @time = Time.new.to_s
+    @gui_output = gui_output
 
   end
 
@@ -86,4 +87,4 @@ class ProjectFilesCreator
     binding
   end
 
-end
+end

lib/templates/Vagrantfile.erb

@@ -12,7 +12,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define "<%= system.name %>" do |<%= system.name %>|
     # REMOVE: < %= system.name %>.vm.synced_folder "< %= MOUNT_DIR %>", "/mount"
     config.vm.provider :virtualbox do |vb|
-      vb.gui = true
+     <%=
+      if @gui_output == true
+       "vb.gui = true"
+      else
+       "vb.gui = false"
+       "vb.customize ['modifyvm', :id, '--pae', 'on']"
+       "vb.customize ['modifyvm', :id, '--hwvirtex', 'off']"
+       "vb.customize ['modifyvm', :id, '--vtxvpid', 'off']"
+      end
+     %>
     end
     # SecGen modules
 <% system.module_selections.each do |selected_module| -%>

secgen.rb

@@ -31,7 +31,7 @@ end
 
 # Builds the vagrant configuration file based on a scenario file
 # @return build_number [Integer] Current project's build number
-def build_config(scenario, out_dir)
+def build_config(scenario, out_dir, gui_output)
   Print.info 'Reading configuration file for virtual machines you want to create...'
   # read the scenario file describing the systems, which contain vulnerabilities, services, etc
   # this returns an array/hashes structure
@@ -69,7 +69,7 @@ def build_config(scenario, out_dir)
 
   Print.info "Creating project: #{out_dir}..."
   # create's vagrant file / report a starts the vagrant installation'
-  creator = ProjectFilesCreator.new(systems, out_dir, scenario)
+  creator = ProjectFilesCreator.new(systems, out_dir, scenario, gui_output)
   creator.write_files
 
   Print.info 'Project files created.'
@@ -84,8 +84,8 @@ def build_vms(project_dir)
 end
 
 # Runs methods to run and configure a new vm from the configuration file
-def run(scenario, project_dir)
-  build_config(scenario, project_dir)
+def run(scenario, project_dir, gui_output)
+  build_config(scenario, project_dir, gui_output)
   build_vms(project_dir)
 end
 
@@ -105,11 +105,13 @@ Print.std '~'*47
 opts = GetoptLong.new(
   [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
   [ '--project', '-p', GetoptLong::REQUIRED_ARGUMENT ],
-  [ '--scenario', '-s', GetoptLong::REQUIRED_ARGUMENT ]
+  [ '--scenario', '-s', GetoptLong::REQUIRED_ARGUMENT ],
+  [ '--gui-output', '-g', GetoptLong::NO_ARGUMENT]
 )
 
 scenario = SCENARIO_XML
 project_dir = nil
+gui_output = false
 
 # process option arguments
 opts.each do |opt, arg|
@@ -120,6 +122,9 @@ opts.each do |opt, arg|
       scenario = arg;
     when '--project'
       project_dir = arg;
+    when '--gui-output'
+      Print.info "Gui output set (virtual machines will be spawned)"
+      gui_output = true;
     else
       Print.err "Argument not valid: #{arg}"
       usage
@@ -138,10 +143,10 @@ end
 case ARGV[0]
   when 'run', 'r'
     project_dir = default_project_dir unless project_dir
-    run(scenario, project_dir)
+    run(scenario, project_dir, gui_output)
   when 'build-project', 'p'
     project_dir = default_project_dir unless project_dir
-    build_config(scenario, project_dir)
+    build_config(scenario, project_dir, gui_output)
   when 'build-vms', 'v'
     if project_dir
       build_vms(project_dir)