chg: [hashDecoded] cleanup for the VT message + PEP

pull/350/head
Alexandre Dulaunoy 2019-04-30 15:50:06 +02:00
parent f30befa0eb
commit 0f2b139625
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
1 changed files with 17 additions and 7 deletions

View File

@ -105,6 +105,7 @@ def all_hash_search():
show_decoded_files = request.form.get('show_decoded_files') show_decoded_files = request.form.get('show_decoded_files')
return redirect(url_for('hashDecoded.hashDecoded_page', date_from=date_from, date_to=date_to, type=type, encoding=encoding, show_decoded_files=show_decoded_files)) return redirect(url_for('hashDecoded.hashDecoded_page', date_from=date_from, date_to=date_to, type=type, encoding=encoding, show_decoded_files=show_decoded_files))
@hashDecoded.route("/hashDecoded/", methods=['GET']) @hashDecoded.route("/hashDecoded/", methods=['GET'])
def hashDecoded_page(): def hashDecoded_page():
date_from = request.args.get('date_from') date_from = request.args.get('date_from')
@ -221,17 +222,20 @@ def hashDecoded_page():
return render_template("hashDecoded.html", l_64=b64_metadata, vt_enabled=vt_enabled, l_type=l_type, type=type, daily_type_chart=daily_type_chart, daily_date=daily_date, return render_template("hashDecoded.html", l_64=b64_metadata, vt_enabled=vt_enabled, l_type=l_type, type=type, daily_type_chart=daily_type_chart, daily_date=daily_date,
encoding=encoding, all_encoding=all_encoding, date_from=date_from, date_to=date_to, show_decoded_files=show_decoded_files) encoding=encoding, all_encoding=all_encoding, date_from=date_from, date_to=date_to, show_decoded_files=show_decoded_files)
@hashDecoded.route('/hashDecoded/hash_by_type') @hashDecoded.route('/hashDecoded/hash_by_type')
def hash_by_type(): def hash_by_type():
type = request.args.get('type') type = request.args.get('type')
type = 'text/plain' type = 'text/plain'
return render_template('hash_type.html',type = type) return render_template('hash_type.html',type = type)
@hashDecoded.route('/hashDecoded/hash_hash') @hashDecoded.route('/hashDecoded/hash_hash')
def hash_hash(): def hash_hash():
hash = request.args.get('hash') hash = request.args.get('hash')
return render_template('hash_hash.html') return render_template('hash_hash.html')
@hashDecoded.route('/hashDecoded/showHash') @hashDecoded.route('/hashDecoded/showHash')
def showHash(): def showHash():
hash = request.args.get('hash') hash = request.args.get('hash')
@ -284,6 +288,7 @@ def showHash():
first_seen=first_seen, list_hash_decoder=list_hash_decoder, first_seen=first_seen, list_hash_decoder=list_hash_decoder,
last_seen=last_seen, nb_seen_in_all_pastes=nb_seen_in_all_pastes, sparkline_values=sparkline_values) last_seen=last_seen, nb_seen_in_all_pastes=nb_seen_in_all_pastes, sparkline_values=sparkline_values)
@hashDecoded.route('/hashDecoded/downloadHash') @hashDecoded.route('/hashDecoded/downloadHash')
def downloadHash(): def downloadHash():
hash = request.args.get('hash') hash = request.args.get('hash')
@ -319,6 +324,7 @@ def downloadHash():
else: else:
return 'hash: ' + hash + " don't exist" return 'hash: ' + hash + " don't exist"
@hashDecoded.route('/hashDecoded/hash_by_type_json') @hashDecoded.route('/hashDecoded/hash_by_type_json')
def hash_by_type_json(): def hash_by_type_json():
type = request.args.get('type') type = request.args.get('type')
@ -351,6 +357,7 @@ def hash_by_type_json():
else: else:
return jsonify() return jsonify()
@hashDecoded.route('/hashDecoded/decoder_type_json') @hashDecoded.route('/hashDecoded/decoder_type_json')
def decoder_type_json(): def decoder_type_json():
date_from = request.args.get('date_from') date_from = request.args.get('date_from')
@ -405,6 +412,7 @@ def decoder_type_json():
to_json.append({'name': decoder, 'value': nb_decoded[decoder]}) to_json.append({'name': decoder, 'value': nb_decoded[decoder]})
return jsonify(to_json) return jsonify(to_json)
@hashDecoded.route('/hashDecoded/top5_type_json') @hashDecoded.route('/hashDecoded/top5_type_json')
def top5_type_json(): def top5_type_json():
date_from = request.args.get('date_from') date_from = request.args.get('date_from')
@ -481,6 +489,7 @@ def daily_type_json():
return jsonify(type_value) return jsonify(type_value)
@hashDecoded.route('/hashDecoded/range_type_json') @hashDecoded.route('/hashDecoded/range_type_json')
def range_type_json(): def range_type_json():
date_from = request.args.get('date_from') date_from = request.args.get('date_from')
@ -536,14 +545,13 @@ def range_type_json():
return jsonify(range_type) return jsonify(range_type)
@hashDecoded.route('/hashDecoded/hash_graph_line_json') @hashDecoded.route('/hashDecoded/hash_graph_line_json')
def hash_graph_line_json(): def hash_graph_line_json():
hash = request.args.get('hash') hash = request.args.get('hash')
date_from = request.args.get('date_from') date_from = request.args.get('date_from')
date_to = request.args.get('date_to') date_to = request.args.get('date_to')
#hash = '9c748d28d78a64aef99e7ba866a433eb635c6d7a'
if date_from is None or date_to is None: if date_from is None or date_to is None:
nb_days_seen_in_pastes = 30 nb_days_seen_in_pastes = 30
else: else:
@ -633,12 +641,14 @@ def hash_graph_node_json():
else: else:
return jsonify({}) return jsonify({})
@hashDecoded.route('/hashDecoded/hash_types') @hashDecoded.route('/hashDecoded/hash_types')
def hash_types(): def hash_types():
date_from = 20180701 date_from = 20180701
date_to = 20180706 date_to = 20180706
return render_template('hash_types.html', date_from=date_from, date_to=date_to) return render_template('hash_types.html', date_from=date_from, date_to=date_to)
@hashDecoded.route('/hashDecoded/send_file_to_vt_js') @hashDecoded.route('/hashDecoded/send_file_to_vt_js')
def send_file_to_vt_js(): def send_file_to_vt_js():
hash = request.args.get('hash') hash = request.args.get('hash')
@ -690,7 +700,7 @@ def update_vt_result():
return jsonify(hash=hash, report_vt=b64_vt_report) return jsonify(hash=hash, report_vt=b64_vt_report)
elif response.status_code == 403: elif response.status_code == 403:
Flask_config.vt_enabled = False Flask_config.vt_enabled = False
print('VT is disabled') print('Virustotal key is incorrect (e.g. for public API not for virustotal intelligence), authentication failed or reaching limits.')
return jsonify() return jsonify()
else: else:
# TODO FIXME make json response # TODO FIXME make json response