chore: validate org login

ubiquity-os-marketplace · Sep 7, 2024 · 14f3ceb · 14f3ceb
1 parent ba92dd7
commit 14f3ceb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/handlers/shared/get-user-task-limit-and-role.ts b/src/handlers/shared/get-user-task-limit-and-role.ts
@@ -16,16 +16,21 @@ export async function getUserRoleAndTaskLimit(context: Context, user: string): P
   );
 
   try {
+    // Validate the organization login
+    if (typeof orgLogin !== 'string' || orgLogin.trim() === '') {
+      throw new Error('Invalid organization name');
+    }
+
     const response = await context.octokit.orgs.getMembershipForUser({
-      org: orgLogin as string,
+      org: orgLogin,
       username: user,
     });
-
-    const role = response.data.role.toLowerCase()
+  
+    const role = response.data.role.toLowerCase();
     const limit = maxConcurrentTasks[role];
-
-   return limit ? { role, limit } : smallestTask;
-    
+  
+    return limit ? { role, limit } : smallestTask;
+
   } catch (err) {
     logger.error("Could not get user role", { err });
     return smallestTask;

diff --git a/src/handlers/shared/start.ts b/src/handlers/shared/start.ts
@@ -150,9 +150,7 @@ async function handleTaskLimitChecks(username: string, context: Context, logger:
         limit,
       });
 
-      if (log.logMessage?.diff) {
-        await addCommentToIssue(context, log.logMessage.diff as string);
-      }
+      await addCommentToIssue(context, log.logMessage.diff);
     }
 
     return false;