Merge pull request #3341 from bomoko/fix/sensible_error_userbyssh

closes #1549
uselagoon · Nov 24, 2022 · 42db581 · 42db581
2 parents e6ffbd1 + 4bd37bf
commit 42db581
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/services/api/src/resources/user/resolvers.ts b/services/api/src/resources/user/resolvers.ts
@@ -8,6 +8,14 @@ export const getMe: ResolverFn = async (_root, args, { models, keycloakGrant: gr
   return models.UserModel.loadUserById(currentUserId);
 }
 
+class SearchInputError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'SearchInputError';
+  }
+}
+
+
 export const getUserBySshKey: ResolverFn = async (
   _root,
   { sshKey },
@@ -21,6 +29,10 @@ export const getUserBySshKey: ResolverFn = async (
     // @ts-ignore
   )(sshKey);
 
+  if(!keyType || !keyValue) {
+    throw new SearchInputError("Malformed ssh key provided. Should begin with key-type (eg. ssh-rsa|ssh-ed25519|etc.), then a space, then the key's value");
+  }
+
   const rows = await query(
     sqlClientPool,
     Sql.selectUserIdBySshKey({ keyType, keyValue }),