garfield/wpscan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace some '/' by File.join

Browse Source
This commit is contained in:
Christian Mehlmauer
2014-05-31 15:59:05 +02:00
parent 34ba6a86c9
commit 6b8436f825
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common/cache_file_store.rb
View File

@@ -18,7 +18,7 @@ class CacheFileStore
# YAML is Human Readable, contrary to Marshal which store in a binary format # YAML is Human Readable, contrary to Marshal which store in a binary format
# Marshal does not need any "require" # Marshal does not need any "require"
def initialize(storage_path, serializer = Marshal) def initialize(storage_path, serializer = Marshal)
@storage_path = File.expand_path(storage_path + '/' + storage_dir) @storage_path = File.expand_path(File.join(storage_path, storage_dir))
@serializer = serializer @serializer = serializer
# File.directory? for ruby <= 1.9 otherwise, # File.directory? for ruby <= 1.9 otherwise,

56
lib/common/common_helper.rb
View File

@@ -1,38 +1,38 @@
# encoding: UTF-8 # encoding: UTF-8
LIB_DIR = File.expand_path(File.dirname(__FILE__) + '/..') LIB_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
ROOT_DIR = File.expand_path(LIB_DIR + '/..') # expand_path is used to get "wpscan/" instead of "wpscan/lib/../" ROOT_DIR = File.expand_path(File.join(LIB_DIR, '..')) # expand_path is used to get "wpscan/" instead of "wpscan/lib/../"
DATA_DIR = ROOT_DIR + '/data' DATA_DIR = File.join(ROOT_DIR, 'data')
CONF_DIR = ROOT_DIR + '/conf' CONF_DIR = File.join(ROOT_DIR, 'conf')
CACHE_DIR = ROOT_DIR + '/cache' CACHE_DIR = File.join(ROOT_DIR, 'cache')
WPSCAN_LIB_DIR = LIB_DIR + '/wpscan' WPSCAN_LIB_DIR = File.join(LIB_DIR, 'wpscan')
WPSTOOLS_LIB_DIR = LIB_DIR + '/wpstools' WPSTOOLS_LIB_DIR = File.join(LIB_DIR, 'wpstools')
UPDATER_LIB_DIR = LIB_DIR + '/updater' UPDATER_LIB_DIR = File.join(LIB_DIR, 'updater')
COMMON_LIB_DIR = LIB_DIR + '/common' COMMON_LIB_DIR = File.join(LIB_DIR, 'common')
MODELS_LIB_DIR = COMMON_LIB_DIR + '/models' MODELS_LIB_DIR = File.join(COMMON_LIB_DIR, 'models')
COLLECTIONS_LIB_DIR = COMMON_LIB_DIR + '/collections' COLLECTIONS_LIB_DIR = File.join(COMMON_LIB_DIR, 'collections')
LOG_FILE = ROOT_DIR + '/log.txt' LOG_FILE = File.join(ROOT_DIR, 'log.txt')
# Plugins directories # Plugins directories
COMMON_PLUGINS_DIR = COMMON_LIB_DIR + '/plugins' COMMON_PLUGINS_DIR = File.join(COMMON_LIB_DIR, 'plugins')
WPSCAN_PLUGINS_DIR = WPSCAN_LIB_DIR + '/plugins' # Not used ATM WPSCAN_PLUGINS_DIR = File.join(WPSCAN_LIB_DIR, 'plugins') # Not used ATM
WPSTOOLS_PLUGINS_DIR = WPSTOOLS_LIB_DIR + '/plugins' WPSTOOLS_PLUGINS_DIR = File.join(WPSTOOLS_LIB_DIR, 'plugins')
# Data files # Data files
PLUGINS_FILE = DATA_DIR + '/plugins.txt' PLUGINS_FILE = File.join(DATA_DIR, 'plugins.txt')
PLUGINS_FULL_FILE = DATA_DIR + '/plugins_full.txt' PLUGINS_FULL_FILE = File.join(DATA_DIR, 'plugins_full.txt')
PLUGINS_VULNS_FILE = DATA_DIR + '/plugin_vulns.xml' PLUGINS_VULNS_FILE = File.join(DATA_DIR, 'plugin_vulns.xml')
THEMES_FILE = DATA_DIR + '/themes.txt' THEMES_FILE = File.join(DATA_DIR, 'themes.txt')
THEMES_FULL_FILE = DATA_DIR + '/themes_full.txt' THEMES_FULL_FILE = File.join(DATA_DIR, 'themes_full.txt')
THEMES_VULNS_FILE = DATA_DIR + '/theme_vulns.xml' THEMES_VULNS_FILE = File.join(DATA_DIR, 'theme_vulns.xml')
WP_VULNS_FILE = DATA_DIR + '/wp_vulns.xml' WP_VULNS_FILE = File.join(DATA_DIR, 'wp_vulns.xml')
WP_VERSIONS_FILE = DATA_DIR + '/wp_versions.xml' WP_VERSIONS_FILE = File.join(DATA_DIR, 'wp_versions.xml')
LOCAL_FILES_FILE = DATA_DIR + '/local_vulnerable_files.xml' LOCAL_FILES_FILE = File.join(DATA_DIR, 'local_vulnerable_files.xml')
VULNS_XSD = DATA_DIR + '/vuln.xsd' VULNS_XSD = File.join(DATA_DIR, 'vuln.xsd')
WP_VERSIONS_XSD = DATA_DIR + '/wp_versions.xsd' WP_VERSIONS_XSD = File.join(DATA_DIR, 'wp_versions.xsd')
LOCAL_FILES_XSD = DATA_DIR + '/local_vulnerable_files.xsd' LOCAL_FILES_XSD = File.join(DATA_DIR, 'local_vulnerable_files.xsd')
USER_AGENTS_FILE = DATA_DIR + '/user-agents.txt' USER_AGENTS_FILE = File.join(DATA_DIR, 'user-agents.txt')
WPSCAN_VERSION = '2.4.1' WPSCAN_VERSION = '2.4.1'