AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-11-23 14:37:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: [Flask] remove hardcoded url

Browse source
This commit is contained in:
Terrtia 2018-09-26 11:59:51 +02:00
parent 3a72f1548d
commit ff0affc679
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
15 changed files with 70 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
var/www/modules/PasteSubmit/Flask_PasteSubmit.py
View file

@ -296,6 +296,11 @@ def submit():
submitted_tag = 'infoleak:submission="manual"' submitted_tag = 'infoleak:submission="manual"'
#active taxonomies
active_taxonomies = r_serv_tags.smembers('active_taxonomies')
#active galaxies
active_galaxies = r_serv_tags.smembers('active_galaxies')
if ltags or ltagsgalaxies: if ltags or ltagsgalaxies:
if not addTagsVerification(ltags, ltagsgalaxies): if not addTagsVerification(ltags, ltagsgalaxies):
content = 'INVALID TAGS' content = 'INVALID TAGS'
@ -343,6 +348,8 @@ def submit():
launch_submit(ltags, ltagsgalaxies, paste_content, UUID, password ,True) launch_submit(ltags, ltagsgalaxies, paste_content, UUID, password ,True)
return render_template("submiting.html", return render_template("submiting.html",
active_taxonomies = active_taxonomies,
active_galaxies = active_galaxies,
UUID = UUID) UUID = UUID)
else: else:
@ -363,6 +370,8 @@ def submit():
launch_submit(ltags, ltagsgalaxies, paste_content, UUID, password) launch_submit(ltags, ltagsgalaxies, paste_content, UUID, password)
return render_template("submiting.html", return render_template("submiting.html",
active_taxonomies = active_taxonomies,
active_galaxies = active_galaxies,
UUID = UUID) UUID = UUID)
else: else:

4
var/www/modules/PasteSubmit/templates/PasteSubmit.html
View file

@ -20,7 +20,7 @@
<script src="{{ url_for('static', filename='js/jquery.flot.js') }}"></script> <script src="{{ url_for('static', filename='js/jquery.flot.js') }}"></script>
<script src="{{ url_for('static', filename='js/jquery.flot.pie.js') }}"></script> <script src="{{ url_for('static', filename='js/jquery.flot.pie.js') }}"></script>
<script src="{{ url_for('static', filename='js/jquery.flot.time.js') }}"></script> <script src="{{ url_for('static', filename='js/jquery.flot.time.js') }}"></script>
<script src="/static//js/bootstrap.min.js"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/tags.js') }}"></script> <script src="{{ url_for('static', filename='js/tags.js') }}"></script>
</head> </head>
@ -34,7 +34,7 @@
<form action="/PasteSubmit/submit" id="pasteSubmitForm" method="post" enctype=multipart/form-data onsubmit="submitPaste()"> <form action="{{ url_for('PasteSubmit.submit') }}" id="pasteSubmitForm" method="post" enctype=multipart/form-data onsubmit="submitPaste()">
<input type="hidden" id="tags_taxonomies" name="tags_taxonomies" value="test"> <input type="hidden" id="tags_taxonomies" name="tags_taxonomies" value="test">
<input type="hidden" id="tags_galaxies" name="tags_galaxies" value="test"> <input type="hidden" id="tags_galaxies" name="tags_galaxies" value="test">

8
var/www/modules/PasteSubmit/templates/edit_tag_export.html
View file

