diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 663778b2..51aab61b 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -9,16 +9,16 @@ jobs: strategy: matrix: - python-version: [3.8, 3.9, 3.10.9, 3.11.0] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Install libxml2-dev and libxslt-dev run: sudo apt-get install -y libxml2-dev libxslt-dev - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/iot_inspector/admin.py b/iot_inspector/admin.py index be6f64ba..2fd8fe76 100644 --- a/iot_inspector/admin.py +++ b/iot_inspector/admin.py @@ -10,8 +10,6 @@ client_generate_report, client_get_report_link, client_login, - client_upload_firmware, - get_default_product_group, ) from .models import AnalysisRequest, IOTUser @@ -33,15 +31,10 @@ def validate_status(self, request, queryset): iot_user = analysis_request.iot_user if iot_user.activated and analysis_request.status not in (True, False): if not analysis_request.firmware_uuid: - client = client_login(iot_user) - default_product_group = get_default_product_group(client) - firmware = client_upload_firmware( - client, analysis_request, default_product_group + messages.error( + request, + "Firmware upload via OneKey is no longer supported.", ) - firmware_uuid = firmware["id"] - analysis_request.firmware_uuid = firmware_uuid - analysis_request.status = True - analysis_request.save() else: messages.error(request, "This request was already made.") else: diff --git a/iot_inspector/helpers.py b/iot_inspector/helpers.py index 6d978f90..d89caf12 100644 --- a/iot_inspector/helpers.py +++ b/iot_inspector/helpers.py @@ -7,7 +7,6 @@ from decouple import config from django.core.files.storage import FileSystemStorage from django.core.signing import Signer -from onekey_client import Client, FirmwareMetadata from testing_platform import settings @@ -111,18 +110,6 @@ def get_default_product_group(client): return default_product_group -def client_upload_firmware(client, analysis_request, default_product_group): - metadata = FirmwareMetadata( - name=analysis_request.name, - vendor_name=analysis_request.vendor_name, - product_name=analysis_request.product_name, - product_group_id=default_product_group["id"], - ) - firmware_path = Path(analysis_request.file.path) - res = client.upload_firmware(metadata, firmware_path, enable_monitoring=True) - return res - - def client_get_or_generate_report_config(client): GET_ALL_REPORT_CONFIGS = """ query { diff --git a/iot_inspector/helpers_old.py b/iot_inspector/helpers_old.py index 6d978f90..d89caf12 100644 --- a/iot_inspector/helpers_old.py +++ b/iot_inspector/helpers_old.py @@ -7,7 +7,6 @@ from decouple import config from django.core.files.storage import FileSystemStorage from django.core.signing import Signer -from onekey_client import Client, FirmwareMetadata from testing_platform import settings @@ -111,18 +110,6 @@ def get_default_product_group(client): return default_product_group -def client_upload_firmware(client, analysis_request, default_product_group): - metadata = FirmwareMetadata( - name=analysis_request.name, - vendor_name=analysis_request.vendor_name, - product_name=analysis_request.product_name, - product_group_id=default_product_group["id"], - ) - firmware_path = Path(analysis_request.file.path) - res = client.upload_firmware(metadata, firmware_path, enable_monitoring=True) - return res - - def client_get_or_generate_report_config(client): GET_ALL_REPORT_CONFIGS = """ query { diff --git a/landing_page/templates/dashboard.html b/landing_page/templates/dashboard.html index cfb40196..9628c26d 100644 --- a/landing_page/templates/dashboard.html +++ b/landing_page/templates/dashboard.html @@ -61,14 +61,6 @@

Toolbox

E-Mail Policy Generator Create DMARC and/or SPF policies which help you to enhance your e-mail security! - -