Merge pull request nabla-c0d3#643 from nabla-c0d3/dev-6.0.0

Dev 6.0.0

Author: nabla-c0d3

.github/workflows/build_windows_exe.yml

@@ -12,9 +12,9 @@ jobs:
     runs-on: windows-2022
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: "3.11"
 

.github/workflows/release_to_docker.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Docker Meta
         id: docker_meta

.github/workflows/run_tests.yml

@@ -13,12 +13,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -34,7 +34,7 @@ jobs:
 
     - name: Run linters
       # Only do linting once
-      if: matrix.python-version == 3.7
+      if: matrix.python-version == 3.8
       run: python -m invoke lint
 
     - name: Run tests

.github/workflows/run_tests_with_pydantic_1_10.yml renamed to .github/workflows/run_tests_with_lowest_pydantic_version.yml

@@ -1,5 +1,4 @@
-# TODO(#617): Delete this file
-name: Run tests with pydantic 1.10
+name: Run tests with lowest supported version of pydantic
 
 on:
   push:
@@ -12,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.7
+          python-version: 3.8
 
       - 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 pydantic 2.2
+        run: python -m pip install "pydantic==2.2"
 
       - name: Install dev dependencies
         run: python -m pip install -r requirements-dev.txt

.github/workflows/scan_apache2_server.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
 

.github/workflows/scan_iis_server.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: windows-2019
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
 

.github/workflows/scan_nginx_server.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
 

.github/workflows/test_module_setup.yml

@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
 

MANIFEST.in

@@ -102,7 +102,7 @@ $ invoke test
 License
 -------
 
-Copyright (c) 2023 Alban Diquet
+Copyright (c) 2024 Alban Diquet
 
 SSLyze is made available under the terms of the GNU Affero General Public License (AGPL). See LICENSE.txt for details and exceptions.
 

README.md

@@ -118,12 +118,12 @@ def example_json_result_output(
     date_scans_completed: datetime,
 ) -> None:
     json_output = SslyzeOutputAsJson(
-        server_scan_results=[ServerScanResultAsJson.from_orm(result) for result in all_server_scan_results],
+        server_scan_results=[ServerScanResultAsJson.model_validate(result) for result in all_server_scan_results],
         invalid_server_strings=[],  # Not needed here - specific to the CLI interface
         date_scans_started=date_scans_started,
         date_scans_completed=date_scans_completed,
     )
-    json_output_as_str = json_output.json()  # TODO(#617): Switch to model_dump_json()
+    json_output_as_str = json_output.model_dump_json()
     json_file_out.write_text(json_output_as_str)
 
 
@@ -132,7 +132,7 @@ def example_json_result_parsing(results_as_json_file: Path) -> None:
     results_as_json = results_as_json_file.read_text()
 
     # These results can be parsed
-    parsed_results = SslyzeOutputAsJson.parse_raw(results_as_json)
+    parsed_results = SslyzeOutputAsJson.model_validate_json(results_as_json)
 
     # Making it easy to do post-processing and inspection of the results
     print("The following servers were scanned:")