From 5ca6a76348b32e1f5c000a984cf3636cf378b661 Mon Sep 17 00:00:00 2001 From: Taylor Date: Fri, 28 Jun 2024 08:42:48 -0500 Subject: [PATCH] precommit fixes --- backend/app/routers/threat_intel.py | 2 +- backend/app/threat_intel/routes/epss.py | 4 ++-- backend/app/threat_intel/schema/epss.py | 6 ++++-- backend/app/threat_intel/services/epss.py | 9 +++++++-- frontend/package.json | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/backend/app/routers/threat_intel.py b/backend/app/routers/threat_intel.py index ecb5a516..3d0d117f 100644 --- a/backend/app/routers/threat_intel.py +++ b/backend/app/routers/threat_intel.py @@ -1,7 +1,7 @@ from fastapi import APIRouter -from app.threat_intel.routes.socfortress import threat_intel_socfortress_router from app.threat_intel.routes.epss import threat_intel_epss_router +from app.threat_intel.routes.socfortress import threat_intel_socfortress_router # Instantiate the APIRouter router = APIRouter() diff --git a/backend/app/threat_intel/routes/epss.py b/backend/app/threat_intel/routes/epss.py index 7d4a952a..98cc999b 100644 --- a/backend/app/threat_intel/routes/epss.py +++ b/backend/app/threat_intel/routes/epss.py @@ -2,9 +2,9 @@ from fastapi import Security from loguru import logger - from app.auth.utils import AuthHandler -from app.threat_intel.schema.epss import EpssThreatIntelRequest, EpssThreatIntelResponse +from app.threat_intel.schema.epss import EpssThreatIntelRequest +from app.threat_intel.schema.epss import EpssThreatIntelResponse from app.threat_intel.services.epss import collect_epss_score # App specific imports diff --git a/backend/app/threat_intel/schema/epss.py b/backend/app/threat_intel/schema/epss.py index c43ff519..88b12dd4 100644 --- a/backend/app/threat_intel/schema/epss.py +++ b/backend/app/threat_intel/schema/epss.py @@ -1,23 +1,24 @@ -from typing import Optional from typing import List +from typing import Optional from pydantic import BaseModel from pydantic import Field - class EpssThreatIntelRequest(BaseModel): cve: str = Field( ..., description="The CVE to evaluate.", ) + class EpssData(BaseModel): cve: str epss: str percentile: str date: str + class EpssApiResponse(BaseModel): status: str status_code: int @@ -32,6 +33,7 @@ class EpssApiResponse(BaseModel): def to_dict(self): return self.dict() + class EpssThreatIntelResponse(BaseModel): data: Optional[List[EpssData]] = Field(None, description="The data for the IoC") success: bool = Field(..., description="Indicates if it was successful") diff --git a/backend/app/threat_intel/services/epss.py b/backend/app/threat_intel/services/epss.py index 28be6bf0..23996623 100644 --- a/backend/app/threat_intel/services/epss.py +++ b/backend/app/threat_intel/services/epss.py @@ -1,8 +1,12 @@ -from fastapi import HTTPException -from app.threat_intel.schema.epss import EpssThreatIntelRequest, EpssThreatIntelResponse, EpssData import httpx +from fastapi import HTTPException from loguru import logger +from app.threat_intel.schema.epss import EpssData +from app.threat_intel.schema.epss import EpssThreatIntelRequest +from app.threat_intel.schema.epss import EpssThreatIntelResponse + + async def invoke_epss_api( url: str, request: EpssThreatIntelRequest, @@ -28,6 +32,7 @@ async def invoke_epss_api( response = await client.get(url, headers=headers, params=params) return response.json() + async def collect_epss_score( request: EpssThreatIntelRequest, ) -> EpssThreatIntelResponse: diff --git a/frontend/package.json b/frontend/package.json index 3b172055..824c06b2 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -137,4 +137,4 @@ "engines": { "node": ">=18.0.0" } -} \ No newline at end of file +}