Handle ratelimiting properly for Account Link request

OpenShock · Nov 15, 2024 · 5c0eb09 · 5c0eb09 · github-actions · Nov 15, 2024
1 parent 611343b
commit 5c0eb09
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/frontend/src/lib/MessageHandlers/index.ts b/frontend/src/lib/MessageHandlers/index.ts
@@ -25,7 +25,9 @@ function handleInvalidMessage() {
 }
 
 const PayloadTypes = Object.keys(HubToLocalMessagePayload).length / 2;
-const PayloadHandlers: MessageHandler[] = new Array<MessageHandler>(PayloadTypes).fill(handleInvalidMessage);
+const PayloadHandlers: MessageHandler[] = new Array<MessageHandler>(PayloadTypes).fill(
+  handleInvalidMessage
+);
 
 PayloadHandlers[HubToLocalMessagePayload.ReadyMessage] = (cli, msg) => {
   const payload = new ReadyMessage();
@@ -109,6 +111,9 @@ PayloadHandlers[HubToLocalMessagePayload.AccountLinkCommandResult] = (cli, msg)
       case AccountLinkResultCode.InvalidCode:
         reason = 'Invalid code';
         break;
+      case AccountLinkResultCode.RateLimited:
+        reason = 'Too many requests';
+        break;
       case AccountLinkResultCode.InternalError:
         reason = 'Internal error';
         break;

diff --git a/frontend/src/lib/_fbs/open-shock/serialization/local/account-link-result-code.ts b/frontend/src/lib/_fbs/open-shock/serialization/local/account-link-result-code.ts
@@ -8,5 +8,6 @@ export enum AccountLinkResultCode {
   InvalidCodeLength = 2,
   NoInternetConnection = 3,
   InvalidCode = 4,
-  InternalError = 5
+  RateLimited = 5,
+  InternalError = 6
 }
diff --git a/include/serialization/_fbs/HubToLocalMessage_generated.h b/include/serialization/_fbs/HubToLocalMessage_generated.h
@@ -61,30 +61,33 @@ enum class AccountLinkResultCode : uint8_t {
   InvalidCodeLength = 2,
   NoInternetConnection = 3,
   InvalidCode = 4,
-  InternalError = 5,
+  RateLimited = 5,
+  InternalError = 6,
   MIN = Success,
   MAX = InternalError
 };
 
-inline const AccountLinkResultCode (&EnumValuesAccountLinkResultCode())[6] {
+inline const AccountLinkResultCode (&EnumValuesAccountLinkResultCode())[7] {
   static const AccountLinkResultCode values[] = {
     AccountLinkResultCode::Success,
     AccountLinkResultCode::CodeRequired,
     AccountLinkResultCode::InvalidCodeLength,
     AccountLinkResultCode::NoInternetConnection,
     AccountLinkResultCode::InvalidCode,
+    AccountLinkResultCode::RateLimited,
     AccountLinkResultCode::InternalError
   };
   return values;
 }
 
 inline const char * const *EnumNamesAccountLinkResultCode() {
-  static const char * const names[7] = {
+  static const char * const names[8] = {
     "Success",
     "CodeRequired",
     "InvalidCodeLength",
     "NoInternetConnection",
     "InvalidCode",
+    "RateLimited",
     "InternalError",
     nullptr
   };

diff --git a/schemas b/schemas
diff --git a/src/GatewayConnectionManager.cpp b/src/GatewayConnectionManager.cpp
@@ -97,7 +97,8 @@ AccountLinkResultCode GatewayConnectionManager::Link(std::string_view linkCode)
   auto response = HTTP::JsonAPI::LinkAccount(linkCode);
 
   if (response.result == HTTP::RequestResult::RateLimited) {
-    return AccountLinkResultCode::InternalError;  // Just return false, don't spam the console with errors
+    OS_LOGW(TAG, "Account Link request got ratelimited");
+    return AccountLinkResultCode::RateLimited;
   }
   if (response.result != HTTP::RequestResult::Success) {
     OS_LOGE(TAG, "Error while getting auth token: %d %d", response.result, response.code);