Merge pull request #623 from nabla-c0d3/dev

SSLyze 5.2.0
nabla-c0d3 · Sep 24, 2023 · 49380c1 · 49380c1
2 parents 8f78fb1 + fc07035
commit 49380c1
Show file tree

Hide file tree

Showing 76 changed files with 21,620 additions and 21,712 deletions.
diff --git a/.github/workflows/build_windows_exe.yml b/.github/workflows/build_windows_exe.yml
@@ -9,22 +9,23 @@ on:
 jobs:
   build:
 
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: "3.11"
 
-    - name: Install pip and cx-freeze
-      run: python -m pip install --upgrade pip pipenv setuptools cx-freeze==6.13.1
+    - name: Install pip
+      run: python -m pip install --upgrade pip setuptools wheel
 
-    - name: Install SSLyze dependencies
-      run: |
-        python -m pip install .
-        python -m pip uninstall sslyze -y
+    - name: Install sslyze dependencies
+      run: python -m pip install -e .
+
+    - name: Install dev dependencies including cx_freeze
+      run: python -m pip install -r requirements-dev.txt
 
     - name: Build Windows executable
       run: python setup.py build_exe

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -30,7 +30,7 @@ jobs:
       run: python -m pip install -e .
 
     - name: Install dev dependencies
-      run: python -m pip install -r dev-requirements.txt
+      run: python -m pip install -r requirements-dev.txt
 
     - name: Run linters
       # Only do linting once

diff --git a/.github/workflows/run_tests_with_pydantic_1_10.yml b/.github/workflows/run_tests_with_pydantic_1_10.yml
@@ -0,0 +1,33 @@
+# TODO(#617): Delete this file
+name: Run tests with pydantic 1.10
+
+on:
+  push:
+    branches: [release]
+  pull_request:
+    branches: [ release, dev ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Install sslyze dependencies
+        run: |
+          python -m pip install --upgrade pip setuptools
+          python -m pip install -e .
+
+      - name: Install pydantic 1.10
+        run: python -m pip install "pydantic<2"
+
+      - name: Install dev dependencies
+        run: python -m pip install -r requirements-dev.txt
+
+      - name: Run tests
+        run: python -m invoke test
diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ To setup a development environment:
 ```
 $ pip install --upgrade pip setuptools wheel
 $ pip install -e . 
-$ pip install -r dev-requirements.txt
+$ pip install -r requirements-dev.txt
 ```
 
 The tests can then be run using:

diff --git a/api_sample.py b/api_sample.py
@@ -123,7 +123,7 @@ def example_json_result_output(
         date_scans_started=date_scans_started,
         date_scans_completed=date_scans_completed,
     )
-    json_output_as_str = json_output.json(sort_keys=True, indent=4, ensure_ascii=True)
+    json_output_as_str = json_output.json()  # TODO(#617): Switch to model_dump_json()
     json_file_out.write_text(json_output_as_str)
 
 

diff --git a/docs/documentation/.buildinfo b/docs/documentation/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 8775535e1305c0f1b2492fd7e3715a83
+config: 7ed96ce74548bb7ceae0da1d5b1f50af
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/documentation/_static/alabaster.css b/docs/documentation/_static/alabaster.css
@@ -419,7 +419,9 @@ table.footnote td {
 }
 
 dl {
-    margin: 0;
+    margin-left: 0;
+    margin-right: 0;
+    margin-top: 0;
     padding: 0;
 }
 

diff --git a/docs/documentation/_static/basic.css b/docs/documentation/_static/basic.css
@@ -4,7 +4,7 @@
  *
  * Sphinx stylesheet -- basic theme.
  *
- * :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
@@ -222,7 +222,7 @@ table.modindextable td {
 /* -- general body styles --------------------------------------------------- */
 
 div.body {
-    min-width: 450px;
+    min-width: 360px;
     max-width: 800px;
 }
 
@@ -237,14 +237,8 @@ a.headerlink {
     visibility: hidden;
 }
 
-a.brackets:before,
-span.brackets > a:before{
-    content: "[";
-}
-
-a.brackets:after,
-span.brackets > a:after {
-    content: "]";
+a:visited {
+    color: #551A8B;
 }
 
 h1:hover > a.headerlink,
@@ -335,12 +329,16 @@ p.sidebar-title {
     font-weight: bold;
 }
 
+nav.contents,
+aside.topic,
 div.admonition, div.topic, blockquote {
     clear: left;
 }
 
 /* -- topics ---------------------------------------------------------------- */
 
+nav.contents,
+aside.topic,
 div.topic {
     border: 1px solid #ccc;
     padding: 7px;
@@ -379,13 +377,17 @@ div.body p.centered {
 
 div.sidebar > :last-child,
 aside.sidebar > :last-child,
+nav.contents > :last-child,
+aside.topic > :last-child,
 div.topic > :last-child,
 div.admonition > :last-child {
     margin-bottom: 0;
 }
 
 div.sidebar::after,
 aside.sidebar::after,
+nav.contents::after,
+aside.topic::after,
 div.topic::after,
 div.admonition::after,
 blockquote::after {
@@ -428,10 +430,6 @@ table.docutils td, table.docutils th {
     border-bottom: 1px solid #aaa;
 }
 
-table.footnote td, table.footnote th {
-    border: 0 !important;
-}
-
 th {
     text-align: left;
     padding-right: 5px;
@@ -615,19 +613,26 @@ ul.simple p {
     margin-bottom: 0;
 }
 
-dl.footnote > dt,
-dl.citation > dt {
+aside.footnote > span,
+div.citation > span {
     float: left;
-    margin-right: 0.5em;
 }
-
-dl.footnote > dd,
-dl.citation > dd {
+aside.footnote > span:last-of-type,
+div.citation > span:last-of-type {
+  padding-right: 0.5em;
+}
+aside.footnote > p {
+  margin-left: 2em;
+}
+div.citation > p {
+  margin-left: 4em;
+}
+aside.footnote > p:last-of-type,
+div.citation > p:last-of-type {
     margin-bottom: 0em;
 }
-
-dl.footnote > dd:after,
-dl.citation > dd:after {
+aside.footnote > p:last-of-type:after,
+div.citation > p:last-of-type:after {
     content: "";
     clear: both;
 }
@@ -644,10 +649,6 @@ dl.field-list > dt {
     padding-right: 5px;
 }
 
-dl.field-list > dt:after {
-    content: ":";
-}
-
 dl.field-list > dd {
     padding-left: 0.5em;
     margin-top: 0em;
@@ -673,6 +674,16 @@ dd {
     margin-left: 30px;
 }
 
+.sig dd {
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+.sig dl {
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
 dl > dd:last-child,
 dl > dd:last-child > :last-child {
     margin-bottom: 0;
@@ -741,6 +752,14 @@ abbr, acronym {
     cursor: help;
 }
 
+.translated {
+    background-color: rgba(207, 255, 207, 0.2)
+}
+
+.untranslated {
+    background-color: rgba(255, 207, 207, 0.2)
+}
+
 /* -- code displays --------------------------------------------------------- */
 
 pre {