Start using absolute path while fetching cache and config and saving files to output

Author: kkochanski

README.md

@@ -67,7 +67,7 @@ Windows:
 
  pip install requests
 
-### Install python colorama module, [python-colorama module](http://pypi.python.org/pypi/colorama).
+### Install python colorama module, [python-colorama module](https://pypi.org/project/colorama/).
 
 Debian/Ubuntu OS:
 

_version.py

@@ -1 +1 @@
-__version__ = '2.0.7'
+__version__ = '2.0.8'

cli/wrappers/cli_caller.py

@@ -6,6 +6,7 @@
 import datetime
 from cli.cli_file_writer import CliFileWriter
 from cli.formatter.cli_json_formatter import CliJsonFormatter
+from constants import CALLED_SCRIPT
 
 
 class CliCaller:
@@ -96,9 +97,27 @@ def get_processed_output_path(self):
  if output_path.startswith('/') is True: # Given path is absolute
  final_output_path = output_path
  else:
- prepared_file_path = os.path.dirname(os.path.realpath(__file__)).split('/')[:-2] + [self.cli_output_folder]
+ path_parts = os.path.dirname(os.path.realpath(__file__)).split('/')[:-2]
+ called_script_dir = os.path.dirname(CALLED_SCRIPT)
+ # It's about a case when user is calling script from not root directory.€
+ if called_script_dir != 'vxapi.py':
+ new_path_parts = []
+ bad_parts = called_script_dir.split('/')
+ for part in reversed(path_parts):
+ if part in bad_parts:
+ bad_parts.remove(part)
+ continue
+ new_path_parts.append(part)
+
+ new_path_parts.reverse()
+ path_parts = new_path_parts
+
+ prepared_file_path = path_parts + [self.cli_output_folder]
  final_output_path = '/'.join(prepared_file_path)
 
+ if not final_output_path.startswith('/'):
+ final_output_path = '/' + final_output_path
+
  return final_output_path
 
  def get_result_msg_for_files(self):
@@ -136,4 +155,4 @@ def save_files(self):
 
  filename = '{}-{}-{}'.format(self.action_name, identifier, api_response.headers['Vx-Filename']) if identifier is not None else '{}-{}'.format(self.action_name, api_response.headers['Vx-Filename'])
 
- return CliFileWriter.write(self.cli_output_folder, filename, api_response.content)
+ return CliFileWriter.write(self.get_processed_output_path(), filename, api_response.content)

constants.py

@@ -1,3 +1,6 @@
+import os
+import sys
+
 ACTION_SEARCH_HASH = 'search_hash'
 ACTION_SEARCH_HASHES = 'search_hashes'
 ACTION_SEARCH_STATES = 'search_states'
@@ -51,5 +54,7 @@
 ACTION_SCAN_URL_TO_FILE = 'scan_url_to_file'
 
 MINIMAL_SUPPORTED_INSTANCE_VERSION = '8.2'
+CLI_BASE_PATH = os.path.dirname(os.path.realpath(__file__))
+CALLED_SCRIPT = sys.argv[0]
 
 ACTION_WITH_MULTIPLE_CALL_SUPPORT = [ACTION_SUBMIT_FILE, ACTION_SCAN_FILE]

vxapi.py

@@ -42,6 +42,7 @@
 import time
 import os.path
 import json
+from importlib.machinery import SourceFileLoader
 
 from collections import OrderedDict
 
@@ -106,18 +107,19 @@ class CliManager:
  vxapi_cli_headers = {'User-agent': 'VxApi CLI Connector'}
  request_session = None
  loaded_action = None
- current_key_cache_path_template = 'cache/current_key_{}.json'
+ current_key_cache_path_template = '{}/cache/current_key_{}.json'
  current_key_sess_cache_file_path = None
  cache_disabled = False
+ config_path = '{}/config.py'.format(CLI_BASE_PATH)
 
  def load_config(self):
  if is_test_env is True:
  config = json.loads(os.environ['VX_TEST_CONFIG'])
- elif os.path.exists('config.py'):
- from config import get_config
- config = get_config()
+ elif os.path.exists(self.config_path):
+ imported = SourceFileLoader('config', self.config_path).load_module()
+ config = imported.get_config()
  else:
- raise MissingConfigurationError('Configuration is missing. Before running CLI, please copy the file \'config_tpl.py\' from current dir, rename it to \'config.py\', and fill')
+ raise MissingConfigurationError('Configuration is missing (looked for: {}). Before running CLI, please copy the file \'config_tpl.py\' from current dir, rename it to \'config.py\', and fill'.format(self.config_path))
 
  if 'server' not in config or 'api_key' not in config:
  raise ConfigError('Config does not contain all of required \'server\' and \'api_key\' keys')
@@ -135,7 +137,7 @@ def load_config(self):
  raise ConfigError('Your API Key is not compatible with API v2. Please regenerate it at your profile page or create the new one.')
 
  self.config = config
- self.current_key_sess_cache_file_path = self.current_key_cache_path_template.format(self.config['api_key'])
+ self.current_key_sess_cache_file_path = self.current_key_cache_path_template.format(CLI_BASE_PATH, self.config['api_key'])
 
  self.cache_disabled = True if 'VX_DISABLE_CACHING' in os.environ and os.environ['VX_DISABLE_CACHING'] == '1' else False