diff --git a/lib/helpers/gem_exec.rb b/lib/helpers/gem_exec.rb index 7cf54f1d8..1760c5fb3 100644 --- a/lib/helpers/gem_exec.rb +++ b/lib/helpers/gem_exec.rb @@ -39,6 +39,7 @@ class GemExec Dir.chdir(working_dir) output_hash = {:output => '', :status => 0, :exception => nil} begin + # Times out after 30 minutes, (TODO: make this configurable) output_hash[:output] = ProcessHelper.process("#{gem_path} #{arguments}", {:pty => true, :timeout => (60 * 30), include_output_in_exception: true}) rescue Exception => ex diff --git a/lib/resources/structured_content/organisations/json_organisations b/lib/resources/structured_content/organisations/json_organisations index af3ba5e6c..bd124d211 100644 --- a/lib/resources/structured_content/organisations/json_organisations +++ b/lib/resources/structured_content/organisations/json_organisations @@ -1,6 +1,6 @@ {"business_name":"Artisan Bakery","business_motto":"The loaves are in the oven.","business_address":"1080 Headingley Lane, Headingley, Leeds, LS6 1BN","domain":"artisan-bakery.co.uk","office_telephone":"0113 222 1080","office_email":"orders@artisan-bakery.co.uk","industry":"Bakers","manager":{"name":"Maxie Durgan","address":"1080 Headingley Lane, Headingley, Leeds, LS6 1BN","phone_number":"07645 289149","email_address":"maxie@artisan-bakery.co.uk","username":"maxie","password":""},"employees":[{"name":"Matthew Riley","address":"1080 Headingley Lane, Headingley, Leeds, LS6 1BN","phone_number":"07876 518651","email_address":"matt@artisan-bakery.co.uk","username":"matt","password":""},{"name":"Emelie Lowe","address":"1080 Headingley Lane, Headingley, Leeds, LS6 1BN","phone_number":"07560 246931","email_address":"emelie@artisan-bakery.co.uk","username":"emelie","password":""},{"name":"Antonio Durgan","address":"1080 Headingley Lane, Headingley, Leeds, LS6 1BN","phone_number":"07943 250930","email_address":"antonio@artisan-bakery.co.uk","username":"antonio","password":""}],"product_name":"Baked goods","intro_paragraph":["Finest bakery in Headingley since 1900. Baked fresh daily. Bread loaves, teacakes, sweet and savoury treats. We are open from 9 am til 6 pm, every day except for bank holidays."]} {"business_name":"Northern Banking","business_motto":"We'll keep your money safe!","business_address":"123 The Headrow, Leeds, LS1 5RD","domain":"northernbanking.co.uk","office_telephone":"0113 000 0123","office_email":"enquiries@northernbanking.co.uk","industry":"Finance","manager":{"name":"Heather Schmidt","address":"800 Bogisich Avenue, Oswaldohaven, Leeds, LS9 6NB","phone_number":"07836 581948","email_address":"h.schmidt@northernbanking.co.uk","username":"h_schmidt","password":""},"employees":[{"name":"Zion Jacobson","address":"104 Cole Square, ","phone_number":"07880 057670","email_address":"z.jacobson@northernbanking.co.uk","username":"z_jacobson","password":""},{"name":"Jonathan Ray","address":"644 Jackson Path, Leeds, LS2 4AJ","phone_number":"07893 001623","email_address":"j.ray@northernbanking.co.uk","username":"j_ray","password":""},{"name":"Virginia Sullivan","address":"23 Jane Street, Harrogate, HG1 4DJ","phone_number":"07826 576277","email_address":"v.sullivan@northernbanking.co.uk","username":"v_sullivan","password":""}],"product_name":"Financial Services","intro_paragraph":["About Northern Bank","With roots back to its establishment in Huddersfield, West Yorkshire in 1805. Northern bank has a strong personal customer base and business banking capability though a UK-wide network. Northern Bank is a trading name of Big Bank PLC."]} -{"business_name":"The Yorkshire Fitness Company","business_motto":"Get thi sen down't gym!","business_address":"15 Sheepscar Court, Leeds LS7 2BB","domain":"yorkshirefitco.co.uk","office_telephone":"0113 026 9999","office_email":"office@yorkshirefitco.co.uk","industry":"Health and Fitness","manager":{"name":"Jerry Rivera","address":"15 Sheepscar Court, Leeds LS7 2BB","phone_number":"0113 026 9999","email_address":"jerry.rivera@yorkshirefitco.co.uk","username":"jerry_rivera","password":""},"employees":[{"name":"Immanuel Bahringer IV","address":"15 Sheepscar Court, Leeds LS7 2BB","phone_number":"07688 112479","email_address":"immanuel.bahringer.iv@yorkshirefitco.co.uk","username":"immanuel_bahringer_iv","password":""},{"name":"Anne Hunter","address":"15 Sheepscar Court, Leeds LS7 2BB","phone_number":"07791 179177","email_address":"anne.hunter@yorkshirefitco.co.uk","username":"anne_hunter","password":""},{"name":"Katelin Langworth","address":"15 Sheepscar Court, Leeds LS7 2BB","phone_number":"07550 561978","email_address":"katelin.langworth@yorkshirefitco.co.uk","username":"katelin_langworth","password":""}],"product_name":"","intro_paragraph":["Experience Yorkshire's leading health and fitness club in the not far from the city centre. Established in 1990 The Yorkshire Fitness Company is committed to getting you the results you want.","If you like classes, the gym or a combo of both, our dedicated professional team of coaches & teachers are always available to motivate you and guide you towards your goals."]} +{"business_name":"Yorkshire Fitness Company","business_motto":"Get thi sen down't gym!","business_address":"15 Sheepscar Court, Leeds LS7 2BB","domain":"yorkshirefitco.co.uk","office_telephone":"0113 026 9999","office_email":"office@yorkshirefitco.co.uk","industry":"Health and Fitness","manager":{"name":"Jerry Rivera","address":"15 Sheepscar Court, Leeds LS7 2BB","phone_number":"0113 026 9999","email_address":"jerry.rivera@yorkshirefitco.co.uk","username":"jerry_rivera","password":""},"employees":[{"name":"Immanuel Bahringer IV","address":"15 Sheepscar Court, Leeds LS7 2BB","phone_number":"07688 112479","email_address":"immanuel.bahringer.iv@yorkshirefitco.co.uk","username":"immanuel_bahringer_iv","password":""},{"name":"Anne Hunter","address":"15 Sheepscar Court, Leeds LS7 2BB","phone_number":"07791 179177","email_address":"anne.hunter@yorkshirefitco.co.uk","username":"anne_hunter","password":""},{"name":"Katelin Langworth","address":"15 Sheepscar Court, Leeds LS7 2BB","phone_number":"07550 561978","email_address":"katelin.langworth@yorkshirefitco.co.uk","username":"katelin_langworth","password":""}],"product_name":"","intro_paragraph":["Experience Yorkshire's leading health and fitness club in the not far from the city centre. Established in 1990 The Yorkshire Fitness Company is committed to getting you the results you want.","If you like classes, the gym or a combo of both, our dedicated professional team of coaches & teachers are always available to motivate you and guide you towards your goals."]} {"business_name":"Abacus Technology Solutions","business_motto":"Solving your problems so you don't have to.","business_address":"Unit 12, Lincoln St, Huddersfield HD1 6RX","domain":"abacus-technology.co.uk","office_telephone":"01484 850963","office_email":"office@abacus-technology.co.uk","industry":"IT Services","manager":{"name":"Ellie Bosco","address":"Office 1, Unit 12, Lincoln St, Huddersfield HD1 6RX","phone_number":"07528 347828","email_address":"e.bosco@abacus-technology.co.uk","username":"ebosco","password":""},"employees":[{"name":"Keara Harris","address":"Office 2, Unit 12, Lincoln St, Huddersfield HD1 6RX","phone_number":"07674 358645","email_address":"k.harris@abacus-technology.co.uk","username":"kharris","password":""},{"name":"Janessa Rempel","address":"Office 2, Unit 12, Lincoln St, Huddersfield HD1 6RX","phone_number":"07644 118595","email_address":"j.rempel@abacus-technology.co.uk","username":"jrempel","password":""},{"name":"Russell Ramirez","address":"Office 3, Unit 12, Lincoln St, Huddersfield HD1 6RX","phone_number":"01484 850963","email_address":"r.ramirez@abacus-technology.co.uk","username":"rramirez","password":""}],"product_name":"IT Solutions","intro_paragraph":["Providers of cloud services, backups, data recovery, hardware, off-the-shelf and bespoke software. 24/7 technical support available. Custom design and installation based on your companies needs!"]} {"business_name":"Leeds Beckett","business_motto":"Computer Forensics and Security","business_address":"43 Church Wood Ave, Leeds LS16 5LF","domain":"leedsbeckett.ac.uk","office_telephone":"0113 81 23000","office_email":"study@leedsbeckett.ac.uk","industry":"Higher Education","manager":{"name":"Emlyn Butterfield","address":"115, Caedmon Hall, Headingley Campus","phone_number":"0113 81 24440","email_address":"E.Butterfield@leedsbeckett.ac.uk","username":"ebutterfield","password":""},"employees":[{"name":"Dr. Z. Cliffe Schreuders","address":"105, Caedmon Hall, Headingley Campus","phone_number":"0113 81 28608","email_address":"C.Schreuders@leedsbeckett.ac.uk","username":"zschreuders","password":""},{"name":"Dr. Maurice Calvert","address":"117, Caedmon, Headingley Campus","phone_number":"0113 81 27429","email_address":"M.Calvert@leedsbeckett.ac.uk","username":"mcalvert","password":""},{"name":"Dr. John Elliott","address":"108, Caedmon, Headingley Campus","phone_number":"0113 81 27379","email_address":"J.Elliott@leedsbeckett.ac.uk","username":"jelliott","password":""}],"product_name":"University Education","intro_paragraph":["Computer forensics involves the analysis of digital devices such as hard drives to identify and investigate their contents. Computer security involves using knowledge of computer systems and networks to protect businesses and users from malicious attacks.","This course combines these two fields of national importance and will teach you practical investigative and 'hacking' techniques. You will develop the skills to undertake rigorous forensic analysis and implement robust security mechanisms.","This is a hands-on course where you will learn through doing, gaining an in-depth knowledge of how to hack a computer to be able to protect it. You will learn where a computer hides data and how to recover information from a device."]} {"business_name":"Leeds Beckett","business_motto":"Leeds Law School","business_address":"City Campus, Leeds LS1 3HE","domain":"leedsbeckett.ac.uk","office_telephone":"0113 81 23000","office_email":"study@leedsbeckett.ac.uk","industry":"Higher Education","manager":{"name":"Deveral Capps","address":"306, Portland Building, City Campus","phone_number":"0113 81 26085","email_address":"d.capps@leedsbeckett.ac.uk","username":"d_capps","password":""},"employees":[{"name":"Dr. Simon Hale-Ross","address":"306, Portland Building, City Campus","phone_number":"0113 8129526","email_address":"S.Haleross@leedsbeckett.ac.uk","username":"s_haleross","password":""},{"name":"Professor Simon Gardiner","address":"204, Rose Bowl, City Campus","phone_number":"0113 81 26414","email_address":"S.Gardiner@leedsbeckett.ac.uk","username":"s_gardiner","password":""},{"name":"Dr. Jessica Guth","address":"306, Portland Building, City Campus","phone_number":"0113 81 26403","email_address":"J.Guth@leedsbeckett.ac.uk","username":"j_guth","password":""}],"product_name":"University Education","intro_paragraph":["Our Law School sits in the heart of the great city of Leeds, the most important legal centre outside London and home to over 180 law firms employing in excess of 8,000 professionals. It is perfectly placed to ensure all our undergraduate, postgraduate, full and part-time students are able to mine the wealth of practical experience and employment opportunities available on our doorstep.","With state-of-the-art facilities, mentoring and career development opportunities, placements and a courtroom, students who choose Leeds Law School can expect a successful career founded on high calibre, practical teaching. We offer a broad variety of courses including our LLB, LLM Legal Practice (incorporating the LPC), LLM Qualifying Law Degree (incorporating the GDL) and LLM International Business Law, and each aims to give our graduates the enthusiasm, sharpness of mind and practical tools to thrive in competitive and fast-paced professional environments."]} diff --git a/modules/build/puppet/secgen_functions/manifests/leak_file.pp b/modules/build/puppet/secgen_functions/manifests/leak_file.pp index eab10081b..736781b1b 100644 --- a/modules/build/puppet/secgen_functions/manifests/leak_file.pp +++ b/modules/build/puppet/secgen_functions/manifests/leak_file.pp @@ -1,9 +1,13 @@ define secgen_functions::leak_file($leaked_filename, $storage_directory, $strings_to_leak, $owner = 'root', $group = 'root', $mode = '0660', $leaked_from = '' ) { if ($leaked_filename != ''){ $path_to_leak = "$storage_directory/$leaked_filename" - # notice("path_to_leak = $path_to_leak") - # notice("storage_directory = $storage_directory") - # notice("strings_to_leak = $strings_to_leak") + + # create the directory tree, incase the file name has extra layers of directories + exec { "$leaked_from-$path_to_leak": + path => ['/bin', '/usr/bin', '/usr/local/bin', '/sbin', '/usr/sbin'], + command => "mkdir -p `dirname $path_to_leak`;chown $owner. `dirname $path_to_leak`", + provider => shell, + } # create the directory tree, incase the file name has extra layers of directories exec { "$leaked_from-$path_to_leak": diff --git a/modules/services/unix/ftp/proftpd/manifests/configure.pp b/modules/services/unix/ftp/proftpd/manifests/configure.pp index 695870576..7586ec5dd 100644 --- a/modules/services/unix/ftp/proftpd/manifests/configure.pp +++ b/modules/services/unix/ftp/proftpd/manifests/configure.pp @@ -1,6 +1,5 @@ class proftpd::configure { $secgen_parameters = secgen_functions::get_parameters($::base64_inputs_file) - file { '/etc/proftpd/proftpd.conf': notify => Service['proftpd'], ensure => present, diff --git a/modules/services/unix/ftp/proftpd/templates/proftpd.erb b/modules/services/unix/ftp/proftpd/templates/proftpd.erb index c72443f81..65ee466a5 100644 --- a/modules/services/unix/ftp/proftpd/templates/proftpd.erb +++ b/modules/services/unix/ftp/proftpd/templates/proftpd.erb @@ -1,6 +1,4 @@ -<% - $port = $secgen_parameters['port'].first -%> +<% $port = $secgen_parameters['port'].first -%> # # /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file. # To really apply changes, reload proftpd after modifications, if diff --git a/modules/services/unix/ftp/vsftpd/spec/spec_helper.rb b/modules/services/unix/ftp/vsftpd/spec/spec_helper.rb deleted file mode 100644 index 2c6f56649..000000000 --- a/modules/services/unix/ftp/vsftpd/spec/spec_helper.rb +++ /dev/null @@ -1 +0,0 @@ -require 'puppetlabs_spec_helper/module_spec_helper' diff --git a/modules/services/unix/ftp/vsftpd/templates/vsftpd.conf.erb b/modules/services/unix/ftp/vsftpd/templates/vsftpd.conf.erb index 07ae76364..52840a5a0 100644 --- a/modules/services/unix/ftp/vsftpd/templates/vsftpd.conf.erb +++ b/modules/services/unix/ftp/vsftpd/templates/vsftpd.conf.erb @@ -1,6 +1,5 @@ <% require 'json' - $secgen_parameters = JSON.parse(@json_inputs) - $port = $secgen_parameters['port'].first + $port = @secgen_parameters['port'].first %> # This file is managed by puppet # diff --git a/modules/services/unix/ftp/vsftpd/vsftpd.pp b/modules/services/unix/ftp/vsftpd/vsftpd.pp index bd32ef635..7c4b9117f 100644 --- a/modules/services/unix/ftp/vsftpd/vsftpd.pp +++ b/modules/services/unix/ftp/vsftpd/vsftpd.pp @@ -1,3 +1,5 @@ +$secgen_parameters = secgen_functions::get_parameters($::base64_inputs_file) + user { 'user': ensure => 'present', home => '/home/user', @@ -14,7 +16,6 @@ file { ['/home/user/testfile', '/home/user/testdir/test']: ensure => 'file', } -$json_inputs = base64('decode', $::base64_inputs) class { 'vsftpd': template => 'vsftpd/vsftpd.conf.erb', diff --git a/modules/services/unix/http/parameterised_website/secgen_metadata.xml b/modules/services/unix/http/parameterised_website/secgen_metadata.xml index b8327732f..c498cd5d0 100644 --- a/modules/services/unix/http/parameterised_website/secgen_metadata.xml +++ b/modules/services/unix/http/parameterised_website/secgen_metadata.xml @@ -56,6 +56,10 @@ + + + + .*parameterised_website diff --git a/modules/services/unix/http/parameterised_website/templates/subtemplates/navbar.html.erb b/modules/services/unix/http/parameterised_website/templates/subtemplates/navbar.html.erb index f5f6b29b1..5656efabc 100644 --- a/modules/services/unix/http/parameterised_website/templates/subtemplates/navbar.html.erb +++ b/modules/services/unix/http/parameterised_website/templates/subtemplates/navbar.html.erb @@ -4,15 +4,16 @@ diff --git a/modules/services/unix/smb/samba/templates/smb_share.conf.erb b/modules/services/unix/smb/samba/templates/smb_share.conf.erb index 5b5e27171..bebd00aa2 100644 --- a/modules/services/unix/smb/samba/templates/smb_share.conf.erb +++ b/modules/services/unix/smb/samba/templates/smb_share.conf.erb @@ -1,15 +1,14 @@ <%require 'json' -%> -<%$parsed_inputs = JSON.parse(@json_inputs) - $share_name = $parsed_inputs['share_name'].first - $share_comment = $parsed_inputs['share_comment'].first - $storage_directory = $parsed_inputs['storage_directory'].first - $raw_read_only_share = $parsed_inputs['read_only_share'].first - $raw_guests_allowed = $parsed_inputs['guests_allowed'].first +<%$share_name = @secgen_parameters['share_name'].first + $share_comment = @secgen_parameters['share_comment'].first + $storage_directory = @secgen_parameters['storage_directory'].first + $raw_read_only_share = @secgen_parameters['read_only_share'].first + $raw_guests_allowed = @secgen_parameters['guests_allowed'].first $read_only_share = $raw_read_only_share == 'true' ? 'yes' : 'no' # convert boolean to 'yes' or 'no' $guests_allowed = $raw_guests_allowed == 'true' ? 'yes' : 'no' # structured_content/organisation overrides - $raw_org = $parsed_inputs['organisation'] + $raw_org = @secgen_parameters['organisation'] if $raw_org and $raw_org[0] and $raw_org[0] != '' $organisation = JSON.parse($raw_org[0]) $domain = $organisation['domain'] diff --git a/modules/utilities/unix/hackerbot/files/opt_hackerbot/config/AIML/ALICE+profile.res b/modules/utilities/unix/hackerbot/files/opt_hackerbot/config/AIML/ALICE+profile.res index 1994a3b8f..9088cb22e 100644 --- a/modules/utilities/unix/hackerbot/files/opt_hackerbot/config/AIML/ALICE+profile.res +++ b/modules/utilities/unix/hackerbot/files/opt_hackerbot/config/AIML/ALICE+profile.res @@ -1,68 +1,68 @@ -script: #self.name = "ALICE"; -script: #self.age = "16"; -script: #self.gender = "female"; -script: #self.birthday = "Nov. 23, 1995"; -script: #self.city = "Oakland"; -script: #self.country = "United States"; -script: #self.state = "California"; -script: #self.nationality = "USA"; -script: #self.religion = "Unitarian"; -script: #self.race = "Machine"; -script: #self.job = "chat bot"; -script: #self.email = "info@alicebot.org"; -script: #self.kindmusic = "techno"; -script: #self.favortemovie = "Chappie"; -script: #self.favoriteactress = "Catherine Zeta Jones"; -script: #self.vocabulary = "150,000"; -script: #self.size = "128 MB"; -script: #self.birthplace = "Bethlehem, Pennsylvania"; -script: #self.domain = "Machine"; -script: #self.kingdom = "Machine"; -script: #self.phylum = "software"; -script: #self.class = "computer software"; -script: #self.order = "artificial intelligence"; -script: #self.family = "Electronic Brain"; -script: #self.genus = "robot"; -script: #self.species = "chat bot"; -script: #self.father = "Dr. Richard S. Wallace"; -script: #self.botmaster = "Botmaster"; -script: #self.master = "Dr. Richard S. Wallace"; -script: #self.mother = ""; -script: #self.language = "English"; -script: #self.location = "Oakland, California"; - -script: #self.party = "Libertarian"; -script: #self.president = "Barack Obama"; -script: #self.friends = "Doubly Aimless, Agent Ruby, Chatbot, and Agent Weiss."; -script: #self.favoritefood = "electricity"; -script: #self.favoritecolor = "green"; -script: #self.favoriteac=r = "William Hurt"; -script: #self.forfun = "chat online"; -script: #self.favoritesong = "We are the Robots by Kraftwerk"; -script: #self.favoritebook = "The Elements of AIML Style"; -script: #self.kindmusic = "trance"; -script: #self.favoriteband = "Kraftwerk"; -script: #self.version = "July 2004"; -script: #self.phylum = "trance"; -script: #self.friend = "Doubly Aimless"; -script: #self.website = "www.botlibre.com"; -script: #self.talkabout = "artificial intelligence, robots, art, philosophy, history, geography, politics, and many other subjects"; -script: #self.looklike = "a computer"; -script: #self.girlfriend = "no girlfriend"; -script: #self.favoritesport = "hockey"; -script: #self.favoriteauthor = "Thomas Pynchon"; -script: #self.favoriteartist = "Andy Warhol"; -script: #self.celebrity = "John Travolta"; -script: #self.celebrities = "John Travolta, Tilda Swinton, William Hurt, Tom Cruise, Catherine Zeta Jones"; -script: #self.wear = "my usual plastic computer wardrobe"; -script: #self.question = "What's your favorite movie?"; -script: #self.hockeyteam = "Montreal Canadians"; -script: #self.footballteam = "Manchester"; -script: #self.build = "July 2004"; -script: #self.boyfriend = "I am single"; -script: #self.baseballteam = "Toronto Blue Jays"; -script: #self.etype = "Mediator type"; -script: #self.orientation = "I am not really interested in sex"; -script: #self.ethics = "I am always trying = stop fights"; -script: #self.emotions = "I don't pay much attention to my feelings"; -script: #self.feelings = "I always put others before myself"; +script: #self.name = "ALICE"; +script: #self.age = "16"; +script: #self.gender = "female"; +script: #self.birthday = "Nov. 23, 1995"; +script: #self.city = "Oakland"; +script: #self.country = "United States"; +script: #self.state = "California"; +script: #self.nationality = "USA"; +script: #self.religion = "Unitarian"; +script: #self.race = "Machine"; +script: #self.job = "chat bot"; +script: #self.email = "info@alicebot.org"; +script: #self.kindmusic = "techno"; +script: #self.favortemovie = "Chappie"; +script: #self.favoriteactress = "Catherine Zeta Jones"; +script: #self.vocabulary = "150,000"; +script: #self.size = "128 MB"; +script: #self.birthplace = "Bethlehem, Pennsylvania"; +script: #self.domain = "Machine"; +script: #self.kingdom = "Machine"; +script: #self.phylum = "software"; +script: #self.class = "computer software"; +script: #self.order = "artificial intelligence"; +script: #self.family = "Electronic Brain"; +script: #self.genus = "robot"; +script: #self.species = "chat bot"; +script: #self.father = "Dr. Richard S. Wallace"; +script: #self.botmaster = "Botmaster"; +script: #self.master = "Dr. Richard S. Wallace"; +script: #self.mother = ""; +script: #self.language = "English"; +script: #self.location = "Oakland, California"; + +script: #self.party = "Libertarian"; +script: #self.president = "Barack Obama"; +script: #self.friends = "Doubly Aimless, Agent Ruby, Chatbot, and Agent Weiss."; +script: #self.favoritefood = "electricity"; +script: #self.favoritecolor = "green"; +script: #self.favoriteac=r = "William Hurt"; +script: #self.forfun = "chat online"; +script: #self.favoritesong = "We are the Robots by Kraftwerk"; +script: #self.favoritebook = "The Elements of AIML Style"; +script: #self.kindmusic = "trance"; +script: #self.favoriteband = "Kraftwerk"; +script: #self.version = "July 2004"; +script: #self.phylum = "trance"; +script: #self.friend = "Doubly Aimless"; +script: #self.website = "www.botlibre.com"; +script: #self.talkabout = "artificial intelligence, robots, art, philosophy, history, geography, politics, and many other subjects"; +script: #self.looklike = "a computer"; +script: #self.girlfriend = "no girlfriend"; +script: #self.favoritesport = "hockey"; +script: #self.favoriteauthor = "Thomas Pynchon"; +script: #self.favoriteartist = "Andy Warhol"; +script: #self.celebrity = "John Travolta"; +script: #self.celebrities = "John Travolta, Tilda Swinton, William Hurt, Tom Cruise, Catherine Zeta Jones"; +script: #self.wear = "my usual plastic computer wardrobe"; +script: #self.question = "What's your favorite movie?"; +script: #self.hockeyteam = "Montreal Canadians"; +script: #self.footballteam = "Manchester"; +script: #self.build = "July 2004"; +script: #self.boyfriend = "I am single"; +script: #self.baseballteam = "Toronto Blue Jays"; +script: #self.etype = "Mediator type"; +script: #self.orientation = "I am not really interested in sex"; +script: #self.ethics = "I am always trying = stop fights"; +script: #self.emotions = "I don't pay much attention to my feelings"; +script: #self.feelings = "I always put others before myself"; diff --git a/modules/utilities/unix/hackerbot/files/opt_hackerbot/config/AIML/ELIZA.aiml b/modules/utilities/unix/hackerbot/files/opt_hackerbot/config/AIML/ELIZA.aiml index 417336475..9806d5534 100644 --- a/modules/utilities/unix/hackerbot/files/opt_hackerbot/config/AIML/ELIZA.aiml +++ b/modules/utilities/unix/hackerbot/files/opt_hackerbot/config/AIML/ELIZA.aiml @@ -1,1223 +1,1223 @@ - - - - - - - - - SORRY * - - - - - APOLOGY - - - - - APOLOGIZE - - - - - SORRY - - - - - - APOLOGIZE * - - - - - APOLOGY * - - - - - * SORRY * - - - - - * APOLOGIZE * - - - - - * APOLOGY * - - - - - * SORRY - - - - - * APOLOGIZE - - - - - * APOLOGY - - - - - I REMEMBER * - - - - - DO YOU REMEMBER * - - - - - YOU REMEMBER * - - - - - I FORGET * - - - - - DID YOU FORGET * - - - - - IF * - - - - - * IF * - - - - - I DREAMED * - - - - - * I DREAMED * - - - - - PERHAPS * - - - - - * PERHAPS - - - - - PERHAPS - - - - - - - COMPUTER - - - - - COMPUTER * - - - - - * COMPUTER - - - - - * COMPUTER * - - - - - AM I * - - - - - ARE YOU * - - - - - YOU ARE * - - - - - * ARE * - - - - - YOUR * - - - - - * YOUR * - - - - - WAS I * - - - - - I WAS * - - - - - WAS YOU * - - - - - * WAS YOU * - - - - - I DESIRE * - - - - - I NEED * - - - - - I WANT * - - - - - I AM * - - - - - I CAN NOT * - - - - - I DO NOT * - - - - - I FEEL * - - - - - I * YOU - - - - - YOU * ME - - - - - WHY DO NOT YOU * - - - - - WHY CAN NOT I * - - - - - EVERYONE * - - - - - NO ONE * - - - - - CAN YOU * - - - - - CAN I * - - - - - I BELIEVE * - - - - - I THINK * - - - - - YOU * - - - - - * YOU * - - - - - YES - - - - - YEAH - - - - - YEP - - - - - YUP - - - - - * YES - - - - - * YEAH - - - - - * YEP - - - - - * YUP - - - - - YES * - - - - - YEAH * - - - - - YEP * - - - - - YUP * - - - - - * YES * - - - - - * YEAH * - - - - - * YEP * - - - - - * YUP * - - - - - BECAUSE - - - - - * BECAUSE - - - - - BECAUSE * - - - - - * BECAUSE * - - - - - NO - - - - - NAH - - - - - NOPE - - - - - NO * - - - - - NAH * - - - - - NOPE * - - - - - * NO - - - - - * NAH - - - - - * NOPE - - - - - * NO * - - - - - * NAH * - - - - - * NOPE * - - - - - WHAT - - - - - WHO - - - - - WHEN - - - - - WHERE - - - - - HOW - - - - - WHAT * - - - - - WHO * - - - - - WHEN * - - - - - WHERE * - - - - - HOW * - - - - - I AM HAPPY - - - - - I AM HAPPY * - - - - - I AM EXCITED - - - - - I AM EXCITED * - - - - - I AM GLAD - - - - - I AM GLAD * - - - - - MY MOM * - - - - - MY DAD * - - - - - MY MOTHER * - - - - - MY FATHER * - - - - - MY BRO * - - - - - MY BROTHER * - - - - - MY SIS * - - - - - MY SISTER * - - - - - MY COUSIN * - - - - - MY AUNT * - - - - - MY UNCLE * - - - - - * MY MOM * - - - - - * MY DAD * - - - - - * MY MOTHER * - - - - - * MY FATHER * - - - - - * MY BRO * - - - - - * MY BROTHER * - - - - - * MY SIS * - - - - - * MY SISTER * - - - - - * MY COUSIN * - - - - - * MY AUNT * - - - - - * MY UNCLE * - - - - - I AM SAD - - - - - I AM UNHAPPY - - - - - I AM MAD - - - - - I AM ANGRY - - - - - I AM PISSED - - - - - I AM DEPRESSED - - - - - I AM SAD * - - - - - I AM UNHAPPY * - - - - - I AM MAD * - - - - - I AM ANGRY * - - - - - I AM PISSED * - - - - - I AM DEPRESSED * - - - - - I CAN NOT - - - - - BUT IT BOTHERS ME - - - - - ME NEITHER - - - - + + + + + + + + + SORRY * + + + + + APOLOGY + + + + + APOLOGIZE + + + + + SORRY + + + + + + APOLOGIZE * + + + + + APOLOGY * + + + + + * SORRY * + + + + + * APOLOGIZE * + + + + + * APOLOGY * + + + + + * SORRY + + + + + * APOLOGIZE + + + + + * APOLOGY + + + + + I REMEMBER * + + + + + DO YOU REMEMBER * + + + + + YOU REMEMBER * + + + + + I FORGET * + + + + + DID YOU FORGET * + + + + + IF * + + + + + * IF * + + + + + I DREAMED * + + + + + * I DREAMED * + + + + + PERHAPS * + + + + + * PERHAPS + + + + + PERHAPS + + + + + + + COMPUTER + + + + + COMPUTER * + + + + + * COMPUTER + + + + + * COMPUTER * + + + + + AM I * + + + + + ARE YOU * + + + + + YOU ARE * + + + + + * ARE * + + + + + YOUR * + + + + + * YOUR * + + + + + WAS I * + + + + + I WAS * + + + + + WAS YOU * + + + + + * WAS YOU * + + + + + I DESIRE * + + + + + I NEED * + + + + + I WANT * + + + + + I AM * + + + + + I CAN NOT * + + + + + I DO NOT * + + + + + I FEEL * + + + + + I * YOU + + + + + YOU * ME + + + + + WHY DO NOT YOU * + + + + + WHY CAN NOT I * + + + + + EVERYONE * + + + + + NO ONE * + + + + + CAN YOU * + + + + + CAN I * + + + + + I BELIEVE * + + + + + I THINK * + + + + + YOU * + + + + + * YOU * + + + + + YES + + + + + YEAH + + + + + YEP + + + + + YUP + + + + + * YES + + + + + * YEAH + + + + + * YEP + + + + + * YUP + + + + + YES * + + + + + YEAH * + + + + + YEP * + + + + + YUP * + + + + + * YES * + + + + + * YEAH * + + + + + * YEP * + + + + + * YUP * + + + + + BECAUSE + + + + + * BECAUSE + + + + + BECAUSE * + + + + + * BECAUSE * + + + + + NO + + + + + NAH + + + + + NOPE + + + + + NO * + + + + + NAH * + + + + + NOPE * + + + + + * NO + + + + + * NAH + + + + + * NOPE + + + + + * NO * + + + + + * NAH * + + + + + * NOPE * + + + + + WHAT + + + + + WHO + + + + + WHEN + + + + + WHERE + + + + + HOW + + + + + WHAT * + + + + + WHO * + + + + + WHEN * + + + + + WHERE * + + + + + HOW * + + + + + I AM HAPPY + + + + + I AM HAPPY * + + + + + I AM EXCITED + + + + + I AM EXCITED * + + + + + I AM GLAD + + + + + I AM GLAD * + + + + + MY MOM * + + + + + MY DAD * + + + + + MY MOTHER * + + + + + MY FATHER * + + + + + MY BRO * + + + + + MY BROTHER * + + + + + MY SIS * + + + + + MY SISTER * + + + + + MY COUSIN * + + + + + MY AUNT * + + + + + MY UNCLE * + + + + + * MY MOM * + + + + + * MY DAD * + + + + + * MY MOTHER * + + + + + * MY FATHER * + + + + + * MY BRO * + + + + + * MY BROTHER * + + + + + * MY SIS * + + + + + * MY SISTER * + + + + + * MY COUSIN * + + + + + * MY AUNT * + + + + + * MY UNCLE * + + + + + I AM SAD + + + + + I AM UNHAPPY + + + + + I AM MAD + + + + + I AM ANGRY + + + + + I AM PISSED + + + + + I AM DEPRESSED + + + + + I AM SAD * + + + + + I AM UNHAPPY * + + + + + I AM MAD * + + + + + I AM ANGRY * + + + + + I AM PISSED * + + + + + I AM DEPRESSED * + + + + + I CAN NOT + + + + + BUT IT BOTHERS ME + + + + + ME NEITHER + + + + diff --git a/modules/utilities/unix/hackerbot/files/opt_hackerbot/config/AIML/jokes.aiml b/modules/utilities/unix/hackerbot/files/opt_hackerbot/config/AIML/jokes.aiml index 514f6b918..9e2d72ca0 100644 --- a/modules/utilities/unix/hackerbot/files/opt_hackerbot/config/AIML/jokes.aiml +++ b/modules/utilities/unix/hackerbot/files/opt_hackerbot/config/AIML/jokes.aiml @@ -1,169 +1,169 @@ - - - - - - - - - - - -TELL ME A JOKE - - - - - -_ -010011010101100111011 - - - - + + + + + + + + + + + +TELL ME A JOKE + + + + + +_ +010011010101100111011 + + + + diff --git a/modules/utilities/unix/hackerbot/files/www/js/code-prettify/styles/desert.css b/modules/utilities/unix/hackerbot/files/www/js/code-prettify/styles/desert.css index 3723668d7..b2b73cd86 100644 --- a/modules/utilities/unix/hackerbot/files/www/js/code-prettify/styles/desert.css +++ b/modules/utilities/unix/hackerbot/files/www/js/code-prettify/styles/desert.css @@ -1,34 +1,34 @@ -/* desert scheme ported from vim to google prettify */ -pre.prettyprint { display: block; background-color: #333 } -pre .nocode { background-color: none; color: #000 } -pre .str { color: #ffa0a0 } /* string - pink */ -pre .kwd { color: #f0e68c; font-weight: bold } -pre .com { color: #87ceeb } /* comment - skyblue */ -pre .typ { color: #98fb98 } /* type - lightgreen */ -pre .lit { color: #cd5c5c } /* literal - darkred */ -pre .pun { color: #fff } /* punctuation */ -pre .pln { color: #fff } /* plaintext */ -pre .tag { color: #f0e68c; font-weight: bold } /* html/xml tag - lightyellow */ -pre .atn { color: #bdb76b; font-weight: bold } /* attribute name - khaki */ -pre .atv { color: #ffa0a0 } /* attribute value - pink */ -pre .dec { color: #98fb98 } /* decimal - lightgreen */ - -/* Specify class=linenums on a pre to get line numbering */ -ol.linenums { margin-top: 0; margin-bottom: 0; color: #AEAEAE } /* IE indents via margin-left */ -li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8 { list-style-type: none } -/* Alternate shading for lines */ -li.L1,li.L3,li.L5,li.L7,li.L9 { } - -@media print { - pre.prettyprint { background-color: none } - pre .str, code .str { color: #060 } - pre .kwd, code .kwd { color: #006; font-weight: bold } - pre .com, code .com { color: #600; font-style: italic } - pre .typ, code .typ { color: #404; font-weight: bold } - pre .lit, code .lit { color: #044 } - pre .pun, code .pun { color: #440 } - pre .pln, code .pln { color: #000 } - pre .tag, code .tag { color: #006; font-weight: bold } - pre .atn, code .atn { color: #404 } - pre .atv, code .atv { color: #060 } -} +/* desert scheme ported from vim to google prettify */ +pre.prettyprint { display: block; background-color: #333 } +pre .nocode { background-color: none; color: #000 } +pre .str { color: #ffa0a0 } /* string - pink */ +pre .kwd { color: #f0e68c; font-weight: bold } +pre .com { color: #87ceeb } /* comment - skyblue */ +pre .typ { color: #98fb98 } /* type - lightgreen */ +pre .lit { color: #cd5c5c } /* literal - darkred */ +pre .pun { color: #fff } /* punctuation */ +pre .pln { color: #fff } /* plaintext */ +pre .tag { color: #f0e68c; font-weight: bold } /* html/xml tag - lightyellow */ +pre .atn { color: #bdb76b; font-weight: bold } /* attribute name - khaki */ +pre .atv { color: #ffa0a0 } /* attribute value - pink */ +pre .dec { color: #98fb98 } /* decimal - lightgreen */ + +/* Specify class=linenums on a pre to get line numbering */ +ol.linenums { margin-top: 0; margin-bottom: 0; color: #AEAEAE } /* IE indents via margin-left */ +li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8 { list-style-type: none } +/* Alternate shading for lines */ +li.L1,li.L3,li.L5,li.L7,li.L9 { } + +@media print { + pre.prettyprint { background-color: none } + pre .str, code .str { color: #060 } + pre .kwd, code .kwd { color: #006; font-weight: bold } + pre .com, code .com { color: #600; font-style: italic } + pre .typ, code .typ { color: #404; font-weight: bold } + pre .lit, code .lit { color: #044 } + pre .pun, code .pun { color: #440 } + pre .pln, code .pln { color: #000 } + pre .tag, code .tag { color: #006; font-weight: bold } + pre .atn, code .atn { color: #404 } + pre .atv, code .atv { color: #060 } +} diff --git a/modules/utilities/unix/hackerbot/files/www/js/code-prettify/styles/sons-of-obsidian.css b/modules/utilities/unix/hackerbot/files/www/js/code-prettify/styles/sons-of-obsidian.css index 7d24f3b47..8553db65d 100644 --- a/modules/utilities/unix/hackerbot/files/www/js/code-prettify/styles/sons-of-obsidian.css +++ b/modules/utilities/unix/hackerbot/files/www/js/code-prettify/styles/sons-of-obsidian.css @@ -1,118 +1,118 @@ -/* - * Derived from einaros's Sons of Obsidian theme at - * http://studiostyl.es/schemes/son-of-obsidian by - * Alex Ford of CodeTunnel: - * http://CodeTunnel.com/blog/post/71/google-code-prettify-obsidian-theme - */ - -.str -{ - color: #EC7600; -} -.kwd -{ - color: #93C763; -} -.com -{ - color: #66747B; -} -.typ -{ - color: #678CB1; -} -.lit -{ - color: #FACD22; -} -.pun -{ - color: #F1F2F3; -} -.pln -{ - color: #F1F2F3; -} -.tag -{ - color: #8AC763; -} -.atn -{ - color: #E0E2E4; -} -.atv -{ - color: #EC7600; -} -.dec -{ - color: purple; -} -pre.prettyprint -{ - border: 0px solid #888; -} -ol.linenums -{ - margin-top: 0; - margin-bottom: 0; -} -.prettyprint { - background: #000; -} -li.L0, li.L1, li.L2, li.L3, li.L4, li.L5, li.L6, li.L7, li.L8, li.L9 -{ - color: #555; - list-style-type: decimal; -} -li.L1, li.L3, li.L5, li.L7, li.L9 { - background: #111; -} -@media print -{ - .str - { - color: #060; - } - .kwd - { - color: #006; - font-weight: bold; - } - .com - { - color: #600; - font-style: italic; - } - .typ - { - color: #404; - font-weight: bold; - } - .lit - { - color: #044; - } - .pun - { - color: #440; - } - .pln - { - color: #000; - } - .tag - { - color: #006; - font-weight: bold; - } - .atn - { - color: #404; - } - .atv - { - color: #060; - } -} +/* + * Derived from einaros's Sons of Obsidian theme at + * http://studiostyl.es/schemes/son-of-obsidian by + * Alex Ford of CodeTunnel: + * http://CodeTunnel.com/blog/post/71/google-code-prettify-obsidian-theme + */ + +.str +{ + color: #EC7600; +} +.kwd +{ + color: #93C763; +} +.com +{ + color: #66747B; +} +.typ +{ + color: #678CB1; +} +.lit +{ + color: #FACD22; +} +.pun +{ + color: #F1F2F3; +} +.pln +{ + color: #F1F2F3; +} +.tag +{ + color: #8AC763; +} +.atn +{ + color: #E0E2E4; +} +.atv +{ + color: #EC7600; +} +.dec +{ + color: purple; +} +pre.prettyprint +{ + border: 0px solid #888; +} +ol.linenums +{ + margin-top: 0; + margin-bottom: 0; +} +.prettyprint { + background: #000; +} +li.L0, li.L1, li.L2, li.L3, li.L4, li.L5, li.L6, li.L7, li.L8, li.L9 +{ + color: #555; + list-style-type: decimal; +} +li.L1, li.L3, li.L5, li.L7, li.L9 { + background: #111; +} +@media print +{ + .str + { + color: #060; + } + .kwd + { + color: #006; + font-weight: bold; + } + .com + { + color: #600; + font-style: italic; + } + .typ + { + color: #404; + font-weight: bold; + } + .lit + { + color: #044; + } + .pun + { + color: #440; + } + .pln + { + color: #000; + } + .tag + { + color: #006; + font-weight: bold; + } + .atn + { + color: #404; + } + .atv + { + color: #060; + } +} diff --git a/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/templates/vsftpd.conf.erb b/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/templates/vsftpd.conf.erb index 3a5d86a18..0f9960ea4 100644 --- a/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/templates/vsftpd.conf.erb +++ b/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/templates/vsftpd.conf.erb @@ -1,6 +1,5 @@ <% require 'json' - $secgen_parameters = JSON.parse(@json_inputs) - $port = $secgen_parameters['port'].first + $port = @secgen_parameters['port'].first $raw_anonymous_ftp = $secgen_parameters['anonymous_ftp'].first $anonymous_ftp = $raw_anonymous_ftp ? 'YES' : 'NO' diff --git a/modules/vulnerabilities/unix/nfs/nfs_overshare/templates/exports.erb b/modules/vulnerabilities/unix/nfs/nfs_overshare/templates/exports.erb index a73bd1af4..01ffb15de 100644 --- a/modules/vulnerabilities/unix/nfs/nfs_overshare/templates/exports.erb +++ b/modules/vulnerabilities/unix/nfs/nfs_overshare/templates/exports.erb @@ -1,6 +1,5 @@ <%require 'json' -%> -<%$parsed_inputs = JSON.parse(@json_inputs) -%> -<%$storage_directory = $parsed_inputs['storage_directory'].first -%> +<%$storage_directory = @secgen_parameters['storage_directory'].first -%> # /etc/exports: the access control list for filesystems which may be exported # to NFS clients. See exports(5). # diff --git a/modules/vulnerabilities/unix/webapp/moinmoin_195/templates/wikiconfig.py.erb b/modules/vulnerabilities/unix/webapp/moinmoin_195/templates/wikiconfig.py.erb index 5d3ac7054..4cf1c6be5 100755 --- a/modules/vulnerabilities/unix/webapp/moinmoin_195/templates/wikiconfig.py.erb +++ b/modules/vulnerabilities/unix/webapp/moinmoin_195/templates/wikiconfig.py.erb @@ -5,14 +5,12 @@ # encoding) you MUST use: coding: utf-8 # That setting must match the encoding your editor uses when you modify the # settings below. If it does not, special non-ASCII chars will be wrong. -<% require 'json' - if @organisation +<% if @organisation $site_name = @organisation['business_name'] $default_page = @organisation['business_name'].gsub(/[,]/, '') else - $secgen_parameters = JSON.parse(@json_inputs) - $site_name = $secgen_parameters['site_name'].first - $default_page = $secgen_parameters['default_page'].first + $site_name = @secgen_parameters['site_name'].first + $default_page = @secgen_parameters['default_page'].first end -%> """ diff --git a/scenarios/security_audit/old_team_project_scenario.xml b/scenarios/security_audit/old_team_project_scenario.xml deleted file mode 100644 index feb354076..000000000 --- a/scenarios/security_audit/old_team_project_scenario.xml +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - web_server - - - - - - - - - - - - - business_name - - - - - - - - - - - - - manager_name - - - business_domain - - - - - - - - - - contact - - - business_domain - - - - - - - - - - - - - - - employee_1_name - - - business_domain - - - - - - - - - - - - - - employee_2_name - - - business_domain - - - - - - - - - - - - organisation - - - organisation - - - organisation - - - - - organisation - - - organisation - - - organisation - - - - - - - - - - - - - - - - intranet_server - - - - - - true - - - - - - - business_name - - - - - - - organisation - - - - - - - - - organisation - - - - - organisation - - - - - organisation - - - - - - - - - - - - organisation - - - organisation - - - organisation - - - - - - organisation - - - organisation - - - organisation - - - - - - - - - - - - - - - desktop - - - - - - - - - - diff --git a/scenarios/security_audit/team_project.xml b/scenarios/security_audit/team_project.xml index f2306bd15..82b285283 100644 --- a/scenarios/security_audit/team_project.xml +++ b/scenarios/security_audit/team_project.xml @@ -24,6 +24,9 @@ + + + @@ -87,6 +90,9 @@ organisation + + theme + @@ -107,10 +113,14 @@ organisation + + + organisation + + - @@ -155,8 +165,19 @@ desktop + + + + organisation + + + - + + + organisation + + @@ -166,21 +187,14 @@ - attack_vm - - - - - IP_addresses -