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

add tracker fixed api function replaced it with internal function

pull/586/head
TonyJabbour 2021-11-19 10:55:47 +01:00
parent a0c978f2c7
commit de9799e7ff
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/packages/Term.py
View File

@ -152,10 +152,15 @@ def parse_json_term_to_add(dict_input, user_id):
term_type = dict_input.get('type', None) term_type = dict_input.get('type', None)
if not term_type: if not term_type:
return {"status": "error", "reason": "Term type not provided"}, 400 return {"status": "error", "reason": "Term type not provided"}, 400
nb_words = dict_input.get('nb_words', 1) nb_words = dict_input.get('nb_words', 1)
description = dict_input.get('description', '') description = dict_input.get('description', '')
description = escape(description) description = escape(description)
webhook = dict_input.get('webhook', '')
webhook = escape(webhook)
res = parse_tracked_term_to_add(term , term_type, nb_words=nb_words) res = parse_tracked_term_to_add(term , term_type, nb_words=nb_words)
if res[1]!=200: if res[1]!=200:
return res return res
@ -168,7 +173,6 @@ def parse_json_term_to_add(dict_input, user_id):
if res: if res:
return res return res
## TODO: add dashboard key
level = dict_input.get('level', 1) level = dict_input.get('level', 1)
try: try:
level = int(level) level = int(level)
@ -185,7 +189,7 @@ def parse_json_term_to_add(dict_input, user_id):
if is_term_tracked_in_user_level(term, term_type, user_id): if is_term_tracked_in_user_level(term, term_type, user_id):
return {"status": "error", "reason": "Term already tracked"}, 409 return {"status": "error", "reason": "Term already tracked"}, 409
term_uuid = add_tracked_term(term , term_type, user_id, level, tags, mails, description) term_uuid = add_tracked_term(term , term_type, user_id, level, tags, mails, description,webhook)
return {'term': term, 'type': term_type, 'uuid': term_uuid}, 200 return {'term': term, 'type': term_type, 'uuid': term_uuid}, 200
@ -234,7 +238,7 @@ def parse_tracked_term_to_add(term , term_type, nb_words=1):
return {"status": "error", "reason": "Incorrect type"}, 400 return {"status": "error", "reason": "Incorrect type"}, 400
return {"status": "success", "term": term, "type": term_type}, 200 return {"status": "success", "term": term, "type": term_type}, 200
def add_tracked_term(term , term_type, user_id, level, tags, mails, description, dashboard=0): def add_tracked_term(term , term_type, user_id, level, tags, mails, description,webhook, dashboard=0):
term_uuid = str(uuid.uuid4()) term_uuid = str(uuid.uuid4())
@ -254,6 +258,9 @@ def add_tracked_term(term , term_type, user_id, level, tags, mails, description,
if description: if description:
r_serv_term.hset('tracker:{}'.format(term_uuid), 'description', description) r_serv_term.hset('tracker:{}'.format(term_uuid), 'description', description)
if webhook:
r_serv_term.hset('tracker:{}'.format(term_uuid), 'webhook', webhook)
# create all term set # create all term set
r_serv_term.sadd('all:tracker:{}'.format(term_type), term) r_serv_term.sadd('all:tracker:{}'.format(term_type), term)

2
var/www/modules/restApi/Flask_restApi.py
View File

@ -368,7 +368,7 @@ def add_tracker_term():
data = request.get_json() data = request.get_json()
user_token = get_auth_from_header() user_token = get_auth_from_header()
user_id = get_user_from_token(user_token) user_id = get_user_from_token(user_token)
res = Term.parse_json_term_to_add(data, user_id) res = Tracker.api_add_tracker(data, user_id)
return Response(json.dumps(res[0], indent=2, sort_keys=True), mimetype='application/json'), res[1] return Response(json.dumps(res[0], indent=2, sort_keys=True), mimetype='application/json'), res[1]
@restApi.route("api/v1/delete/tracker", methods=['DELETE']) @restApi.route("api/v1/delete/tracker", methods=['DELETE'])