Merge branch 'main' into fix-48-respect-gitignore

quirrel-dev · Jan 20, 2021 · 253e6db · 253e6db
2 parents 5027a75 + 38f8c78
commit 253e6db
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 13 deletions.
diff --git a/quirrel/src/api/scheduler/token-auth.ts b/quirrel/src/api/scheduler/token-auth.ts
@@ -1,6 +1,6 @@
 import { FastifyPluginCallback, FastifyReply, FastifyRequest } from "fastify";
 import fp from "fastify-plugin";
-import { IncomingMessage } from "http";
+import { IncomingMessage, IncomingHttpHeaders } from "http";
 import { UsageMeter } from "../shared/usage-meter";
 import basicAuth from "basic-auth";
 
@@ -33,25 +33,30 @@ const tokenAuthServicePlugin: FastifyPluginCallback<TokenAuthPluginOpts> = (
 ) => {
   const usageMeter = new UsageMeter(fastify.redis);
 
-  async function getTokenID(authorizationHeader?: string) {
-    if (!authorizationHeader) {
+  async function getTokenID(headers: IncomingHttpHeaders) {
+    const { authorization } = headers;
+    if (!authorization) {
       return null;
     }
 
-    if (authorizationHeader.startsWith("Bearer ")) {
-      const [_, token] = authorizationHeader.split("Bearer ");
+    if (authorization.startsWith("Bearer ")) {
+      const [_, token] = authorization.split("Bearer ");
       const tokenId = await fastify.tokens.check(token);
-      return tokenId;
-    } else if (authorizationHeader.startsWith("Basic ")) {
-      const basicCredentials = basicAuth.parse(authorizationHeader);
+      if (!tokenId) {
+        return null;
+      }
+      return { tokenId, countUsage: true };
+    } else if (authorization.startsWith("Basic ")) {
+      const basicCredentials = basicAuth.parse(authorization);
 
       if (!basicCredentials) {
         return null;
       }
 
       const isRootUser = opts.passphrases.includes(basicCredentials.pass);
       if (isRootUser) {
-        return basicCredentials.name;
+        const countUsage = !!headers["x-quirrel-count-usage"];
+        return { tokenId: basicCredentials.name, countUsage };
       }
     }
 
@@ -62,10 +67,14 @@ const tokenAuthServicePlugin: FastifyPluginCallback<TokenAuthPluginOpts> = (
     request: FastifyRequest | IncomingMessage
   ): Promise<string | null> {
     if (opts.auth) {
-      const { authorization } = request.headers;
-      const tokenId = await getTokenID(authorization);
+      const result = await getTokenID(request.headers);
+      if (!result) {
+        return null;
+      }
+
+      const { tokenId, countUsage } = result;
 
-      if (tokenId) {
+      if (countUsage) {
         usageMeter.record(tokenId);
       }
 

diff --git a/quirrel/src/api/test/authenticated_jobs.test.ts b/quirrel/src/api/test/authenticated_jobs.test.ts
@@ -93,8 +93,12 @@ function testAgainst(backend: "Redis" | "Mock") {
         .auth("ignored", passphrase)
         .expect(200, {});
     });
-
     test("admin impersonation", async () => {
+      await request(quirrel)
+        .delete("/usage")
+        .auth("ignored", passphrase)
+        .expect(200);
+
       const { text: token } = await request(quirrel)
         .put("/tokens/this.is.a.project")
         .auth("ignored", passphrase)
@@ -113,6 +117,33 @@ function testAgainst(backend: "Redis" | "Mock") {
       expect(lastBody).toEqual('{"foo":"bar"}');
       expect(lastSignature).toMatch(/v=(\d+),d=([\da-f]+)/);
       expect(verify(lastBody, token, lastSignature)).toBe(true);
+
+      await request(quirrel)
+        .delete("/usage")
+        .auth("ignored", passphrase)
+        .expect(200, {
+          // only one for execution
+          "this.is.a.project": 1,
+        });
+
+      await request(quirrel)
+        .post("/queues/" + endpoint)
+        .set("x-quirrel-count-usage", "true")
+        .auth("this.is.a.project", passphrase)
+        .send({
+          body: JSON.stringify({ foo: "bar" }),
+        })
+        .expect(201);
+
+      await delay(300);
+
+      await request(quirrel)
+        .delete("/usage")
+        .auth("ignored", passphrase)
+        .expect(200, {
+          // one for enqueueing, one for execution
+          "this.is.a.project": 2,
+        });
     });
   });
 }