Merge branch 'white/master' of gitlab.com:faradaysec/faraday into whi…

…te/master

CHANGELOG/3.16.1/community.md

@@ -0,0 +1,2 @@
+ * MOD only show settings of this version in faraday-manage settings
+ * FIX update minimum version of click dependency

CHANGELOG/3.16.1/date.md

@@ -0,0 +1 @@
+Jul 2nd, 2021

CHANGELOG/README.md

@@ -9,8 +9,9 @@ The **RELEASE.md** generation process is as follows:
     * _header.md_, md format lines at the beginning of the release file
     * _footer.md_, md format lines at the ending of the release file
     * _changelog.py_, a python file, which will generate the release file
- * The python file process is: 
-    * Iterate over all the version folder in sorted order, joining all .md files in only one ( _white/pink/black.md_ ) in the proper version folder.
+ * The python file process is:
+    * Iterate over all the version folder in sorted order, joining all .json files in only one .md (
+      _community/prof/corp.md_ ) in the proper version folder.
     * Generate the release file as header/v0file.md/.../vnfile.md/footer
  * The release step-by-step generation should be:
     1. Checkout white/master and go to CHANGELOG/
@@ -30,3 +31,11 @@ The **RELEASE.md** generation process is as follows:
     1. Replace _old **RELEASE.md**_ with new generated file
     1. Git add CHANGELOG/
     1. Commit & push
+
+As for faraday 3.15.0, the changelog file changed to .json format with this structure:
+```json
+{
+  "level": "community|prof|corp",
+  "md": "<changelog text>"
+}
+```

CHANGELOG/RELEASE.md

@@ -2,6 +2,11 @@ New features in the latest update
 =====================================
 
 
+3.16.1 [Jul 2nd, 2021]:
+---
+ * MOD only show settings of this version in faraday-manage settings
+ * FIX update minimum version of click dependency
+
 3.16.0 [Jun 29th, 2021]:
 ---
  * BREAKING CHANGE: API V2 discontinued

RELEASE.md

@@ -2,6 +2,11 @@ New features in the latest update
 =====================================
 
 
+3.16.1 [Jul 2nd, 2021]:
+---
+ * MOD only show settings of this version in faraday-manage settings
+ * FIX update minimum version of click dependency
+
 3.16.0 [Jun 29th, 2021]:
 ---
  * BREAKING CHANGE: API V2 discontinued

faraday/__init__.py

@@ -2,5 +2,5 @@
 # Copyright (C) 2013  Infobyte LLC (http://www.infobytesec.com/)
 # See the file 'doc/LICENSE' for the license information
 
-__version__ = '3.16.0'
+__version__ = '3.16.1'
 __license_version__ = __version__

faraday/settings/__init__.py

@@ -13,5 +13,9 @@ def get_all_settings() -> List:
 
 
 def load_settings():
-    import faraday.settings.smtp  # pylint: disable=import-outside-toplevel
-    import faraday.settings.dashboard  # pylint: disable=import-outside-toplevel  # noqa: F401
+    from faraday.settings.smtp import init_setting as smtp_init  # pylint: disable=import-outside-toplevel
+    smtp_init()
+    from faraday.settings.dashboard import init_setting as dashboard_init  # pylint: disable=import-outside-toplevel
+    dashboard_init()
+    from faraday.settings.reports import init_setting as reports_init  # pylint: disable=import-outside-toplevel
+    reports_init()

faraday/settings/dashboard.py

@@ -24,6 +24,3 @@ def get_default_config(self):
 
 def init_setting():
     DashboardSettings()
-
-
-init_setting()

faraday/settings/reports.py

@@ -35,6 +35,3 @@ def get_default_config(self):
 
 def init_setting():
     ReportsSettings()
-
-
-init_setting()

faraday/settings/smtp.py

@@ -44,6 +44,3 @@ def get_default_config(self):
 
 def init_setting():
     SMTPSettings()
-
-
-init_setting()

pynixify/nixpkgs.nix

@@ -72,6 +72,11 @@ let
         ./packages/bleach
         { };
 
+      click =
+        self.callPackage
+        ./packages/click
+        { };
+
       faraday-agent-parameters-types =
         self.callPackage
         ./packages/faraday-agent-parameters-types

pynixify/packages/click/default.nix

@@ -0,0 +1,38 @@
+# WARNING: This file was automatically generated. You should avoid editing it.
+# If you run pynixify again, the file will be either overwritten or
+# deleted, and you will lose the changes you made to it.
+
+{ buildPythonPackage
+, fetchPypi
+, importlib-metadata
+, lib
+}:
+
+buildPythonPackage rec {
+  pname =
+    "click";
+  version =
+    "8.0.1";
+
+  src =
+    fetchPypi {
+      inherit
+        pname
+        version;
+      sha256 =
+        "0ymdyf37acq4qxh038q0xx44qgj6y2kf0jd0ivvix6qij88w214c";
+    };
+
+  propagatedBuildInputs =
+    [
+      importlib-metadata
+    ];
+
+  # TODO FIXME
+  doCheck =
+    false;
+
+  meta =
+    with lib;
+    { };
+}

requirements.txt

@@ -3,7 +3,7 @@ autobahn>=17.10.1
 alembic>=0.9.9
 bcrypt>=3.1.4
 colorama>=0.3.9
-click>=5.1
+click>=8.0.1
 flask>=1.1
 Flask-SQLAlchemy>=2.3.1
 flask-classful>=0.14