From 89e95ca030a562366306e55ebd312e820e0c2c13 Mon Sep 17 00:00:00 2001 From: Terrtia Date: Wed, 3 Feb 2021 14:22:26 +0100 Subject: [PATCH] fix: [redis cache] remove old paste_name db --- .gitignore | 3 +++ bin/ModuleStats.py | 11 ++--------- configs/core.cfg.sample | 5 ----- var/www/modules/Flask_config.py | 1 - var/www/modules/search/Flask_search.py | 13 +------------ var/www/modules/showpaste/Flask_showpaste.py | 2 -- var/www/templates/domains/card_img_domain.html | 6 +++++- 7 files changed, 11 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index ac4837a3..046d0cbc 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,9 @@ configs/update.cfg update/current_version files +# Trackers +bin/trackers/yara/custom-rules/* + # Helper bin/helper/gen_cert/rootCA.* bin/helper/gen_cert/server.* diff --git a/bin/ModuleStats.py b/bin/ModuleStats.py index cfdb82f7..7cf67299 100755 --- a/bin/ModuleStats.py +++ b/bin/ModuleStats.py @@ -57,7 +57,7 @@ def compute_most_posted(server, message): print(redis_progression_name_set) -def compute_provider_info(server_trend, server_pasteName, path): +def compute_provider_info(server_trend, path): redis_all_provider = 'all_provider_set' paste = Paste.Paste(path) @@ -71,7 +71,6 @@ def compute_provider_info(server_trend, server_pasteName, path): redis_providers_name_set = 'providers_set_' + paste_date # Add/Update in Redis - server_pasteName.sadd(paste_baseName, path) server_trend.sadd(redis_all_provider, paste_provider) num_paste = int(server_trend.hincrby(paste_provider+'_num', paste_date, 1)) @@ -137,12 +136,6 @@ if __name__ == '__main__': db=p.config.get("ARDB_Trending", "db"), decode_responses=True) - r_serv_pasteName = redis.StrictRedis( - host=p.config.get("Redis_Paste_Name", "host"), - port=p.config.get("Redis_Paste_Name", "port"), - db=p.config.get("Redis_Paste_Name", "db"), - decode_responses=True) - # Endless loop getting messages from the input queue while True: # Get one message from the input queue @@ -159,4 +152,4 @@ if __name__ == '__main__': if len(message.split(';')) > 1: compute_most_posted(r_serv_trend, message) else: - compute_provider_info(r_serv_trend, r_serv_pasteName, message) + compute_provider_info(r_serv_trend, message) diff --git a/configs/core.cfg.sample b/configs/core.cfg.sample index 9dd00e3b..c6988bbb 100644 --- a/configs/core.cfg.sample +++ b/configs/core.cfg.sample @@ -147,11 +147,6 @@ host = localhost port = 6379 db = 1 -[Redis_Paste_Name] -host = localhost -port = 6379 -db = 2 - [Redis_Mixer_Cache] host = localhost port = 6381 diff --git a/var/www/modules/Flask_config.py b/var/www/modules/Flask_config.py index 7d11e484..574c9950 100644 --- a/var/www/modules/Flask_config.py +++ b/var/www/modules/Flask_config.py @@ -26,7 +26,6 @@ r_serv_charts = config_loader.get_redis_conn("ARDB_Trending") r_serv_sentiment = config_loader.get_redis_conn("ARDB_Sentiment") r_serv_term = config_loader.get_redis_conn("ARDB_Tracker") r_serv_cred = config_loader.get_redis_conn("ARDB_TermCred") -r_serv_pasteName = config_loader.get_redis_conn("Redis_Paste_Name") r_serv_tags = config_loader.get_redis_conn("ARDB_Tags") r_serv_metadata = config_loader.get_redis_conn("ARDB_Metadata") r_serv_db = config_loader.get_redis_conn("ARDB_DB") diff --git a/var/www/modules/search/Flask_search.py b/var/www/modules/search/Flask_search.py index ff5395e6..cbc1f633 100644 --- a/var/www/modules/search/Flask_search.py +++ b/var/www/modules/search/Flask_search.py @@ -27,7 +27,6 @@ import Flask_config app = Flask_config.app config_loader = Flask_config.config_loader baseUrl = Flask_config.baseUrl -r_serv_pasteName = Flask_config.r_serv_pasteName r_serv_metadata = Flask_config.r_serv_metadata max_preview_char = Flask_config.max_preview_char max_preview_modal = Flask_config.max_preview_modal @@ -116,17 +115,7 @@ def search(): selected_index = os.path.join(baseindexpath, index_name) ''' temporary disabled - # Search filename - for path in r_serv_pasteName.smembers(q[0]): - r.append(path) - paste = Paste.Paste(path) - content = paste.get_p_content() - content_range = max_preview_char if len(content)>max_preview_char else len(content)-1 - c.append(content[0:content_range]) - curr_date = str(paste._get_p_date()) - curr_date = curr_date[0:4]+'/'+curr_date[4:6]+'/'+curr_date[6:] - paste_date.append(curr_date) - paste_size.append(paste._get_p_size()) + # # TODO: search by filename/item id ''' # Search full line diff --git a/var/www/modules/showpaste/Flask_showpaste.py b/var/www/modules/showpaste/Flask_showpaste.py index 7fc209ba..8bdf0984 100644 --- a/var/www/modules/showpaste/Flask_showpaste.py +++ b/var/www/modules/showpaste/Flask_showpaste.py @@ -32,11 +32,9 @@ import Flask_config app = Flask_config.app baseUrl = Flask_config.baseUrl -r_serv_pasteName = Flask_config.r_serv_pasteName r_serv_metadata = Flask_config.r_serv_metadata r_serv_tags = Flask_config.r_serv_tags r_serv_statistics = Flask_config.r_serv_statistics -r_serv_onion = Flask_config.r_serv_onion max_preview_char = Flask_config.max_preview_char max_preview_modal = Flask_config.max_preview_modal DiffMaxLineLength = Flask_config.DiffMaxLineLength diff --git a/var/www/templates/domains/card_img_domain.html b/var/www/templates/domains/card_img_domain.html index 3df796e8..fbb67bc8 100644 --- a/var/www/templates/domains/card_img_domain.html +++ b/var/www/templates/domains/card_img_domain.html @@ -11,7 +11,11 @@
- {{dict_domain["id"]}} + {% if 'hl-start' in dict_domain %} + {{dict_domain["id"][:dict_domain['hl-start']]}}{{dict_domain["id"][dict_domain['hl-start']:dict_domain['hl-end']]}}{{dict_domain["id"][dict_domain['hl-end']:]}} + {% else %} + {{dict_domain["id"]}} + {% endif %} {% if dict_domain["status"] %}