2
0
mirror of https://github.com/mozilla/cipherscan.git synced 2024-11-22 14:23:41 +01:00

Don't expect scripts to be in working directory

This commit is contained in:
Vincent Riquer 2014-12-24 11:26:24 +01:00
parent 983f85d2d4
commit 0e7996181a

View File

@ -456,6 +456,8 @@ def main():
help='use nagios-conformant exit codes') help='use nagios-conformant exit codes')
args = parser.parse_args() args = parser.parse_args()
mypath = os.path.dirname(os.path.realpath(sys.argv[0]))
if args.debug: if args.debug:
logging.basicConfig(stream=sys.stderr, level=logging.DEBUG) logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
else: else:
@ -473,9 +475,9 @@ def main():
logging.debug('Invoking cipherscan with target: ' + args.target) logging.debug('Invoking cipherscan with target: ' + args.target)
data='' data=''
if args.openssl: if args.openssl:
data = subprocess.check_output(['./cipherscan', '-o', args.openssl, '-j', args.target]) data = subprocess.check_output([mypath + '/cipherscan', '-o', args.openssl, '-j', args.target])
else: else:
data = subprocess.check_output(['./cipherscan', '-j', args.target]) data = subprocess.check_output([mypath + '/cipherscan', '-j', args.target])
exit_status=process_results(data, args.level, args.json, args.nagios) exit_status=process_results(data, args.level, args.json, args.nagios)
else: else:
if os.fstat(args.infile.fileno()).st_size < 2: if os.fstat(args.infile.fileno()).st_size < 2: