Pull naming in line

thinkst · Nov 19, 2024 · 342ad3d · 342ad3d
1 parent 65da710
commit 342ad3d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/canarytokens/models.py b/canarytokens/models.py
@@ -521,7 +521,7 @@ def check_process_name(value: str):
         return value
 
 
-class FakeWindowsFSTokenRequest(TokenRequest):
+class WindowsFakeFSTokenRequest(TokenRequest):
     token_type: Literal[TokenTypes.WINDOWS_FAKE_FS] = TokenTypes.WINDOWS_FAKE_FS
     windows_fake_fs_root: str
     windows_fake_fs_file_structure: str
@@ -802,7 +802,7 @@ class CreditCardV2TokenRequest(TokenRequest):
         CCTokenRequest,
         PWATokenRequest,
         CMDTokenRequest,
-        FakeWindowsFSTokenRequest,
+        WindowsFakeFSTokenRequest,
         FastRedirectTokenRequest,
         QRCodeTokenRequest,
         AWSKeyTokenRequest,
@@ -901,7 +901,7 @@ class CMDTokenResponse(TokenResponse):
     reg_file: str
 
 
-class FakeWindowsFSTokenResponse(TokenResponse):
+class WindowsFakeFSTokenResponse(TokenResponse):
     token_type: Literal[TokenTypes.WINDOWS_FAKE_FS] = TokenTypes.WINDOWS_FAKE_FS
     powershell_file: str
 
@@ -1128,7 +1128,7 @@ class CreditCardV2TokenResponse(TokenResponse):
         CCTokenResponse,
         PWATokenResponse,
         CMDTokenResponse,
-        FakeWindowsFSTokenResponse,
+        WindowsFakeFSTokenResponse,
         CustomImageTokenResponse,
         SMTPTokenResponse,
         SvnTokenResponse,
@@ -1660,7 +1660,7 @@ class CMDTokenHit(TokenHit):
     token_type: Literal[TokenTypes.CMD] = TokenTypes.CMD
 
 
-class FakeWindowsFSTokenHit(TokenHit):
+class WindowsFakeFSTokenHit(TokenHit):
     token_type: Literal[TokenTypes.WINDOWS_FAKE_FS] = TokenTypes.WINDOWS_FAKE_FS
 
 
@@ -1806,7 +1806,7 @@ class LegacyTokenHit(TokenHit):
         CCTokenHit,
         PWATokenHit,
         CMDTokenHit,
-        FakeWindowsFSTokenHit,
+        WindowsFakeFSTokenHit,
         DNSTokenHit,
         AWSKeyTokenHit,
         AzureIDTokenHit,
@@ -1948,9 +1948,9 @@ class CMDTokenHistory(TokenHistory[CMDTokenHit]):
     hits: List[CMDTokenHit]
 
 
-class FakeWindowsFSTokenHistory(TokenHistory[FakeWindowsFSTokenHit]):
+class WindowsFakeFSTokenHistory(TokenHistory[WindowsFakeFSTokenHit]):
     token_type: Literal[TokenTypes.WINDOWS_FAKE_FS] = TokenTypes.WINDOWS_FAKE_FS
-    hits: List[FakeWindowsFSTokenHit]
+    hits: List[WindowsFakeFSTokenHit]
 
 
 class SlowRedirectTokenHistory(TokenHistory[SlowRedirectTokenHit]):
@@ -2061,7 +2061,7 @@ class LegacyTokenHistory(TokenHistory[LegacyTokenHit]):
         CCTokenHistory,
         PWATokenHistory,
         CMDTokenHistory,
-        FakeWindowsFSTokenHistory,
+        WindowsFakeFSTokenHistory,
         DNSTokenHistory,
         AWSKeyTokenHistory,
         AzureIDTokenHistory,
@@ -2542,7 +2542,7 @@ class DownloadCMDRequest(TokenDownloadRequest):
     fmt: Literal[DownloadFmtTypes.CMD] = DownloadFmtTypes.CMD
 
 
-class DownloadFakeWindowsFSRequest(TokenDownloadRequest):
+class DownloadWindowsFakeFSRequest(TokenDownloadRequest):
     fmt: Literal[DownloadFmtTypes.WINDOWS_FAKE_FS] = DownloadFmtTypes.WINDOWS_FAKE_FS
 
 