@ -16,9 +16,9 @@
<!-- JS --> <!-- JS -->
<script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script> <script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script>
<script language="javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script> <script language="javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script>
<script src="/static//js/bootstrap.min.js"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
<script src="/static//js/jquery.dataTables.min.js"></script> <script src="{{ url_for('static', filename='js/jquery.dataTables.min.js') }}"></script>
<script src="/static//js/dataTables.bootstrap.js"></script> <script src="{{ url_for('static', filename='js/dataTables.bootstrap.js') }}"></script>
<style> <style>
.tooltip-inner { .tooltip-inner {
@ -134,7 +134,7 @@
</div> </div>
</div> </div>
<form action="/PasteSubmit/tag_export_edited" id="checkboxForm" method='post'> <form action="{{ url_for('PasteSubmit.tag_export_edited') }}" id="checkboxForm" method='post'>
<div class="container"> <div class="container">

4
var/www/modules/PasteSubmit/templates/submiting.html
View file

@ -20,7 +20,7 @@
<script src="{{ url_for('static', filename='js/jquery.flot.js') }}"></script> <script src="{{ url_for('static', filename='js/jquery.flot.js') }}"></script>
<script src="{{ url_for('static', filename='js/jquery.flot.pie.js') }}"></script> <script src="{{ url_for('static', filename='js/jquery.flot.pie.js') }}"></script>
<script src="{{ url_for('static', filename='js/jquery.flot.time.js') }}"></script> <script src="{{ url_for('static', filename='js/jquery.flot.time.js') }}"></script>
<script src="/static//js/bootstrap.min.js"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/tags.js') }}"></script> <script src="{{ url_for('static', filename='js/tags.js') }}"></script>
<style> <style>
@ -49,7 +49,7 @@
<div class="row"> <div class="row">
<!-- /.col-lg-12 --> <!-- /.col-lg-12 -->
<form action="/PasteSubmit/submit" id="pasteSubmitForm" method="post" enctype=multipart/form-data onsubmit="submitPaste()"> <form action="{{ url_for('PasteSubmit.submit') }}" id="pasteSubmitForm" method="post" enctype=multipart/form-data onsubmit="submitPaste()">
<input type="hidden" id="tags_taxonomies" name="tags_taxonomies" value="test"> <input type="hidden" id="tags_taxonomies" name="tags_taxonomies" value="test">
<input type="hidden" id="tags_galaxies" name="tags_galaxies" value="test"> <input type="hidden" id="tags_galaxies" name="tags_galaxies" value="test">

12
var/www/modules/Tags/templates/edit_galaxy.html
View file

@ -12,13 +12,13 @@
<link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet"> <link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename='font-awesome/css/font-awesome.css') }}" rel="stylesheet"> <link href="{{ url_for('static', filename='font-awesome/css/font-awesome.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename='css/sb-admin-2.css') }}" rel="stylesheet"> <link href="{{ url_for('static', filename='css/sb-admin-2.css') }}" rel="stylesheet">
<link href="/static//css/dataTables.bootstrap.css" rel="stylesheet" type="text/css" /> <link href="{{ url_for('static', filename='css/dataTables.bootstrap.css') }}" rel="stylesheet" type="text/css" />
<!-- JS --> <!-- JS -->
<script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script> <script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script>
<script language="javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script> <script language="javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script>
<script src="/static//js/bootstrap.min.js"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
<script src="/static//js/jquery.dataTables.min.js"></script> <script src="{{ url_for('static', filename='js/jquery.dataTables.min.js') }}"></script>
<script src="/static//js/dataTables.bootstrap.js"></script> <script src="{{ url_for('static', filename='js/dataTables.bootstrap.js') }}"></script>
<style> <style>
.tooltip-inner { .tooltip-inner {
@ -47,7 +47,7 @@
<div id="page-wrapper"> <div id="page-wrapper">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<a href="/Tags/galaxies" class="btn btn-light pull-left"> <a href="{{ url_for('Tags.galaxies') }}" class="btn btn-light pull-left">
<i class="fa fa-arrow-left fa"></i> List Galaxies <i class="fa fa-arrow-left fa"></i> List Galaxies
</a> </a>
</div> </div>
@ -83,7 +83,7 @@
</div> </div>
</div> </div>
<form action="/Tags/edit_galaxy_tag" id="checkboxForm"> <form action="{{ url_for('Tags.edit_galaxy_tag') }}" id="checkboxForm">
<input type="hidden" value="{{ id }}" name="galaxy" /> <input type="hidden" value="{{ id }}" name="galaxy" />

10
var/www/modules/Tags/templates/edit_taxonomie.html
View file

@ -16,9 +16,9 @@
<!-- JS --> <!-- JS -->
<script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script> <script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script>
<script language="javascript" src="{{ url_for('static', filename='js/jquery.js')}}"></script> <script language="javascript" src="{{ url_for('static', filename='js/jquery.js')}}"></script>
<script src="/static//js/bootstrap.min.js"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js')}}"></script>
<script src="/static//js/jquery.dataTables.min.js"></script> <script src="{{ url_for('static', filename='js/dataTables.bootstrap.js')}}"></script>
<script src="/static//js/dataTables.bootstrap.js"></script> <script src="{{ url_for('static', filename='js/jquery.dataTables.min.js')}}"></script>
<style> <style>
.tooltip-inner { .tooltip-inner {
@ -47,7 +47,7 @@
<div id="page-wrapper"> <div id="page-wrapper">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<a href="/Tags/taxonomies" class="btn btn-light pull-left"> <a href="{{ url_for('Tags.taxonomies') }}" class="btn btn-light pull-left">
<i class="fa fa-arrow-left fa"></i> List Taxonomies <i class="fa fa-arrow-left fa"></i> List Taxonomies
</a> </a>
</div> </div>
@ -83,7 +83,7 @@
</div> </div>
</div> </div>
<form action="/Tags/edit_taxonomie_tag" id="checkboxForm"> <form action="{{ url_for('Tags.edit_taxonomie_tag') }}" id="checkboxForm">
<input type="hidden" value="{{ id }}" name="taxonomie" /> <input type="hidden" value="{{ id }}" name="taxonomie" />

6
var/www/modules/Tags/templates/galaxies.html
View file

@ -16,9 +16,9 @@
<!-- JS --> <!-- JS -->
<script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script> <script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script>
<script language="javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script> <script language="javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script>
<script src="/static//js/bootstrap.min.js"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
<script src="/static//js/jquery.dataTables.min.js"></script> <script src="{{ url_for('static', filename='js/jquery.dataTables.min.js') }}"></script>
<script src="/static//js/dataTables.bootstrap.js"></script> <script src="{{ url_for('static', filename='js/dataTables.bootstrap.js') }}"></script>
<style> <style>
.tooltip-inner { .tooltip-inner {

6
var/www/modules/Tags/templates/tag_galaxy_info.html
View file

@ -16,9 +16,9 @@
<!-- JS --> <!-- JS -->
<script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script> <script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script>
<script language="javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script> <script language="javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script>
<script src="/static//js/bootstrap.min.js"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
<script src="/static//js/jquery.dataTables.min.js"></script> <script src="{{ url_for('static', filename='js/jquery.dataTables.min.js') }}"></script>
<script src="/static//js/dataTables.bootstrap.js"></script> <script src="{{ url_for('static', filename='js/dataTables.bootstrap.js') }}"></script>
<style> <style>
.tooltip-inner { .tooltip-inner {

18
var/www/modules/Tags/templates/tagged.html
View file

@ -9,15 +9,15 @@
<link rel="icon" href="{{ url_for('static', filename='image/ail-icon.png') }}"> <link rel="icon" href="{{ url_for('static', filename='image/ail-icon.png') }}">
<!-- Core CSS --> <!-- Core CSS -->
<link href="/static//css/bootstrap.min.css" rel="stylesheet"> <link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
<link href="/static//font-awesome/css/font-awesome.css" rel="stylesheet"> <link href="{{ url_for('static', filename='font-awesome/css/font-awesome.css') }}" rel="stylesheet">
<link href="/static//css/sb-admin-2.css" rel="stylesheet"> <link href="{{ url_for('static', filename='css/sb-admin-2.css') }}" rel="stylesheet">
<link href="/static//css/dataTables.bootstrap.css" rel="stylesheet" type="text/css" /> <link href="{{ url_for('static', filename='css/dataTables.bootstrap.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ url_for('static', filename='css/tags.css') }}" rel="stylesheet" type="text/css" /> <link href="{{ url_for('static', filename='css/tags.css') }}" rel="stylesheet" type="text/css" />
<script language="javascript" src="/static//js/jquery.js"></script> <script src="{{ url_for('static', filename='js/jquery.js') }}"></script>
<script src="/static//js/bootstrap.min.js"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
<script src="/static//js/jquery.dataTables.min.js"></script> <script src="{{ url_for('static', filename='js/jquery.dataTables.min.js') }}"></script>
<script src="/static//js/dataTables.bootstrap.js"></script> <script src="{{ url_for('static', filename='js/dataTables.bootstrap.js') }}"></script>
<script src="{{ url_for('static', filename='js/tags.js') }}"></script> <script src="{{ url_for('static', filename='js/tags.js') }}"></script>
<style> <style>
@ -128,7 +128,7 @@
<div id="div_stil_data"> <div id="div_stil_data">
<button id="load_more_json_button1" type="button" class="btn btn-default" onclick="add_entries(100)" style="display: True">Load 100 entries</button> <button id="load_more_json_button1" type="button" class="btn btn-default" onclick="add_entries(100)" style="display: True">Load 100 entries</button>
<button id="load_more_json_button2" type="button" class="btn btn-warning" onclick="add_entries(300)" style="display: True">Load 300 entries</button> <button id="load_more_json_button2" type="button" class="btn btn-warning" onclick="add_entries(300)" style="display: True">Load 300 entries</button>
<img id="loading_gif_browse" src="/static//image/loading.gif" heigt="20" width="20" style="margin: 2px;"></div> <img id="loading_gif_browse" src="{{url_for('static', filename='image/loading.gif') }}" heigt="20" width="20" style="margin: 2px;"></div>
</br> </br>
<div> <div>

6
var/www/modules/Tags/templates/taxonomies.html
View file

@ -16,9 +16,9 @@
<!-- JS --> <!-- JS -->
<script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script> <script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script>
<script language="javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script> <script language="javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script>
<script src="/static//js/bootstrap.min.js"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
<script src="/static//js/jquery.dataTables.min.js"></script> <script src="{{ url_for('static', filename='js/jquery.dataTables.min.js') }}"></script>
<script src="/static//js/dataTables.bootstrap.js"></script> <script src="{{ url_for('static', filename='js/dataTables.bootstrap.js') }}"></script>
<style> <style>
.tooltip-inner { .tooltip-inner {

2
var/www/modules/dashboard/templates/searchbox.html
View file

@ -1,5 +1,5 @@
<div class="input-group custom-search-form"> <div class="input-group custom-search-form">
<form action="/search" id="form-search" method=POST> <form action="{{ url_for('searches.search') }}" id="form-search" method=POST>
<input type="text" name="query" class="form-control" placeholder="Search Paste"> <input type="text" name="query" class="form-control" placeholder="Search Paste">
<input type="hidden" name="index_name" class="form-control" value="0" placeholder="Index Name"> <input type="hidden" name="index_name" class="form-control" value="0" placeholder="Index Name">
<span class="input-group-btn"> <span class="input-group-btn">

2
var/www/modules/hashDecoded/Flask_hashDecoded.py
View file

@ -279,7 +279,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)
@app.route('/hashDecoded/downloadHash') @hashDecoded.route('/hashDecoded/downloadHash')
def downloadHash(): def downloadHash():
hash = request.args.get('hash') hash = request.args.get('hash')
# sanitize hash # sanitize hash

29
var/www/modules/hashDecoded/templates/hashDecoded.html
View file

@ -90,7 +90,7 @@
<div class="panel panel-info" style="text-align:center;"> <div class="panel panel-info" style="text-align:center;">
<div class="panel-heading"> <div class="panel-heading">
Select a date range : Select a date range :
<form action="/hashDecoded/all_hash_search" id="hash_selector_form" method='post'> <form action="{{ url_for('hashDecoded.all_hash_search') }}" id="hash_selector_form" method='post'>
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-calendar fa" aria-hidden="true"></i></span> <span class="input-group-addon"><i class="fa fa-calendar fa" aria-hidden="true"></i></span>
<input class="form-control" id="date-range-from" placeholder="yyyy-mm-dd" value="{{ date_from }}" name="date_from"> <input class="form-control" id="date-range-from" placeholder="yyyy-mm-dd" value="{{ date_from }}" name="date_from">
@ -374,13 +374,13 @@ function barchart_type_stack(url, id) {
.selectAll("text") .selectAll("text")
.attr("class", "bar") .attr("class", "bar")
{% if date_from|string == date_to|string and type is none %} {% if date_from|string == date_to|string and type is none %}
.on("click", function (d) { window.location.href = '/hashDecoded/?date_from={{date_from}}&date_to={{date_to}}&type='+d }) .on("click", function (d) { window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}?date_from={{date_from}}&date_to={{date_to}}&type="+d })
.attr("transform", "rotate(-18)" ) .attr("transform", "rotate(-18)" )
{% elif date_from|string == date_to|string and type is not none %} {% elif date_from|string == date_to|string and type is not none %}
.on("click", function (d) { window.location.href = '/hashDecoded/?date_from='+d+'&date_to='+d }) .on("click", function (d) { window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}?date_from="+d+'&date_to='+d })
.attr("transform", "rotate(-18)" ) .attr("transform", "rotate(-18)" )
{% else %} {% else %}
.on("click", function (d) { window.location.href = '/hashDecoded/?date_from='+d+'&date_to='+d }) .on("click", function (d) { window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}?date_from="+d+'&date_to='+d })
.attr("transform", "rotate(-40)" ) .attr("transform", "rotate(-40)" )
{% endif %} {% endif %}
.style("text-anchor", "end"); .style("text-anchor", "end");
@ -412,11 +412,11 @@ function barchart_type_stack(url, id) {
.on("mouseover", function (d) { showPopover.call(this, d); }) .on("mouseover", function (d) { showPopover.call(this, d); })
.on("mouseout", function (d) { removePopovers(); }) .on("mouseout", function (d) { removePopovers(); })
{% if date_from|string == date_to|string and type is none %} {% if date_from|string == date_to|string and type is none %}
.on("click", function(d){ window.location.href = "/hashDecoded/" +'?date_from={{date_from}}&date_to={{date_to}}&type='+d.label+'&encoding='+d.name; }); .on("click", function(d){ window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}" +'?date_from={{date_from}}&date_to={{date_to}}&type='+d.label+'&encoding='+d.name; });
{% elif date_from|string == date_to|string and type is not none %} {% elif date_from|string == date_to|string and type is not none %}
.on("click", function(d){ window.location.href = "/hashDecoded/" +'?type={{type}}&date_from='+d.label+'&date_to='+d.label+'&encoding='+d.name; }); .on("click", function(d){ window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}" +'?type={{type}}&date_from='+d.label+'&date_to='+d.label+'&encoding='+d.name; });
{% else %} {% else %}
.on("click", function(d){ window.location.href = "/hashDecoded/" +'?type='+ d.name +'&date_from='+d.label+'&date_to='+d.label; }); .on("click", function(d){ window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}" +'?type='+ d.name +'&date_from='+d.label+'&date_to='+d.label; });
{% endif %} {% endif %}
data.forEach(function(d) { data.forEach(function(d) {
@ -424,15 +424,14 @@ function barchart_type_stack(url, id) {
svg.append("text") svg.append("text")
.attr("class", "bar") .attr("class", "bar")
.attr("dy", "-.35em") .attr("dy", "-.35em")
//.on("click", (window.location.href = "/hashDecoded/"+'?date_from='+d.date) )
.attr('x', x(d.date) + x.bandwidth()/2) .attr('x', x(d.date) + x.bandwidth()/2)
.attr('y', y(d.total)) .attr('y', y(d.total))
{% if date_from|string == date_to|string and type is none %} {% if date_from|string == date_to|string and type is none %}
.on("click", function () {window.location.href = "/hashDecoded/"+'?date_from={{date_from}}&date_to={{date_to}}&type='+d.date }) .on("click", function () {window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}"+'?date_from={{date_from}}&date_to={{date_to}}&type='+d.date })
{% elif date_from|string == date_to|string and type is not none %} {% elif date_from|string == date_to|string and type is not none %}
.on("click", function () {window.location.href = '/hashDecoded/?type={{type}}&date_from='+d.date+'&date_to='+d.date }) .on("click", function () {window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}?type={{type}}&date_from="+d.date+'&date_to='+d.date })
{% else %} {% else %}
.on("click", function () {window.location.href = "/hashDecoded/"+'?date_from='+d.date+'&date_to='+d.date }) .on("click", function () {window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}"+'?date_from='+d.date+'&date_to='+d.date })
{% endif %} {% endif %}
.style("text-anchor", "middle") .style("text-anchor", "middle")
.text(d.total); .text(d.total);
@ -545,7 +544,7 @@ d3.json("{{ url_for('hashDecoded.decoder_type_json') }}?date_from={{date_from}}&
.attr('class', 'pie_path') .attr('class', 'pie_path')
.on("mouseover", mouseovered_pie) .on("mouseover", mouseovered_pie)
.on("mouseout", mouseouted_pie) .on("mouseout", mouseouted_pie)
.on("click", function (d) {window.location.href = '/hashDecoded/?date_from={{date_from}}&date_to={{date_to}}&type={{type}}&encoding='+d.data.name }) .on("click", function (d) {window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}?date_from={{date_from}}&date_to={{date_to}}&type={{type}}&encoding="+d.data.name })
.style('opacity', opacity_pie) .style('opacity', opacity_pie)
.style('stroke', 'white'); .style('stroke', 'white');
}); });
@ -626,7 +625,7 @@ function barchart_type(url, id) {
{% else %} {% else %}
.attr("transform", "rotate(-70)" ) .attr("transform", "rotate(-70)" )
.attr("class", "bar") .attr("class", "bar")
.on("click", function (d) { window.location.href = "/hashDecoded/"+'?date_from='+d+'&date_to='+d }); .on("click", function (d) { window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}"+'?date_from='+d+'&date_to='+d });
{% endif %} {% endif %}
svg.append("g") svg.append("g")
@ -649,10 +648,10 @@ function barchart_type(url, id) {
.attr("y", function(d) { return y(d.value); }) .attr("y", function(d) { return y(d.value); })
.attr("height", function(d) { return height - y(d.value); }) .attr("height", function(d) { return height - y(d.value); })
{% if type %} {% if type %}
.on("click", function(d){ window.location.href = "/hashDecoded/" +'?type={{type}}&date_from='+ d.date +'&date_to='+ d.date; }); .on("click", function(d){ window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}" +'?type={{type}}&date_from='+ d.date +'&date_to='+ d.date; });
{% endif %} {% endif %}
{% if daily_type_chart %} {% if daily_type_chart %}
.on("click", function(d){ window.location.href = "/hashDecoded/" +'?type='+d.date+'&date_from={{ daily_date }}&date_to={{ daily_date }}'; }); .on("click", function(d){ window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}" +'?type='+d.date+'&date_from={{ daily_date }}&date_to={{ daily_date }}'; });
{% endif %} {% endif %}

2
var/www/modules/hashDecoded/templates/showHash.html
View file

@ -151,7 +151,7 @@
Virus Total submission is disabled Virus Total submission is disabled
{% endif %} {% endif %}
<a href="/hashDecoded/downloadHash?hash={{hash}}" target="blank"> <a href="{{ url_for('hashDecoded.downloadHash') }}?hash={{hash}}" target="blank">
<button class='btn btn-info pull-right'><i id="flash-tld" class="glyphicon glyphicon-download-alt " flash-tld=""></i> Download Hashed file <button class='btn btn-info pull-right'><i id="flash-tld" class="glyphicon glyphicon-download-alt " flash-tld=""></i> Download Hashed file
</button> </button>
</a> </a>

4
var/www/modules/showpaste/templates/show_saved_paste.html
View file

@ -215,7 +215,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form method="post" action="/PasteSubmit/create_misp_event"target="_blank"> <form method="post" action="{{ url_for('PasteSubmit.create_misp_event') }}" target="_blank">
<div class="input select required"> <div class="input select required">
<label for="EventDistribution">Distribution</label> <label for="EventDistribution">Distribution</label>
@ -293,7 +293,7 @@
<div class="modal-body"> <div class="modal-body">
<form method="post" action="/PasteSubmit/create_hive_case" target="_blank"> <form method="post" action="{{ url_for('PasteSubmit.create_hive_case') }}" target="_blank">
<div class="input clear required"> <div class="input clear required">
<label for="EventThreatLevelId">Threat Level</label> <label for="EventThreatLevelId">Threat Level</label>