diff --git a/documentation/yard/rakefile.rb b/documentation/yard/rakefile.rb
index 756a3a319..3bbb4973f 100644
--- a/documentation/yard/rakefile.rb
+++ b/documentation/yard/rakefile.rb
@@ -16,7 +16,7 @@ task :yard do
t.options = [
"--title=SecGen #{VERSION_NUMBER} Documentation",
"--readme=#{ROOT_DIR}/README.md",
- "--output-dir #{DOCUMENTATION_PATH}"
+ "--output-dir #{DOCUMENTATION_DIR}"
] # optional
t.stats_options = ['--list-undoc'] # optional
end
@@ -28,5 +28,5 @@ task :yard_clean do
# NEED TO FIND A BETTER WAY TO CLEAN FILES AS VULNERABILITIES IN 'rm_rf'
# Remove the documentation directory and all files in it
- rm_rf(DOCUMENTATION_PATH)
+ rm_rf(DOCUMENTATION_DIR)
end
\ No newline at end of file
diff --git a/lib/helpers/constants.rb b/lib/helpers/constants.rb
index 61661981e..403b06bb0 100644
--- a/lib/helpers/constants.rb
+++ b/lib/helpers/constants.rb
@@ -1,4 +1,4 @@
-## FILE / PATH CONSTANTS ##
+## FILE / DIR CONSTANTS ##
# Root directory of SecGen file structure
ROOT_DIR = File.expand_path('../../../',__FILE__)
@@ -21,25 +21,25 @@ BUILDS_SCHEMA_FILE = "#{ROOT_DIR}/lib/schemas/build_metadata_schema.xsd"
PROJECTS_DIR = "#{ROOT_DIR}/projects"
# Path to environments directory
-ENVIRONMENTS_PATH = "#{ROOT_DIR}/modules/build/environments"
+ENVIRONMENTS_DIR = "#{ROOT_DIR}/modules/build/environments"
# Path to modules directories
-MODULES_PATH = "#{ROOT_DIR}/modules/"
-VULNERABILITIES_PATH = "#{MODULES_PATH}vulnerabilities/"
-SERVICES_PATH = "#{MODULES_PATH}services/"
-UTILITIES_PATH = "#{MODULES_PATH}utilities/"
-GENERATORS_PATH = "#{MODULES_PATH}generators/"
-ENCODERS_PATH = "#{MODULES_PATH}encoders/"
-NETWORKS_PATH = "#{MODULES_PATH}networks/"
-BASES_PATH = "#{MODULES_PATH}bases/"
-BUILDS_PATH = "#{MODULES_PATH}build/"
-MODULE_LOCAL_CALC_PATH = '/secgen_local/local.rb'
+MODULES_DIR = "#{ROOT_DIR}/modules/"
+VULNERABILITIES_DIR = "#{MODULES_DIR}vulnerabilities/"
+SERVICES_DIR = "#{MODULES_DIR}services/"
+UTILITIES_DIR = "#{MODULES_DIR}utilities/"
+GENERATORS_DIR = "#{MODULES_DIR}generators/"
+ENCODERS_DIR = "#{MODULES_DIR}encoders/"
+NETWORKS_DIR = "#{MODULES_DIR}networks/"
+BASES_DIR = "#{MODULES_DIR}bases/"
+BUILDS_DIR = "#{MODULES_DIR}build/"
+MODULE_LOCAL_CALC_DIR = '/secgen_local/local.rb'
# Path to documentation (Make sure documentation directory is already deleted with rake yard_clean before changing this)
-DOCUMENTATION_PATH = "#{ROOT_DIR}/documentation/yard/doc"
+DOCUMENTATION_DIR = "#{ROOT_DIR}/documentation/yard/doc"
# Path to resources
-WORDLISTS_PATH = "#{ROOT_DIR}/lib/resources/wordlists"
+WORDLISTS_DIR = "#{ROOT_DIR}/lib/resources/wordlists"
## VAGRANT FILE CONSTANTS ##
@@ -47,7 +47,7 @@ WORDLISTS_PATH = "#{ROOT_DIR}/lib/resources/wordlists"
ARRAY_STRINGIFY_SEPARATOR = '_~:~_'
# Path to cleanup directory
-PATH_TO_CLEANUP = "#{ROOT_DIR}/modules/build/puppet/"
+CLEANUP_DIR = "#{ROOT_DIR}/modules/build/puppet/"
# Path to Vagrantfile.erb file
VAGRANT_TEMPLATE_FILE = "#{ROOT_DIR}/lib/templates/Vagrantfile.erb"
diff --git a/lib/readers/module_reader.rb b/lib/readers/module_reader.rb
index 36bbee442..769123c34 100644
--- a/lib/readers/module_reader.rb
+++ b/lib/readers/module_reader.rb
@@ -8,42 +8,42 @@ class ModuleReader
# reads in all bases
def self.read_bases
- return read_modules('base', BASES_PATH, BASE_SCHEMA_FILE, false)
+ return read_modules('base', BASES_DIR, BASE_SCHEMA_FILE, false)
end
# reads in all build modules
def self.read_builds
- return read_modules('build', BUILDS_PATH, BUILDS_SCHEMA_FILE, false) #Continue this tomorrow
+ return read_modules('build', BUILDS_DIR, BUILDS_SCHEMA_FILE, false) #Continue this tomorrow
end
# reads in all vulnerability modules
def self.read_vulnerabilities
- return read_modules('vulnerability', VULNERABILITIES_PATH, VULNERABILITY_SCHEMA_FILE, true)
+ return read_modules('vulnerability', VULNERABILITIES_DIR, VULNERABILITY_SCHEMA_FILE, true)
end
# reads in all services
def self.read_services
- return read_modules('service', SERVICES_PATH, SERVICE_SCHEMA_FILE, true)
+ return read_modules('service', SERVICES_DIR, SERVICE_SCHEMA_FILE, true)
end
# reads in all utilities
def self.read_utilities
- return read_modules('utility', UTILITIES_PATH, UTILITY_SCHEMA_FILE, true)
+ return read_modules('utility', UTILITIES_DIR, UTILITY_SCHEMA_FILE, true)
end
# reads in all utilities
def self.read_generators
- return read_modules('generator', GENERATORS_PATH, GENERATOR_SCHEMA_FILE, true)
+ return read_modules('generator', GENERATORS_DIR, GENERATOR_SCHEMA_FILE, true)
end
# reads in all utilities
def self.read_encoders
- return read_modules('encoder', ENCODERS_PATH, ENCODER_SCHEMA_FILE, true)
+ return read_modules('encoder', ENCODERS_DIR, ENCODER_SCHEMA_FILE, true)
end
# reads in all networks
def self.read_networks
- return read_modules('network', NETWORKS_PATH, NETWORK_SCHEMA_FILE, false)
+ return read_modules('network', NETWORKS_DIR, NETWORK_SCHEMA_FILE, false)
end
# reads in xml files to create modules
@@ -99,7 +99,7 @@ class ModuleReader
new_module.puppet_other_path = "#{ROOT_DIR}/#{module_path}/manifests"
# save executable path of any pre-calculation for outputs
- local = "#{module_path}#{MODULE_LOCAL_CALC_PATH}"
+ local = "#{module_path}#{MODULE_LOCAL_CALC_DIR}"
if File.file?(local)
new_module.local_calc_file = local
end
diff --git a/lib/schemas/encoder_metadata_schema.xsd b/lib/schemas/encoder_metadata_schema.xsd
index 0eaace55a..9d66333ea 100644
--- a/lib/schemas/encoder_metadata_schema.xsd
+++ b/lib/schemas/encoder_metadata_schema.xsd
@@ -38,7 +38,7 @@
-
+
diff --git a/lib/schemas/generator_metadata_schema.xsd b/lib/schemas/generator_metadata_schema.xsd
index 595692ff3..9aa5d6af7 100644
--- a/lib/schemas/generator_metadata_schema.xsd
+++ b/lib/schemas/generator_metadata_schema.xsd
@@ -37,7 +37,7 @@
-
+
diff --git a/lib/templates/Vagrantfile.erb b/lib/templates/Vagrantfile.erb
index c1e9d1bc9..d84b9e6a9 100644
--- a/lib/templates/Vagrantfile.erb
+++ b/lib/templates/Vagrantfile.erb
@@ -57,7 +57,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
}
<% end -%>
<%=module_name%>.module_path = "<%="puppet/#{system.name}/modules"%>"
- <%=module_name%>.environment_path = "<%="#{ENVIRONMENTS_PATH}"%>"
+ <%=module_name%>.environment_path = "<%="#{ENVIRONMENTS_DIR}"%>"
<%=module_name%>.environment = "production"
<%=module_name%>.manifests_path = "<%="#{ROOT_DIR}/#{selected_module.module_path}/"%>"
<%=module_name%>.manifest_file = "<%="#{selected_module.module_path_end}.pp"%>"
@@ -69,7 +69,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# # clean up script which clears history from the VMs and clobs files together
# <%= system.name %>.vm.provision "puppet" do |cleanup|
# cleanup.module_path = "<%="#{ROOT_DIR}/mount/puppet/module"%>"
-# cleanup.environment_path = "<%="#{ENVIRONMENTS_PATH}"%>"
+# cleanup.environment_path = "<%="#{ENVIRONMENTS_DIR}"%>"
# cleanup.environment = "production"
# cleanup.manifests_path = "<%="#{ROOT_DIR}/mount/puppet/manifest"%>"
# cleanup.manifest_file = "cleanup.pp"
diff --git a/modules/encoders/account/account_hash_builder/secgen_metadata.xml b/modules/encoders/account/account_hash_builder/secgen_metadata.xml
index 026a4eef2..864b98b8a 100644
--- a/modules/encoders/account/account_hash_builder/secgen_metadata.xml
+++ b/modules/encoders/account/account_hash_builder/secgen_metadata.xml
@@ -21,5 +21,5 @@
- account
+ account
diff --git a/modules/encoders/selector/random_string_selector/secgen_metadata.xml b/modules/encoders/selector/random_string_selector/secgen_metadata.xml
index feab0525a..cacfce12c 100644
--- a/modules/encoders/selector/random_string_selector/secgen_metadata.xml
+++ b/modules/encoders/selector/random_string_selector/secgen_metadata.xml
@@ -15,5 +15,5 @@
strings_to_encode
- selected_string
+ selected_string
diff --git a/modules/encoders/string/1337/secgen_metadata.xml b/modules/encoders/string/1337/secgen_metadata.xml
index 4ad93323c..c177eea85 100644
--- a/modules/encoders/string/1337/secgen_metadata.xml
+++ b/modules/encoders/string/1337/secgen_metadata.xml
@@ -14,6 +14,6 @@
strings_to_encode
- encoded_strings
+ encoded_strings
diff --git a/modules/encoders/string/base64/secgen_metadata.xml b/modules/encoders/string/base64/secgen_metadata.xml
index 366de2cb3..aa17483e8 100644
--- a/modules/encoders/string/base64/secgen_metadata.xml
+++ b/modules/encoders/string/base64/secgen_metadata.xml
@@ -32,14 +32,8 @@
base64_options
- encoded_strings
+ encoded_strings
-
-
-
-
rot13_options
- encoded_strings
+ encoded_strings
-
-
-
-