@@ -2573,7 +2573,7 @@ class DownloadCreditCardV2Request(TokenDownloadRequest):
         DownloadAzureIDCertRequest,
         DownloadCCRequest,
         DownloadCMDRequest,
-        DownloadFakeWindowsFSRequest,
+        DownloadWindowsFakeFSRequest,
         DownloadCSSClonedWebRequest,
         DownloadIncidentListCSVRequest,
         DownloadIncidentListJsonRequest,
@@ -2691,7 +2691,7 @@ class DownloadCMDResponse(TokenDownloadResponse):
     auth: str
 
 
-class DownloadFakeWindowsFSResponse(TokenDownloadResponse):
+class DownloadWindowsFakeFSResponse(TokenDownloadResponse):
     contenttype: Literal[
         DownloadContentTypes.TEXTPLAIN
     ] = DownloadContentTypes.TEXTPLAIN

diff --git a/frontend/app.py b/frontend/app.py
@@ -62,8 +62,8 @@
     DownloadCSSClonedWebResponse,
     CMDTokenRequest,
     CMDTokenResponse,
-    FakeWindowsFSTokenRequest,
-    FakeWindowsFSTokenResponse,
+    WindowsFakeFSTokenRequest,
+    WindowsFakeFSTokenResponse,
     CreditCardV2TokenRequest,
     CreditCardV2TokenResponse,
     CustomBinaryTokenRequest,
@@ -82,8 +82,8 @@
     DownloadCCResponse,
     DownloadCMDRequest,
     DownloadCMDResponse,
-    DownloadFakeWindowsFSRequest,
-    DownloadFakeWindowsFSResponse,
+    DownloadWindowsFakeFSRequest,
+    DownloadWindowsFakeFSResponse,
     DownloadCreditCardV2Request,
     DownloadCreditCardV2Response,
     DownloadIncidentListCSVRequest,
@@ -1013,10 +1013,10 @@ def _(
 
 @create_download_response.register
 def _(
-    download_request_details: DownloadFakeWindowsFSRequest, canarydrop: Canarydrop
-) -> DownloadFakeWindowsFSResponse:
+    download_request_details: DownloadWindowsFakeFSRequest, canarydrop: Canarydrop
+) -> DownloadWindowsFakeFSResponse:
     """"""
-    return DownloadFakeWindowsFSResponse(
+    return DownloadWindowsFakeFSResponse(
         token=download_request_details.token,
         auth=download_request_details.auth,
         content=windows_fake_fs.make_windows_fake_fs(
@@ -1650,14 +1650,14 @@ def _(
 
 @create_response.register
 def _(
-    token_request_details: FakeWindowsFSTokenRequest, canarydrop: Canarydrop
-) -> FakeWindowsFSTokenResponse:
+    token_request_details: WindowsFakeFSTokenRequest, canarydrop: Canarydrop
+) -> WindowsFakeFSTokenResponse:
     canarydrop.windows_fake_fs_root = token_request_details.windows_fake_fs_root
     canarydrop.windows_fake_fs_file_structure = (
         token_request_details.windows_fake_fs_file_structure
     )
     queries.save_canarydrop(canarydrop=canarydrop)
-    return FakeWindowsFSTokenResponse(
+    return WindowsFakeFSTokenResponse(
         email=canarydrop.alert_email_recipient or "",
         webhook_url=canarydrop.alert_webhook_url
         if canarydrop.alert_webhook_url

diff --git a/frontend_vue/src/components/tokens/windows_fake_fs/TokenDisplay.vue b/frontend_vue/src/components/tokens/windows_fake_fs/TokenDisplay.vue
@@ -11,13 +11,13 @@
 <script setup lang="ts">
 import { downloadAsset } from '@/api/main';
 
-type FakeWindowsFSDataType = {
+type WindowsFakeFSDataType = {
   auth: string;
   token: string;
 };
 
 const props = defineProps<{
-  tokenData: FakeWindowsFSDataType;
+  tokenData: WindowsFakeFSDataType;
 }>();
 
 async function handleDownloadMSregistryFile() {