From 72f1f156599448345cb60607f27e56e924fcede8 Mon Sep 17 00:00:00 2001 From: Terrtia Date: Wed, 1 Apr 2020 09:58:47 +0200 Subject: [PATCH] chg: [crawler] edit cookie and cookiejar + add cookie to cookiejar + fix screenshot duplicate --- bin/lib/Screenshot.py | 2 +- bin/lib/crawlers.py | 100 ++++++++-- bin/torcrawler/tor_crawler.py | 2 +- var/www/blueprints/crawler_splash.py | 139 +++++++++++++- .../crawler/crawler_splash/add_cookie.html | 116 ++++++++++++ .../crawler/crawler_splash/add_cookiejar.html | 64 +------ .../crawler_splash/add_cookies_block.html | 58 ++++++ .../crawler/crawler_splash/all_cookies.html | 99 ---------- .../crawler_splash/cookie_edit_block.html | 37 ++++ .../crawler_splash/cookies_card_block.html | 36 ++++ .../crawler/crawler_splash/edit_cookie.html | 102 +++++++++++ .../crawler_splash/show_cookiejar.html | 171 ++++++------------ .../crawler_splash/table_cookiejar.html | 2 +- 13 files changed, 628 insertions(+), 300 deletions(-) create mode 100644 var/www/templates/crawler/crawler_splash/add_cookie.html create mode 100644 var/www/templates/crawler/crawler_splash/add_cookies_block.html delete mode 100644 var/www/templates/crawler/crawler_splash/all_cookies.html create mode 100644 var/www/templates/crawler/crawler_splash/cookie_edit_block.html create mode 100644 var/www/templates/crawler/crawler_splash/cookies_card_block.html create mode 100644 var/www/templates/crawler/crawler_splash/edit_cookie.html diff --git a/bin/lib/Screenshot.py b/bin/lib/Screenshot.py index 0bed9c9b..46141e30 100755 --- a/bin/lib/Screenshot.py +++ b/bin/lib/Screenshot.py @@ -175,7 +175,7 @@ def save_crawled_screeshot(b64_screenshot, max_size, f_save=False): filepath = get_screenshot_filepath(sha256_string) if os.path.isfile(filepath): #print('File already exist') - return False + return sha256_string # create dir dirname = os.path.dirname(filepath) if not os.path.exists(dirname): diff --git a/bin/lib/crawlers.py b/bin/lib/crawlers.py index c31d40af..6e876349 100755 --- a/bin/lib/crawlers.py +++ b/bin/lib/crawlers.py @@ -39,7 +39,11 @@ def generate_uuid(): # # TODO: handle prefix cookies # # TODO: fill empty fields -def create_cookie_crawler(cookie_dict, crawler_type='regular'): +def create_cookie_crawler(cookie_dict, domain, crawler_type='regular'): + # check cookie domain filed + if not 'domain' in cookie_dict: + cookie_dict['domain'] = '.{}'.format(domain) + # tor browser: disable secure cookie if crawler_type=='onion': cookie_dict['secure'] = False @@ -53,11 +57,11 @@ def create_cookie_crawler(cookie_dict, crawler_type='regular'): cookie_dict['expires'] = (datetime.now() + timedelta(days=10)).strftime('%Y-%m-%dT%H:%M:%S') + 'Z' return cookie_dict -def load_crawler_cookies(cookiejar_uuid, crawler_type='regular'): +def load_crawler_cookies(cookiejar_uuid, domain, crawler_type='regular'): cookies = get_cookiejar_cookies_list(cookiejar_uuid) all_cookies = [] for cookie_dict in cookies: - all_cookies.append(create_cookie_crawler(cookie_dict, crawler_type=crawler_type)) + all_cookies.append(create_cookie_crawler(cookie_dict, domain, crawler_type=crawler_type)) return all_cookies ################################################################################ @@ -118,10 +122,13 @@ def get_cookiejar_cookies_uuid(cookiejar_uuid): res = [] return res -def get_cookiejar_cookies_list(cookiejar_uuid): +def get_cookiejar_cookies_list(cookiejar_uuid, add_cookie_uuid=False): l_cookiejar = [] for cookie_uuid in get_cookiejar_cookies_uuid(cookiejar_uuid): - l_cookiejar.append(get_cookie_dict(cookie_uuid)) + if add_cookie_uuid: + l_cookiejar.append((get_cookie_dict(cookie_uuid), cookie_uuid)) + else: + l_cookiejar.append(get_cookie_dict(cookie_uuid)) return l_cookiejar ## Cookiejar metadata ## @@ -160,6 +167,9 @@ def get_cookiejar_metadata_by_iterator(iter_cookiejar_uuid): l_cookiejar_metadata.append(get_cookiejar_metadata(cookiejar_uuid)) return l_cookiejar_metadata +def edit_cookiejar_description(cookiejar_uuid, description): + r_serv_onion.hset('cookiejar_metadata:{}'.format(cookiejar_uuid), 'description', description) + # # # # # # # # # # # COOKIES # @@ -176,6 +186,8 @@ def get_cookiejar_metadata_by_iterator(iter_cookiejar_uuid): # - httpOnly (optional) # - text (optional) # # # # +def get_cookie_all_keys_name(): + return ['name', 'value', 'domain', 'path', 'httpOnly', 'secure'] def exists_cookie(cookie_uuid): if int(r_serv_onion.scard('cookies:map:cookiejar:{}'.format(cookie_uuid))) > 0: @@ -188,6 +200,9 @@ def get_cookie_value(cookie_uuid, name): def set_cookie_value(cookie_uuid, name, value): r_serv_onion.hset('cookiejar:cookie:{}'.format(cookie_uuid), name, value) +def delete_cookie_value(cookie_uuid, name): + r_serv_onion.hdel('cookiejar:cookie:{}'.format(cookie_uuid), name) + def get_cookie_dict(cookie_uuid): cookie_dict = {} for key_name in r_serv_onion.hkeys('cookiejar:cookie:{}'.format(cookie_uuid)): @@ -226,7 +241,18 @@ def delete_cookie_from_cookiejar(cookiejar_uuid, cookie_uuid): r_serv_onion.srem('cookiejar:{}:cookies:uuid'.format(cookiejar_uuid), cookie_uuid) r_serv_onion.srem('cookies:map:cookiejar:{}'.format(cookie_uuid), cookiejar_uuid) if not exists_cookie(cookie_uuid): - r_serv_onion.delete('cookiejar:cookie:{}'.format(cookies_uuid)) + r_serv_onion.delete('cookiejar:cookie:{}'.format(cookie_uuid)) + +def edit_cookie(cookiejar_uuid, cookie_uuid, cookie_dict): + # delete old keys + for key_name in r_serv_onion.hkeys('cookiejar:cookie:{}'.format(cookie_uuid)): + if key_name not in cookie_dict: + delete_cookie_value(cookie_uuid, key_name) + # add new keys + cookie_all_keys_name = get_cookie_all_keys_name() + for key_name in cookie_dict: + if key_name in cookie_all_keys_name: + set_cookie_value(cookie_uuid, key_name, cookie_dict[key_name]) ## - - ## ## Cookies import ## # TODO: add browser type ? @@ -265,7 +291,7 @@ def api_import_cookies_from_json(json_cookies_str, cookiejar_uuid): # # TODO: ad #### COOKIES API #### -def api_get_cookiejar_cookies_uuid(cookiejar_uuid, user_id): +def api_verify_basic_cookiejar(cookiejar_uuid, user_id): if not exist_cookiejar(cookiejar_uuid): return ({'error': 'unknow cookiejar uuid', 'cookiejar_uuid': cookiejar_uuid}, 404) level = get_cookiejar_level(cookiejar_uuid) @@ -273,21 +299,28 @@ def api_get_cookiejar_cookies_uuid(cookiejar_uuid, user_id): cookie_owner = get_cookiejar_owner(cookiejar_uuid) if cookie_owner != user_id: return ({'error': 'The access to this cookiejar is restricted'}, 403) - res = get_cookiejar_cookies_uuid(cookiejar_uuid) - res = {'json_cookies': res[0], 'manual_cookies': res[1]} - return (res, 200) def api_get_cookiejar_cookies(cookiejar_uuid, user_id): - if not exist_cookiejar(cookiejar_uuid): - return ({'error': 'unknow cookiejar uuid', 'cookiejar_uuid': cookiejar_uuid}, 404) - level = get_cookiejar_level(cookiejar_uuid) - if level == 0: # # TODO: check if user is admin - cookie_owner = get_cookiejar_owner(cookiejar_uuid) - if cookie_owner != user_id: - return ({'error': 'The access to this cookiejar is restricted'}, 403) + res = api_verify_basic_cookiejar(cookiejar_uuid, user_id) + if res: + return res res = get_cookiejar_cookies_list(cookiejar_uuid) return (res, 200) +def api_edit_cookiejar_description(user_id, cookiejar_uuid, description): + res = api_verify_basic_cookiejar(cookiejar_uuid, user_id) + if res: + return res + edit_cookiejar_description(cookiejar_uuid, description) + return ({'cookiejar_uuid': cookiejar_uuid}, 200) + +def api_get_cookiejar_cookies_with_uuid(cookiejar_uuid, user_id): + res = api_verify_basic_cookiejar(cookiejar_uuid, user_id) + if res: + return res + res = get_cookiejar_cookies_list(cookiejar_uuid, add_cookie_uuid=True) + return (res, 200) + def api_get_cookies_list_select(user_id): l_cookiejar = [] for cookies_uuid in get_global_cookiejar(): @@ -295,6 +328,39 @@ def api_get_cookies_list_select(user_id): for cookies_uuid in get_user_cookiejar(user_id): l_cookiejar.append('{} : {}'.format(get_cookiejar_description(cookies_uuid), cookies_uuid)) return sorted(l_cookiejar) + +def api_delete_cookie_from_cookiejar(user_id, cookiejar_uuid, cookie_uuid): + res = api_verify_basic_cookiejar(cookiejar_uuid, user_id) + if res: + return res + delete_cookie_from_cookiejar(cookiejar_uuid, cookie_uuid) + return ({'cookiejar_uuid': cookiejar_uuid, 'cookie_uuid': cookie_uuid}, 200) + +def api_delete_cookie_jar(user_id, cookiejar_uuid): + res = api_verify_basic_cookiejar(cookiejar_uuid, user_id) + if res: + return res + delete_cookie_jar(cookiejar_uuid) + return ({'cookiejar_uuid': cookiejar_uuid}, 200) + +def api_edit_cookie(user_id, cookiejar_uuid, cookie_uuid, cookie_dict): + res = api_verify_basic_cookiejar(cookiejar_uuid, user_id) + if res: + return res + if 'name' not in cookie_dict or 'value' not in cookie_dict or cookie_dict['name'] == '': + ({'error': 'cookie name or value not provided'}, 400) + edit_cookie(cookiejar_uuid, cookie_uuid, cookie_dict) + return (get_cookie_dict(cookie_uuid), 200) + +def api_create_cookie(user_id, cookiejar_uuid, cookie_dict): + res = api_verify_basic_cookiejar(cookiejar_uuid, user_id) + if res: + return res + if 'name' not in cookie_dict or 'value' not in cookie_dict or cookie_dict['name'] == '': + ({'error': 'cookie name or value not provided'}, 400) + res = add_cookie_to_cookiejar(cookiejar_uuid, cookie_dict) + return (res, 200) + #### #### #### CRAWLER TASK #### diff --git a/bin/torcrawler/tor_crawler.py b/bin/torcrawler/tor_crawler.py index db263fad..f060482b 100755 --- a/bin/torcrawler/tor_crawler.py +++ b/bin/torcrawler/tor_crawler.py @@ -39,7 +39,7 @@ if __name__ == '__main__': requested_mode = crawler_json['requested'] if crawler_options['cookiejar_uuid']: - cookies = crawlers.load_crawler_cookies(crawler_options['cookiejar_uuid'], crawler_type=service_type) + cookies = crawlers.load_crawler_cookies(crawler_options['cookiejar_uuid'], domain, crawler_type=service_type) else: cookies = [] diff --git a/var/www/blueprints/crawler_splash.py b/var/www/blueprints/crawler_splash.py index 510e93f9..d2d3c65a 100644 --- a/var/www/blueprints/crawler_splash.py +++ b/var/www/blueprints/crawler_splash.py @@ -245,7 +245,8 @@ def crawler_cookiejar_add_post(): return create_json_response(res[0], res[1]) if l_manual_cookie: crawlers.add_cookies_to_cookiejar(cookiejar_uuid, l_manual_cookie) - return render_template("add_cookiejar.html") + + return redirect(url_for('crawler_splash.crawler_cookiejar_show', cookiejar_uuid=cookiejar_uuid)) @crawler_splash.route('/crawler/cookiejar/all', methods=['GET']) #@login_required @@ -263,13 +264,143 @@ def crawler_cookiejar_show(): user_id = current_user.get_id() cookiejar_uuid = request.args.get('cookiejar_uuid') - res = crawlers.api_get_cookiejar_cookies(cookiejar_uuid, user_id) + res = crawlers.api_get_cookiejar_cookies_with_uuid(cookiejar_uuid, user_id) if res[1] !=200: return create_json_response(res[0], res[1]) cookiejar_metadata = crawlers.get_cookiejar_metadata(cookiejar_uuid, level=False) - cookies = json.dumps(res[0], indent=4, sort_keys=True) - return render_template("show_cookiejar.html", cookiejar_metadata=cookiejar_metadata, l_cookies=cookies) + l_cookies = [] + l_cookie_uuid = [] + for cookie in res[0]: + l_cookies.append(json.dumps(cookie[0], indent=4, sort_keys=True)) + l_cookie_uuid.append(cookie[1]) + return render_template("show_cookiejar.html", cookiejar_uuid=cookiejar_uuid, cookiejar_metadata=cookiejar_metadata, + l_cookies=l_cookies, l_cookie_uuid=l_cookie_uuid) + +@crawler_splash.route('/crawler/cookiejar/cookie/delete', methods=['GET']) +#@login_required +#@login_read_only +def crawler_cookiejar_cookie_delete(): + user_id = current_user.get_id() + cookiejar_uuid = request.args.get('cookiejar_uuid') + cookie_uuid = request.args.get('cookie_uuid') + + res = crawlers.api_delete_cookie_from_cookiejar(user_id, cookiejar_uuid, cookie_uuid) + if res[1] !=200: + return create_json_response(res[0], res[1]) + return redirect(url_for('crawler_splash.crawler_cookiejar_show', cookiejar_uuid=cookiejar_uuid)) + +@crawler_splash.route('/crawler/cookiejar/delete', methods=['GET']) +#@login_required +#@login_read_only +def crawler_cookiejar_delete(): + user_id = current_user.get_id() + cookiejar_uuid = request.args.get('cookiejar_uuid') + + res = crawlers.api_delete_cookie_jar(user_id, cookiejar_uuid) + if res[1] !=200: + return create_json_response(res[0], res[1]) + return redirect(url_for('crawler_splash.crawler_cookiejar_all')) + +@crawler_splash.route('/crawler/cookiejar/edit', methods=['GET']) +@login_required +@login_read_only +def crawler_cookiejar_edit(): + user_id = current_user.get_id() + cookiejar_uuid = request.args.get('cookiejar_uuid') + description = request.args.get('description') + + res = crawlers.api_edit_cookiejar_description(user_id, cookiejar_uuid, description) + return create_json_response(res[0], res[1]) + +@crawler_splash.route('/crawler/cookiejar/cookie/edit', methods=['GET']) +@login_required +@login_read_only +def crawler_cookiejar_cookie_edit(): + user_id = current_user.get_id() + cookiejar_uuid = request.args.get('cookiejar_uuid') + cookie_uuid = request.args.get('cookie_uuid') + + cookie_dict = crawlers.get_cookie_dict(cookie_uuid) + return render_template("edit_cookie.html", cookiejar_uuid=cookiejar_uuid, cookie_uuid=cookie_uuid, cookie_dict=cookie_dict) + +@crawler_splash.route('/crawler/cookiejar/cookie/edit_post', methods=['POST']) +@login_required +@login_read_only +def crawler_cookiejar_cookie_edit_post(): + user_id = current_user.get_id() + cookiejar_uuid = request.form.get('cookiejar_uuid') + cookie_uuid = request.form.get('cookie_uuid') + name = request.form.get('name') + value = request.form.get('value') + domain = request.form.get('domain') + path = request.form.get('path') + httpOnly = request.form.get('httpOnly') + secure = request.form.get('secure') + + cookie_dict = {'name': name, 'value': value} + if domain: + cookie_dict['domain'] = domain + if path: + cookie_dict['path'] = path + if httpOnly: + cookie_dict['httpOnly'] = True + if secure: + cookie_dict['secure'] = True + + res = crawlers.api_edit_cookie(user_id, cookiejar_uuid, cookie_uuid, cookie_dict) + if res[1] != 200: + return create_json_response(res[0], res[1]) + return redirect(url_for('crawler_splash.crawler_cookiejar_show', cookiejar_uuid=cookiejar_uuid)) + +@crawler_splash.route('/crawler/cookiejar/cookie/add', methods=['GET']) +@login_required +@login_read_only +def crawler_cookiejar_cookie_add(): + user_id = current_user.get_id() + cookiejar_uuid = request.args.get('cookiejar_uuid') + return render_template("add_cookie.html", cookiejar_uuid=cookiejar_uuid) + +@crawler_splash.route('/crawler/cookiejar/cookie/manual_add_post', methods=['POST']) +@login_required +@login_read_only +def crawler_cookiejar_cookie_manual_add_post(): + user_id = current_user.get_id() + cookiejar_uuid = request.form.get('cookiejar_uuid') + name = request.form.get('name') + value = request.form.get('value') + domain = request.form.get('domain') + path = request.form.get('path') + httpOnly = request.form.get('httpOnly') + secure = request.form.get('secure') + + cookie_dict = {'name': name, 'value': value} + if domain: + cookie_dict['domain'] = domain + if path: + cookie_dict['path'] = path + if httpOnly: + cookie_dict['httpOnly'] = True + if secure: + cookie_dict['secure'] = True + + return redirect(url_for('crawler_splash.crawler_cookiejar_show', cookiejar_uuid=cookiejar_uuid)) + +@crawler_splash.route('/crawler/cookiejar/cookie/json_add_post', methods=['POST']) +@login_required +@login_read_only +def crawler_cookiejar_cookie_json_add_post(): + user_id = current_user.get_id() + cookiejar_uuid = request.form.get('cookiejar_uuid') + + if 'file' in request.files: + file = request.files['file'] + json_cookies = file.read().decode() + if json_cookies: + res = crawlers.api_import_cookies_from_json(json_cookies, cookiejar_uuid) + return redirect(url_for('crawler_splash.crawler_cookiejar_show', cookiejar_uuid=cookiejar_uuid)) + + return redirect(url_for('crawler_splash.crawler_cookiejar_cookie_add', cookiejar_uuid=cookiejar_uuid)) ## - - ## diff --git a/var/www/templates/crawler/crawler_splash/add_cookie.html b/var/www/templates/crawler/crawler_splash/add_cookie.html new file mode 100644 index 00000000..28893e05 --- /dev/null +++ b/var/www/templates/crawler/crawler_splash/add_cookie.html @@ -0,0 +1,116 @@ + + + + + AIL - Add Cookies + + + + + + + + + + + + + + + {% include 'nav_bar.html' %} + +
+
+ + {% include 'crawler/menu_sidebar.html' %} + +
+ +
+
+
+
+
Add Cookie to cookiejar: {{cookiejar_uuid}}
+
+
+ + + +
+
+
+
+ +
+ + {% include 'crawler/crawler_splash/cookie_edit_block.html' %} +
+ +
+ +
+ +
+ +
+ +
Import cookies from file:
+
+ + +
+ +
+ +
+
+ +
+
+ +
+
+
+ + + + diff --git a/var/www/templates/crawler/crawler_splash/add_cookiejar.html b/var/www/templates/crawler/crawler_splash/add_cookiejar.html index ddd2dd2d..2a60b016 100644 --- a/var/www/templates/crawler/crawler_splash/add_cookiejar.html +++ b/var/www/templates/crawler/crawler_splash/add_cookiejar.html @@ -7,7 +7,6 @@ - @@ -56,47 +55,12 @@
-
Import cookies:
+ {% include 'crawler/crawler_splash/add_cookies_block.html' %} +
- - +
-
- -
- -
Create cookies
- -
-
Cookie Name
-
Cookie Value
-
- -
-
-
-
-
- - - -
- -
- - -
-
-
-
- -
- -
- -
- @@ -118,22 +82,6 @@ $(document).ready(function(){ $("#nav_title_cookiejar").removeClass("text-muted"); }); -var input_1 = '
'; -var minusButton = '
'; - -$('.add-field').click(function() { - var new_uuid = uuidv4(); - var template = input_1 + new_uuid + input_2 + new_uuid + input_3; - var temp = $(template).insertBefore('.help-block'); - temp.append(minusButton); -}); - -$('.fields').on('click', '.delete-field', function(){ - $(this).parent().remove(); -}); - function toggle_sidebar(){ if($('#nav_menu').is(':visible')){ $('#nav_menu').hide(); @@ -148,10 +96,4 @@ function toggle_sidebar(){ } } -function uuidv4() { - return ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c => - (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16) - ); -} - diff --git a/var/www/templates/crawler/crawler_splash/add_cookies_block.html b/var/www/templates/crawler/crawler_splash/add_cookies_block.html new file mode 100644 index 00000000..45a57b88 --- /dev/null +++ b/var/www/templates/crawler/crawler_splash/add_cookies_block.html @@ -0,0 +1,58 @@ +
Import cookies:
+
+ + +
+ +
+ +
+
Create cookies:
+ +
+
Cookie Name
+
Cookie Value
+
+ +
+
+
+
+
+ + + +
+ +
+ + +
+
+
+
+
+ + diff --git a/var/www/templates/crawler/crawler_splash/all_cookies.html b/var/www/templates/crawler/crawler_splash/all_cookies.html deleted file mode 100644 index 4ee6b535..00000000 --- a/var/www/templates/crawler/crawler_splash/all_cookies.html +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - AIL - Cookies - - - - - - - - - - - - - - - {% include 'nav_bar.html' %} - -
-
- - {% include 'crawler/menu_sidebar.html' %} - -
- -
-
-
Your Cookies
-
-
- {% with all_cookies=user_cookies, table_id='table_user'%} - {% include 'crawler/crawler_splash/table_cookies.html' %} - {% endwith %} -
-
- -
-
-
Global Cookies
-
-
- {% with all_cookies=global_cookies, table_id='table_global'%} - {% include 'crawler/crawler_splash/table_cookies.html' %} - {% endwith %} -
-
- - - - Add Cookies - - -
-
-
- - - - - diff --git a/var/www/templates/crawler/crawler_splash/cookie_edit_block.html b/var/www/templates/crawler/crawler_splash/cookie_edit_block.html new file mode 100644 index 00000000..7ef5fcdc --- /dev/null +++ b/var/www/templates/crawler/crawler_splash/cookie_edit_block.html @@ -0,0 +1,37 @@ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ + +
+
+ + +
diff --git a/var/www/templates/crawler/crawler_splash/cookies_card_block.html b/var/www/templates/crawler/crawler_splash/cookies_card_block.html new file mode 100644 index 00000000..6ae194ea --- /dev/null +++ b/var/www/templates/crawler/crawler_splash/cookies_card_block.html @@ -0,0 +1,36 @@ +{% for dict_cookie in l_elem %} + + {% if loop.index0 % 4 == 0 %} +
+ {% endif %} + +
+
+
+
+ + + +
+
+ + + +
+
+ +
+
+ 
{{dict_cookie}}
+
+
+ + {% if loop.index0 % 4 == 3 %} +
+ {% endif %} + +{% endfor %} + +{% if l_elem|length % 4 != 0 %} + +{% endif %} diff --git a/var/www/templates/crawler/crawler_splash/edit_cookie.html b/var/www/templates/crawler/crawler_splash/edit_cookie.html new file mode 100644 index 00000000..4d551837 --- /dev/null +++ b/var/www/templates/crawler/crawler_splash/edit_cookie.html @@ -0,0 +1,102 @@ + + + + + AIL - Add Cookies + + + + + + + + + + + + + + + {% include 'nav_bar.html' %} + +
+
+ + {% include 'crawler/menu_sidebar.html' %} + +
+ +
+
+
+
+
Edit Cookie: {{cookie_uuid}}
+
+
+ + + +
+
+
+
+ +
+ + + {% include 'crawler/crawler_splash/cookie_edit_block.html' %} +
+ +
+ +
+ +
+
+ +
+
+
+ + + + diff --git a/var/www/templates/crawler/crawler_splash/show_cookiejar.html b/var/www/templates/crawler/crawler_splash/show_cookiejar.html index 4ae8063d..8de57214 100644 --- a/var/www/templates/crawler/crawler_splash/show_cookiejar.html +++ b/var/www/templates/crawler/crawler_splash/show_cookiejar.html @@ -27,108 +27,51 @@
- - - - - - - - - - - - - - - - - -
DescriptionDateUUIDUser
{{dict_cookiejar['description']}} - {%if dict_cookiejar['date']%} - {{dict_cookiejar['date'][0:4]}}/{{dict_cookiejar['date'][4:6]}}/{{dict_cookiejar['date'][6:8]}} - {%endif%} - - {{ dict_cookiejar['cookiejar_uuid']}} - {{dict_cookiejar['user_id']}}
-
-
-
Create Cookijar
-
-
- - -
- -
-
-
-
-
-
- -
-
-
-
- - -
-
-
- -
- -
Import cookies:
-
- - -
- -
- -
- -
Create cookies
- -
-
Cookie Name
-
Cookie Value
-
- -
-
-
-
-
- - - -
- -
- - -
-
-
-
- +
+
+
+
Edit Cookiejar
- -
- +
+ + +
- - -
+
+
+ {% with all_cookiejar=[cookiejar_metadata], table_id='table_cookiejar'%} + {% include 'crawler/crawler_splash/table_cookiejar.html' %} + {% endwith %} + + + + + + + + +
+ +
+ +
+
+ +
+
- + {% with l_elem=l_cookies, l_cookie_uuid=l_cookie_uuid, cookiejar_uuid=cookiejar_uuid %} + {% include 'crawler/crawler_splash/cookies_card_block.html' %} + {% endwith %}
@@ -139,26 +82,11 @@ diff --git a/var/www/templates/crawler/crawler_splash/table_cookiejar.html b/var/www/templates/crawler/crawler_splash/table_cookiejar.html index 74ab6959..0f7eb5ae 100644 --- a/var/www/templates/crawler/crawler_splash/table_cookiejar.html +++ b/var/www/templates/crawler/crawler_splash/table_cookiejar.html @@ -10,7 +10,7 @@ {% for dict_cookiejar in all_cookiejar %} - {{dict_cookiejar['description']}} + {{dict_cookiejar['description']}} {%if dict_cookiejar['date']%} {{dict_cookiejar['date'][0:4]}}/{{dict_cookiejar['date'][4:6]}}/{{dict_cookiejar['date'][6:8]}}