CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

fix: tp and fp, errors messages on paste submission

pull/208/head
Terrtia 2018-06-20 10:02:26 +02:00
parent a745b939bd
commit 225776c69c
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/submit_paste.py
View File

@ -156,7 +156,7 @@ if __name__ == "__main__":
expire_time = 120
MAX_FILE_SIZE = 1000000000
ALLOWED_EXTENSIONS = 'txt'
ALLOWED_EXTENSIONS = ['txt', 'sh', 'pdf']
config_section = 'submit_paste'
p = Process(config_section)
@ -215,7 +215,7 @@ if __name__ == "__main__":
file_type = filename.rsplit('.', 1)[1]
#txt file
if file_type == 'txt':
if file_type in ALLOWED_EXTENSIONS:
with open(file_full_path,'r') as f:
content = f.read()
r_serv_log_submit.set(uuid + ':nb_total', 1)

18
var/www/modules/PasteSubmit/Flask_PasteSubmit.py
View File

@ -56,7 +56,7 @@ PasteSubmit = Blueprint('PasteSubmit', __name__, template_folder='templates')
valid_filename_chars = "-_ %s%s" % (string.ascii_letters, string.digits)
ALLOWED_EXTENSIONS = set(['txt', 'zip', 'gz', 'tar.gz'])
ALLOWED_EXTENSIONS = set(['txt', 'sh', 'pdf', 'zip', 'gz', 'tar.gz'])
UPLOAD_FOLDER = Flask_config.UPLOAD_FOLDER
misp_event_url = Flask_config.misp_event_url
@ -297,8 +297,8 @@ def submit():
if ltags or ltagsgalaxies:
if not addTagsVerification(ltags, ltagsgalaxies):
content = {'INVALID TAGS'}
return content, status.HTTP_400_BAD_REQUEST
content = 'INVALID TAGS'
return content, 400
# add submitted tags
if(ltags != ''):
@ -345,8 +345,8 @@ def submit():
UUID = UUID)
else:
content = {'wrong file type'}
return content, status.HTTP_400_BAD_REQUEST
content = 'wrong file type, allowed_extensions: sh, pdf, zip, gz, tar.gz or remove the extension'
return content, 400
elif paste_content != '':
@ -365,11 +365,11 @@ def submit():
UUID = UUID)
else:
content = {'size error'}
return content, status.HTTP_400_BAD_REQUEST
content = 'size error'
return content, 400
content = {'submit aborded'}
return content, status.HTTP_400_BAD_REQUEST
content = 'submit aborded'
return content, 400
return PasteSubmit_page()

2
var/www/modules/PasteSubmit/templates/PasteSubmit.html
View File

@ -42,7 +42,7 @@
<div class="panel-body">
<div class="form-group">
<label for="file">Submit a file</label>
<label for="file">Submit a file </label>
<input type="file" class="form-control-file" id="file" name="file">
</div>

8
var/www/modules/Tags/Flask_Tags.py
View File

@ -308,12 +308,12 @@ def tag_validation():
if (status == 'fp' or status == 'tp') and r_serv_tags.sismember('list_tags', tag):
tag_hash = ssdeep.hash(tag)
r_serv_statistics.hset(tag_hash, status, path)
if status == 'tp':
r_serv_statistics.hdel(tag_hash, 'fp')
r_serv_statistics.sadd('tp:'+tag, path)
r_serv_statistics.srem('fp:'+tag, path)
else:
r_serv_statistics.hdel(tag_hash, 'tp')
r_serv_statistics.sadd('fp:'+tag, path)
r_serv_statistics.srem('tp:'+tag, path)
return redirect(url_for('showsavedpastes.showsavedpaste', paste=path))
else:

4
var/www/modules/showpaste/Flask_showpaste.py
View File

@ -119,11 +119,11 @@ def showpaste(content_range):
automatic = False
tag_hash = ssdeep.hash(tag)
if r_serv_statistics.hexists(tag_hash, 'tp'):
if r_serv_statistics.sismember('tp:'+tag, requested_path):
tag_status_tp = True
else:
tag_status_tp = False
if r_serv_statistics.hexists(tag_hash, 'fp'):
if r_serv_statistics.sismember('fp:'+tag, requested_path):
tag_status_fp = True
else:
tag_status_fp = False