diff --git a/README.md b/README.md index a1503054..cbb17521 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Installation Type these command lines for a fully automated installation and start AIL framework: ```bash -git clone https://github.com/CIRCL/AIL-framework.git +git clone https://github.com/ail-project/ail-framework.git cd AIL-framework ./installing_deps.sh @@ -220,11 +220,11 @@ License ``` Copyright (C) 2014 Jules Debra - Copyright (C) 2014-2019 CIRCL - Computer Incident Response Center Luxembourg (c/o smile, security made in Lëtzebuerg, Groupement d'Intérêt Economique) - Copyright (c) 2014-2019 Raphaël Vinot - Copyright (c) 2014-2019 Alexandre Dulaunoy - Copyright (c) 2016-2019 Sami Mokaddem - Copyright (c) 2018-2019 Thirion Aurélien + Copyright (C) 2014-2020 CIRCL - Computer Incident Response Center Luxembourg (c/o smile, security made in Lëtzebuerg, Groupement d'Intérêt Economique) + Copyright (c) 2014-2020 Raphaël Vinot + Copyright (c) 2014-2020 Alexandre Dulaunoy + Copyright (c) 2016-2020 Sami Mokaddem + Copyright (c) 2018-2020 Thirion Aurélien This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/bin/Update.py b/bin/Update.py index 5f1ca713..d949c208 100755 --- a/bin/Update.py +++ b/bin/Update.py @@ -33,7 +33,6 @@ def auto_update_enabled(cfg): # check if files are modify locally def check_if_files_modified(): - return True process = subprocess.run(['git', 'ls-files' ,'-m'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) if process.returncode == 0: modified_files = process.stdout diff --git a/doc/presentation/source-training/ail-training.pdf b/doc/presentation/source-training/ail-training.pdf index ad366b51..e26c3a9f 100644 Binary files a/doc/presentation/source-training/ail-training.pdf and b/doc/presentation/source-training/ail-training.pdf differ diff --git a/doc/presentation/source-training/ail-training.tex b/doc/presentation/source-training/ail-training.tex index b326822f..05302060 100644 --- a/doc/presentation/source-training/ail-training.tex +++ b/doc/presentation/source-training/ail-training.tex @@ -210,7 +210,7 @@ ation-leaks-analysis-and-gdpr.pdf}}. \node[simplenode] (pastebin) at (0, 0) {\includegraphics[scale=0.20]{images/pastebin.png}}; \node[simplenode] (leaks) at (4, -2) {Other leaks}; - \node[simplenode] (ail) at (4, 0) {\includegraphics[scale=0.3]{images/circl-small.png}}; + \node[simplenode] (ail) at (4, 0) {\includegraphics[scale=0.14]{images/ail-project.png}}; \node[simplenode] (res) at (8, 0) {\includegraphics[scale=0.1]{images/alert.png}}; \begin{scope} @@ -412,11 +412,11 @@ response platforms \begin{frame} \frametitle{threat sharing and incident response platforms} \centerline{ - \includegraphics[scale=0.20]{images/circl-small.png} + \includegraphics[scale=0.14]{images/ail-project.png} \hskip 2em $\longrightarrow$ \hskip 2em - \includegraphics[scale=0.7]{images/MISP.png} + \includegraphics[scale=0.8]{images/MISP.png} } \vskip 2em @@ -427,11 +427,11 @@ response platforms. \begin{frame} \frametitle{threat sharing and incident response platforms} \centerline{ - \includegraphics[scale=0.20]{images/circl-small.png} + \includegraphics[scale=0.12]{images/ail-project.png} \hskip 2em $\longrightarrow$ \hskip 2em - \includegraphics[scale=0.7]{images/MISP.png} + \includegraphics[scale=0.8]{images/MISP.png} } \vskip 2em @@ -736,7 +736,7 @@ response platforms. \frametitle{Setting up AIL-Framework from source or virtual machine} \begin{tcblisting}{colback=black!85,coltext=green,listing only, title=Setting up AIL-Framework from source, fonttitle=\bfseries} -git clone https://github.com/CIRCL/AIL-framework.git +git clone https://github.com/ail-project/ail-framework.git cd AIL-framework ./installing_deps.sh \end{tcblisting} @@ -1217,7 +1217,6 @@ if __name__ == '__main__': \end{itemize} \item Crawled items \begin{itemize} - \item add screenshot correlation \item duplicate crawled domains \item tor indexer \item crawler cookie authentication diff --git a/doc/presentation/source-training/cmds_summary/content-introduction.tex b/doc/presentation/source-training/cmds_summary/content-introduction.tex index 257dcf1c..a4fa3a2c 100644 --- a/doc/presentation/source-training/cmds_summary/content-introduction.tex +++ b/doc/presentation/source-training/cmds_summary/content-introduction.tex @@ -10,7 +10,7 @@ \frametitle{Useful commands} \begin{tcblisting}{colback=black!85,coltext=green,listing only, title=Setting up AIL-Framework from source, fonttitle=\bfseries} -git clone https://github.com/CIRCL/AIL-framework.git +git clone https://github.com/ail-project/ail-framework.git cd AIL-framework ./installing_deps.sh cd var/www/ diff --git a/doc/presentation/source-training/images/ail-project.png b/doc/presentation/source-training/images/ail-project.png new file mode 100644 index 00000000..420577fd Binary files /dev/null and b/doc/presentation/source-training/images/ail-project.png differ diff --git a/var/www/Flask_server.py b/var/www/Flask_server.py index 576f552e..9894ba76 100755 --- a/var/www/Flask_server.py +++ b/var/www/Flask_server.py @@ -214,7 +214,7 @@ def _handle_client_error(e): res_dict = {"status": "error", "reason": "Method Not Allowed: The method is not allowed for the requested URL"} anchor_id = request.path[8:] anchor_id = anchor_id.replace('/', '_') - api_doc_url = 'https://github.com/CIRCL/AIL-framework/tree/master/doc#{}'.format(anchor_id) + api_doc_url = 'https://github.com/ail-project/ail-framework/tree/master/doc#{}'.format(anchor_id) res_dict['documentation'] = api_doc_url return Response(json.dumps(res_dict, indent=2, sort_keys=True), mimetype='application/json'), 405 else: diff --git a/var/www/modules/Flask_config.py b/var/www/modules/Flask_config.py index 6e4e17cc..2b2937aa 100644 --- a/var/www/modules/Flask_config.py +++ b/var/www/modules/Flask_config.py @@ -100,7 +100,7 @@ UPLOAD_FOLDER = os.path.join(os.environ['AIL_FLASK'], 'submitted') PASTES_FOLDER = os.path.join(os.environ['AIL_HOME'], config_loader.get_config_str("Directories", "pastes")) + '/' SCREENSHOT_FOLDER = os.path.join(os.environ['AIL_HOME'], config_loader.get_config_str("Directories", "crawled_screenshot"), 'screenshot') -REPO_ORIGIN = 'https://github.com/CIRCL/AIL-framework.git' +REPO_ORIGIN = 'https://github.com/ail-project/ail-framework.git' max_dashboard_logs = int(config_loader.get_config_str("Flask", "max_dashboard_logs")) diff --git a/var/www/modules/settings/templates/settings_index.html b/var/www/modules/settings/templates/settings_index.html index a43afc64..fd608a64 100644 --- a/var/www/modules/settings/templates/settings_index.html +++ b/var/www/modules/settings/templates/settings_index.html @@ -43,7 +43,7 @@ AIL Version - {{current_version}} (release note) + {{current_version}} (release note)