Merge branch 'dev' of github.com:hm-seclab/YAFRA into dev

hm-seclab · Jul 15, 2021 · 3e1f947 · 3e1f947
2 parents fb312d4 + bf36c94
commit 3e1f947
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/iocextractor/core/server.py b/iocextractor/core/server.py
@@ -116,7 +116,7 @@ def refetch_blacklist():
         content = {}
         try:
             if len(Extractor.BLACKLIST) <= 0:
-                with open(os.path.abspath("../../datasets/blacklist.json")) as content:
+                with open(os.path.abspath("../datasets/blacklist.json")) as content:
                     content = json.load(content)
             else:
                 content = read_file_from_gitlab(gitlabserver=GITLAB_SERVER, token=GITLAB_TOKEN, repository=GITLAB_REPO_NAME, file="blacklist.json", servicename=SERVICENAME, branch_name="master")

diff --git a/scraper/core/server.py b/scraper/core/server.py
@@ -284,9 +284,9 @@ def refetch_sources():
         twitter_content = {}
         try:
             if len(Scraper.SOURCES) <= 0:
-                with open(os.path.abspath("../../datasets/sources/api_sources.json")) as api_content, open(
-                    os.path.abspath("../../datasets/sources/rss_sources.json")) as rss_content, open(
-                    os.path.abspath("../../datasets/sources/twitter_sources.json")) as twitter_content:
+                with open(os.path.abspath("../datasets/sources/api_sources.json")) as api_content, open(
+                    os.path.abspath("../datasets/sources/rss_sources.json")) as rss_content, open(
+                    os.path.abspath("../datasets/sources/twitter_sources.json")) as twitter_content:
                     api_content = json.load(api_content)
                     rss_content = json.load(rss_content)
                     twitter_content = json.load(twitter_content)