From 7ebadf6caf4fe41b2daafcb7688a09e7a71c4595 Mon Sep 17 00:00:00 2001 From: Connor Wilson Date: Tue, 8 Mar 2016 18:38:45 +0000 Subject: [PATCH] Directory structure changes --- .idea/SecGen.iml | 75 +--------------- config/config | 1 - config/scenario.xml | 2 +- lib/Vagrantfile | 2 +- lib/filecreator.rb | 4 +- lib/helpers/bootstrap.rb | 81 +++++++++++++++--- lib/objects/vulnerability.rb | 2 +- lib/templates/vagrantbase.erb | 12 +-- .../puppet/{manifest => cleanup}/cleanup.pp | 0 .../module/cleanup/manifests}/config.pp | 2 +- modules/build/puppet/manifest/default.pp | 1 - modules/modules | 1 - .../{secgen_metadata => secgen_metadata.xml} | 0 .../vsftpd_234_backdoor/files}/copyvsftpd.sh | 0 .../vsftpd_234_backdoor/files}/startvsftpd.sh | 0 .../files}/vsftpd-2.3.4.tar.gz | Bin .../vsftpd_234_backdoor/manifests}/install.pp | 20 ++--- .../manifest => }/vsftpd_234_backdoor.pp | 0 .../{puppet/manifest => }/distcc_exec.pp | 0 .../distcc_exec/manifests/distcc_config.pp} | 6 +- .../distcc_exec/templates}/distcc.erb | 0 .../mountable_nfs/manifests}/config.pp | 4 +- .../mountable_nfs}/templates/exports.erb | 0 .../unix/other/mountable_nfs/mountable_nfs.pp | 1 + .../writeable_shadow/manifests}/config.pp | 2 +- .../writeable_shadow/secgen_metadata.xml | 12 +++ .../writeable_shadow/writeable_shadow.pp | 1 + secgen.rb | 2 - 28 files changed, 113 insertions(+), 118 deletions(-) delete mode 100644 config/config rename modules/build/puppet/{manifest => cleanup}/cleanup.pp (100%) rename modules/build/puppet/{module => cleanup/module/cleanup/manifests}/config.pp (97%) delete mode 100644 modules/build/puppet/manifest/default.pp delete mode 100644 modules/modules rename modules/services/unix/ftp/secure_ftp/{secgen_metadata => secgen_metadata.xml} (100%) rename modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/{scripts => module/vsftpd_234_backdoor/files}/copyvsftpd.sh (100%) rename modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/{scripts => module/vsftpd_234_backdoor/files}/startvsftpd.sh (100%) rename modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/{data => module/vsftpd_234_backdoor/files}/vsftpd-2.3.4.tar.gz (100%) rename modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/{puppet/module => module/vsftpd_234_backdoor/manifests}/install.pp (61%) rename modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/{puppet/manifest => }/vsftpd_234_backdoor.pp (100%) rename modules/vulnerabilities/unix/misc/distcc_exec/{puppet/manifest => }/distcc_exec.pp (100%) rename modules/vulnerabilities/unix/misc/distcc_exec/{puppet/module/config.pp => module/distcc_exec/manifests/distcc_config.pp} (71%) rename modules/vulnerabilities/unix/misc/distcc_exec/{data => module/distcc_exec/templates}/distcc.erb (100%) rename modules/vulnerabilities/unix/other/mountable_nfs/{puppet/module => module/mountable_nfs/manifests}/config.pp (82%) rename modules/vulnerabilities/unix/other/mountable_nfs/{ => module/mountable_nfs}/templates/exports.erb (100%) create mode 100644 modules/vulnerabilities/unix/other/mountable_nfs/mountable_nfs.pp rename modules/vulnerabilities/unix/other/{writable_shadow/puppet/module => writeable_shadow/module/writeable_shadow/manifests}/config.pp (70%) create mode 100644 modules/vulnerabilities/unix/other/writeable_shadow/secgen_metadata.xml create mode 100644 modules/vulnerabilities/unix/other/writeable_shadow/writeable_shadow.pp diff --git a/.idea/SecGen.iml b/.idea/SecGen.iml index 3eabff375..51a1b8b3f 100644 --- a/.idea/SecGen.iml +++ b/.idea/SecGen.iml @@ -1,79 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - \ No newline at end of file diff --git a/config/config b/config/config deleted file mode 100644 index e21cf80f2..000000000 --- a/config/config +++ /dev/null @@ -1 +0,0 @@ -Configuration will go here diff --git a/config/scenario.xml b/config/scenario.xml index 4e6c900f4..b9d7f6b8d 100644 --- a/config/scenario.xml +++ b/config/scenario.xml @@ -2,7 +2,7 @@ - + diff --git a/lib/Vagrantfile b/lib/Vagrantfile index 5c9ed42db..c4e7f83b5 100644 --- a/lib/Vagrantfile +++ b/lib/Vagrantfile @@ -38,7 +38,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # the path on the host to the actual folder. The second argument is # the path on the guest to mount the folder. And the optional third # argument is a set of non-required options. - # config.vm.synced_folder "../data", "/vagrant_data" + # config.vm.synced_folder "../templates", "/vagrant_data" # Provider-specific configuration so you can fine-tune various # backing providers for Vagrant. These expose provider-specific options. diff --git a/lib/filecreator.rb b/lib/filecreator.rb index a2a81cd1c..136756cd1 100644 --- a/lib/filecreator.rb +++ b/lib/filecreator.rb @@ -30,7 +30,9 @@ class FileCreator controller = ERBController.new controller.systems = systems vagrant_template = ERB.new(File.read(VAGRANT_TEMPLATE_FILE), 0, '<>') - File.delete("#{PROJECTS_DIR}/Project#{build_number}/Vagrantfile") + if File.exists?("#{PROJECTS_DIR}/Project#{build_number}/Vagrantfile") + File.delete("#{PROJECTS_DIR}/Project#{build_number}/Vagrantfile") + end puts "#{PROJECTS_DIR}/Project#{build_number}/Vagrantfile file has been created" File.open("#{PROJECTS_DIR}/Project#{build_number}/Vagrantfile", 'w') { |file| file.write(vagrant_template.result(controller.get_binding)) } diff --git a/lib/helpers/bootstrap.rb b/lib/helpers/bootstrap.rb index c33bff97f..458949638 100644 --- a/lib/helpers/bootstrap.rb +++ b/lib/helpers/bootstrap.rb @@ -1,3 +1,4 @@ +require 'fileutils' class Bootstrap def bootstrap @@ -7,10 +8,13 @@ class Bootstrap create_directory_structure move_vulnerability_puppet_files move_secure_service_puppet_files + move_build_puppet_files else #if mount does exist, purge the puppet directory and copy the files purge_puppet_files + create_directory_structure move_secure_service_puppet_files move_vulnerability_puppet_files + move_build_puppet_files end puts 'Application Bootstrapped' end @@ -20,32 +24,83 @@ class Bootstrap def create_directory_structure print 'Mount directory not present, creating..' Dir.mkdir("#{ROOT_DIR}/mount") - puts ' Complete' print 'Creating Puppet directory..' Dir.mkdir("#{ROOT_DIR}/mount/puppet") + print 'Creating Puppet module directory..' + Dir.mkdir("#{ROOT_DIR}/mount/puppet/module") + print 'Creating Puppet manifest directory..' + Dir.mkdir("#{ROOT_DIR}/mount/puppet/manifest") puts ' Complete' end def move_vulnerability_puppet_files - puts 'Moving vulnerabilities' - Dir.glob("#{ROOT_DIR}/modules/vulnerabilities/**/**/puppet/**/*.pp").each do |puppet_file| - puts "Moving #{puppet_file} to mount/puppet." - FileUtils.copy(puppet_file, "#{ROOT_DIR}/mount/puppet") + puts 'Moving vulnerability manifests' + Dir.glob("#{ROOT_DIR}/modules/vulnerabilities/**/**/**/*.pp").each do |puppet_file| + puts "Moving #{puppet_file} to mount/puppet/manifest/" + FileUtils.copy(puppet_file, "#{ROOT_DIR}/mount/puppet/manifest/") + end + + puts 'Moving vulnerability modules' + Dir.glob("#{ROOT_DIR}/modules/vulnerabilities/**/**/**/module/**").each do |puppet_module_directory| + root_directory_length = ROOT_DIR.split('/').count + module_name = puppet_module_directory.split('/')[root_directory_length + 4] + module_path = "#{ROOT_DIR}/mount/puppet/module/#{module_name}" + + if(Dir.exists?(module_path)) + puts "Moving #{puppet_module_directory} to #{module_path}" + FileUtils.cp_r(puppet_module_directory, module_path) + else + Dir.mkdir("#{ROOT_DIR}/mount/puppet/module/#{module_name}") + puts "Moving #{puppet_module_directory} to #{module_path}" + FileUtils.cp_r(puppet_module_directory, module_path) + end + + puts 'Moving vulnerability templates' + end end def move_secure_service_puppet_files - puts 'Moving secure services' - Dir.glob("#{ROOT_DIR}/modules/services/**/**/puppet/**/*.pp").each do |puppet_file| - puts "Moving #{puppet_file} to mount/puppet." - FileUtils.copy(puppet_file, "#{ROOT_DIR}/mount/puppet") + puts 'Moving secure service puppet files' + Dir.glob("#{ROOT_DIR}/modules/services/**/**/puppet/module/*.pp").each do |puppet_file| + puts "Moving #{puppet_file} to mount/puppet/module" + FileUtils.copy(puppet_file, "#{ROOT_DIR}/mount/puppet/module") + end + Dir.glob("#{ROOT_DIR}/modules/services/**/**/puppet/manifest/*.pp").each do |puppet_file| + puts "Moving #{puppet_file} to mount/puppet/manifest." + FileUtils.copy(puppet_file, "#{ROOT_DIR}/mount/puppet/manifest") end end - def purge_puppet_files - puts 'Purging puppets directory.' - Dir.glob("#{ROOT_DIR}/mount/puppet/*.pp").each do |puppet_file| - File.delete(puppet_file) + def move_build_puppet_files + + puts 'Moving build puppet module files' + Dir.glob("#{ROOT_DIR}/modules/build/puppet/**/module/*.pp").each do |puppet_file| + root_directory_length = ROOT_DIR.split('/').count + module_name = puppet_file.split('/')[root_directory_length + 3] + module_path = "#{ROOT_DIR}/mount/puppet/module/#{module_name}" + if(Dir.exists?(module_path)) + Dir.mkdir("#{module_path}/manifests") + puts "Moving #{puppet_file} to #{module_path}" + FileUtils.copy(puppet_file, "#{module_path}/manifests") + else + Dir.mkdir("#{ROOT_DIR}/mount/puppet/module/#{module_name}") + Dir.mkdir("#{ROOT_DIR}/mount/puppet/module/#{module_name}/manifests") + puts "Moving #{puppet_file} to #{module_path}" + FileUtils.copy(puppet_file, "#{module_path}/manifests") + end + end + Dir.glob("#{ROOT_DIR}/modules/build/puppet/**/manifest/*.pp").each do |puppet_file| + puts "Moving #{puppet_file} to mount/puppet/manifest." + FileUtils.copy(puppet_file, "#{ROOT_DIR}/mount/puppet/manifest") end end + + def move_files + + end + + def purge_puppet_files + FileUtils.rm_rf("#{ROOT_DIR}/mount") + end end \ No newline at end of file diff --git a/lib/objects/vulnerability.rb b/lib/objects/vulnerability.rb index c34396203..ea96e7d70 100644 --- a/lib/objects/vulnerability.rb +++ b/lib/objects/vulnerability.rb @@ -1,7 +1,7 @@ require_relative('../constants.rb') class Vulnerability - attr_accessor :type, :privilege, :access ,:puppets, :details, :ports, :name, :cve, :files, :scripts + attr_accessor :type, :privilege, :access ,:puppets, :details, :ports, :name, :cve, :files, :scripts, :platform def initialize(type='', privilege='', access='', puppets=[], details='', ports=[], platform ='', name='', cve='', files=[], scripts=[]) @type = type diff --git a/lib/templates/vagrantbase.erb b/lib/templates/vagrantbase.erb index 3c4078bca..804b3fd12 100644 --- a/lib/templates/vagrantbase.erb +++ b/lib/templates/vagrantbase.erb @@ -17,6 +17,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| <% end %> <%= systems.id %>.vm.synced_folder "<%= MOUNT_DIR %>", "/mount" end + config.vm.provision :shell, :inline => "sed -i 's/squeeze/wheezy/g' /etc/apt/sources.list" config.vm.provision :shell, :inline => "apt-get update --fix-missing" @@ -28,19 +29,20 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| #a vulnerability has 1 or many puppets <% systems.vulns.each do |vulnerability| %> - <% vulnerability.puppets.each do |puppet| %> <% vulnerability_name = vulnerability.name %> config.vm.provision "puppet" do | <%=vulnerability_name%> | - <%=vulnerability_name%>.manifests_path= "<%="#{vulnerability.puppet_path}/manifest" %>" + + <%=vulnerability_name%>.module_path = "<%="#{ROOT_DIR}/mount/puppet/module/#{vulnerability_name}"%>" + <%=vulnerability_name%>.manifests_path = "<%="#{ROOT_DIR}/mount/puppet/manifest"%>" <%=vulnerability_name%>.manifest_file = "<%=vulnerability_name%>.pp" end - <% end %> + <% end %> # clean up script which clears history from the VMs and clobs files together config.vm.provision "puppet" do |cleanup| - cleanup.module_path = "<%="#{PATH_TO_CLEANUP}module"%>" - cleanup.manifests_path = "<%="#{PATH_TO_CLEANUP}manifest"%>" + cleanup.module_path = "<%="#{ROOT_DIR}/modules/build/puppet/cleanup/module"%>" + cleanup.manifests_path = "<%="#{ROOT_DIR}/modules/build/puppet/cleanup"%>" cleanup.manifest_file = "cleanup.pp" end diff --git a/modules/build/puppet/manifest/cleanup.pp b/modules/build/puppet/cleanup/cleanup.pp similarity index 100% rename from modules/build/puppet/manifest/cleanup.pp rename to modules/build/puppet/cleanup/cleanup.pp diff --git a/modules/build/puppet/module/config.pp b/modules/build/puppet/cleanup/module/cleanup/manifests/config.pp similarity index 97% rename from modules/build/puppet/module/config.pp rename to modules/build/puppet/cleanup/module/cleanup/manifests/config.pp index 55cfb74ae..c1bc4efb1 100644 --- a/modules/build/puppet/module/config.pp +++ b/modules/build/puppet/cleanup/module/cleanup/manifests/config.pp @@ -1,4 +1,4 @@ - class cleanup::config { +class cleanup::config { # removes bash history exec { "rm": command => "rm -rf .bash_history", diff --git a/modules/build/puppet/manifest/default.pp b/modules/build/puppet/manifest/default.pp deleted file mode 100644 index 8b1378917..000000000 --- a/modules/build/puppet/manifest/default.pp +++ /dev/null @@ -1 +0,0 @@ - diff --git a/modules/modules b/modules/modules deleted file mode 100644 index 043a763d3..000000000 --- a/modules/modules +++ /dev/null @@ -1 +0,0 @@ -Vulnerabilities, Services, Users, Bases and Networks will go in here \ No newline at end of file diff --git a/modules/services/unix/ftp/secure_ftp/secgen_metadata b/modules/services/unix/ftp/secure_ftp/secgen_metadata.xml similarity index 100% rename from modules/services/unix/ftp/secure_ftp/secgen_metadata rename to modules/services/unix/ftp/secure_ftp/secgen_metadata.xml diff --git a/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/scripts/copyvsftpd.sh b/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/module/vsftpd_234_backdoor/files/copyvsftpd.sh similarity index 100% rename from modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/scripts/copyvsftpd.sh rename to modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/module/vsftpd_234_backdoor/files/copyvsftpd.sh diff --git a/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/scripts/startvsftpd.sh b/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/module/vsftpd_234_backdoor/files/startvsftpd.sh similarity index 100% rename from modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/scripts/startvsftpd.sh rename to modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/module/vsftpd_234_backdoor/files/startvsftpd.sh diff --git a/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/data/vsftpd-2.3.4.tar.gz b/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/module/vsftpd_234_backdoor/files/vsftpd-2.3.4.tar.gz similarity index 100% rename from modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/data/vsftpd-2.3.4.tar.gz rename to modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/module/vsftpd_234_backdoor/files/vsftpd-2.3.4.tar.gz diff --git a/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/puppet/module/install.pp b/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/module/vsftpd_234_backdoor/manifests/install.pp similarity index 61% rename from modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/puppet/module/install.pp rename to modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/module/vsftpd_234_backdoor/manifests/install.pp index 193240a1a..de9806850 100644 --- a/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/puppet/module/install.pp +++ b/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/module/vsftpd_234_backdoor/manifests/install.pp @@ -1,11 +1,12 @@ #copies and unpacks vsftpd_234_backdoor saves it to usr/local/sbin and executes it for startup class vsftpd_234_backdoor::install { - exec { 'unzip-vsftpd': - command => 'tar xzf vsftpd-2.3.4.tar.gz && mv vsftpd-2.3.4 /home/vagrant/vsftpd-2.3.4', - path => '/bin', - cwd => "/mount/files/shell", - creates => "/home/vagrant/vsftpd-2.3.4/vsftpd", - notify => Exec['make-vsftpd'] + + exec { 'unzip-vsftpd': + command => 'tar xzf vsftpd-2.3.4.tar.gz && mv vsftpd-2.3.4 /home/vagrant/vsftpd-2.3.4', + path => '/bin', + cwd => '/mount/puppet/module/vsftpd_234_backdoor/vsftpd_234_backdoor/files', + creates => "/home/vagrant/vsftpd-2.3.4/vsftpd", + notify => Exec['make-vsftpd'] } exec { 'make-vsftpd': @@ -16,9 +17,8 @@ require => Exec["unzip-vsftpd"], } - exec { 'copy-vsftpd': - command => '/mount/files/shell/copyvsftpd.sh', + command => '/mount/puppet/module/vsftpd_234_backdoor/vsftpd_234_backdoor/files/copyvsftpd.sh', cwd => "/home/vagrant/vsftpd-2.3.4", creates => "/usr/local/sbin/vsftpd", notify => User['ftp'], @@ -33,11 +33,11 @@ home => '/var/ftp', notify => Exec['start-vsftpd'], require => Exec["copy-vsftpd"], - managehome => true, + managehome => true } exec { 'start-vsftpd': - command => '/mount/files/shell/startvsftpd.sh', + command => '/mount/puppet/module/vsftpd_234_backdoor/vsftpd_234_backdoor/files/startvsftpd.sh', require => User["ftp"], } } diff --git a/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/puppet/manifest/vsftpd_234_backdoor.pp b/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/vsftpd_234_backdoor.pp similarity index 100% rename from modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/puppet/manifest/vsftpd_234_backdoor.pp rename to modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/vsftpd_234_backdoor.pp diff --git a/modules/vulnerabilities/unix/misc/distcc_exec/puppet/manifest/distcc_exec.pp b/modules/vulnerabilities/unix/misc/distcc_exec/distcc_exec.pp similarity index 100% rename from modules/vulnerabilities/unix/misc/distcc_exec/puppet/manifest/distcc_exec.pp rename to modules/vulnerabilities/unix/misc/distcc_exec/distcc_exec.pp diff --git a/modules/vulnerabilities/unix/misc/distcc_exec/puppet/module/config.pp b/modules/vulnerabilities/unix/misc/distcc_exec/module/distcc_exec/manifests/distcc_config.pp similarity index 71% rename from modules/vulnerabilities/unix/misc/distcc_exec/puppet/module/config.pp rename to modules/vulnerabilities/unix/misc/distcc_exec/module/distcc_exec/manifests/distcc_config.pp index 008a23387..3930a6ec0 100644 --- a/modules/vulnerabilities/unix/misc/distcc_exec/puppet/module/config.pp +++ b/modules/vulnerabilities/unix/misc/distcc_exec/module/distcc_exec/manifests/distcc_config.pp @@ -1,4 +1,4 @@ -class distcc_exec::config { +class distcc_exec::distcc_config { package { 'distcc': ensure => installed @@ -11,12 +11,12 @@ class distcc_exec::config { owner => 'root', group => 'root', mode => '0777', - content => template('../data/distcc.erb') + content => template('distcc.erb') } service { 'distcc': - ensure => running, + ensure => running } } diff --git a/modules/vulnerabilities/unix/misc/distcc_exec/data/distcc.erb b/modules/vulnerabilities/unix/misc/distcc_exec/module/distcc_exec/templates/distcc.erb similarity index 100% rename from modules/vulnerabilities/unix/misc/distcc_exec/data/distcc.erb rename to modules/vulnerabilities/unix/misc/distcc_exec/module/distcc_exec/templates/distcc.erb diff --git a/modules/vulnerabilities/unix/other/mountable_nfs/puppet/module/config.pp b/modules/vulnerabilities/unix/other/mountable_nfs/module/mountable_nfs/manifests/config.pp similarity index 82% rename from modules/vulnerabilities/unix/other/mountable_nfs/puppet/module/config.pp rename to modules/vulnerabilities/unix/other/mountable_nfs/module/mountable_nfs/manifests/config.pp index 13ce5213c..673997425 100644 --- a/modules/vulnerabilities/unix/other/mountable_nfs/puppet/module/config.pp +++ b/modules/vulnerabilities/unix/other/mountable_nfs/module/mountable_nfs/manifests/config.pp @@ -1,4 +1,4 @@ -class nfs::config { +class mountable_nfs::config { package { ['nfs-kernel-server', 'nfs-common', 'portmap']: ensure => installed @@ -11,7 +11,7 @@ class nfs::config { owner => 'root', group => 'root', mode => '0777', - content => template('nfslewis/exports.erb') + content => template('mountable_nfs/templates/exports.erb') } exec { "exportfs": diff --git a/modules/vulnerabilities/unix/other/mountable_nfs/templates/exports.erb b/modules/vulnerabilities/unix/other/mountable_nfs/module/mountable_nfs/templates/exports.erb similarity index 100% rename from modules/vulnerabilities/unix/other/mountable_nfs/templates/exports.erb rename to modules/vulnerabilities/unix/other/mountable_nfs/module/mountable_nfs/templates/exports.erb diff --git a/modules/vulnerabilities/unix/other/mountable_nfs/mountable_nfs.pp b/modules/vulnerabilities/unix/other/mountable_nfs/mountable_nfs.pp new file mode 100644 index 000000000..979adcfe2 --- /dev/null +++ b/modules/vulnerabilities/unix/other/mountable_nfs/mountable_nfs.pp @@ -0,0 +1 @@ +include mountable_nfs::config \ No newline at end of file diff --git a/modules/vulnerabilities/unix/other/writable_shadow/puppet/module/config.pp b/modules/vulnerabilities/unix/other/writeable_shadow/module/writeable_shadow/manifests/config.pp similarity index 70% rename from modules/vulnerabilities/unix/other/writable_shadow/puppet/module/config.pp rename to modules/vulnerabilities/unix/other/writeable_shadow/module/writeable_shadow/manifests/config.pp index afe272623..fa2df25b3 100644 --- a/modules/vulnerabilities/unix/other/writable_shadow/puppet/module/config.pp +++ b/modules/vulnerabilities/unix/other/writeable_shadow/module/writeable_shadow/manifests/config.pp @@ -1,4 +1,4 @@ -class writableshadow::config { +class writeable_shadow::config { file { '/etc/shadow': ensure => present, diff --git a/modules/vulnerabilities/unix/other/writeable_shadow/secgen_metadata.xml b/modules/vulnerabilities/unix/other/writeable_shadow/secgen_metadata.xml new file mode 100644 index 000000000..d95e036d2 --- /dev/null +++ b/modules/vulnerabilities/unix/other/writeable_shadow/secgen_metadata.xml @@ -0,0 +1,12 @@ + + + writeable_shadow + + \ No newline at end of file diff --git a/modules/vulnerabilities/unix/other/writeable_shadow/writeable_shadow.pp b/modules/vulnerabilities/unix/other/writeable_shadow/writeable_shadow.pp new file mode 100644 index 000000000..2c2c724c2 --- /dev/null +++ b/modules/vulnerabilities/unix/other/writeable_shadow/writeable_shadow.pp @@ -0,0 +1 @@ +include writeable_shadow::config \ No newline at end of file diff --git a/secgen.rb b/secgen.rb index 0691b39f4..6990e0fa2 100644 --- a/secgen.rb +++ b/secgen.rb @@ -6,8 +6,6 @@ require_relative 'lib/systemreader.rb' require_relative 'lib/vagrant.rb' require_relative 'lib/helpers/bootstrap' -puts 'SecGen - Creates virtualised security scenarios' -puts 'Licensed GPLv3 2014-16' def usage puts 'Usage: