Updates to GitHub hooks

Author: typeofweb

package-lock.json

@@ -33,6 +33,7 @@
     "polish-plurals": "1.1.0",
     "request": "2.88.2",
     "request-promise": "4.2.5",
+    "secure-json-parse": "2.1.0",
     "typescript": "3.8.3",
     "zlib-sync": "0.1.6"
   },
@@ -44,6 +45,7 @@
     "@types/nock": "11.1.0",
     "@types/node": "13.13.4",
     "@types/node-fetch": "2.5.7",
+    "@types/secure-json-parse": "1.0.2",
     "@types/sinon": "9.0.0",
     "@types/sinon-chai": "3.2.4",
     "chai": "4.2.0",

package.json

@@ -30,12 +30,30 @@ async function handleGithubWebhook(
 
   const discordWebhookUrl = getConfig('GITHUB_WEBHOOK_DISCORD_URL');
 
-  const { status } = await fetch(discordWebhookUrl, {
+  const newHeaders = {
+    // 'x-real-ip': headers['x-real-ip'],
+    // 'x-forwarded-for': headers['x-forwarded-for'],
+    // host: headers.host,
+    // 'x-forwarded-proto': headers['x-forwarded-proto'],
+    // connection: headers.connection,
+    // 'content-length': headers['content-length'],
+    // 'x-nginx-ssl': headers['x-nginx-ssl'],
+    // 'user-agent': headers['user-agent'],
+    // accept: headers.accept,
+    'x-github-delivery': headers['x-github-delivery'],
+    'x-github-event': headers['x-github-event'],
+    'x-hub-signature': headers['x-hub-signature'],
+    'content-type': headers['content-type'],
+    // 'x-forwarded-https': headers['x-forwarded-https'],
+  } as Record<string, string>;
+
+  const res = await fetch(discordWebhookUrl, {
     method: 'POST',
-    body: JSON.stringify(body),
+    body: rawBody,
+    headers: newHeaders,
   });
 
-  return { statusCode: status };
+  return { statusCode: res.status };
 }
 
 function shouldSendWebhook(body: object | GithubWebhookPullRequest) {

src/handle-github-webhook.ts

@@ -1,10 +1,23 @@
 import Http from 'http';
 import handleGithubWebhook from './handle-github-webhook';
 import type { Client } from 'discord.js';
+import JsonParse from 'secure-json-parse';
 
 const BAD_REQUEST = 400;
 const OK = 200;
 
+async function parseBody<T = object>(
+  req: Http.IncomingMessage
+): Promise<{ rawBody: Buffer; body: T }> {
+  const chunks = [];
+  for await (const chunk of req) {
+    chunks.push(chunk);
+  }
+  const rawBody = Buffer.concat(chunks);
+  const body = JsonParse.parse(rawBody.toString()) as T;
+  return { rawBody, body };
+}
+
 function createHttpServer(
   discordClient: Client,
   errors: Error[],
@@ -13,22 +26,16 @@ function createHttpServer(
 ): Http.Server {
   return Http.createServer(async (req, res) => {
     if (req.url?.startsWith('/githubWebhook')) {
-      const chunks = [];
-      for await (const chunk of req) {
-        chunks.push(chunk);
-      }
-
       try {
-        const rawBody = Buffer.concat(chunks);
-        const body = JSON.parse(rawBody.toString());
-        const headers = req.headers;
+        const { headers } = req;
+        const { rawBody, body } = await parseBody(req);
 
         const { statusCode } = await handleGithubWebhook(headers, rawBody, body);
 
         res.statusCode = statusCode;
         res.end();
       } catch (error) {
-        console.log(error);
+        errors.push(error.message ?? error);
         res.statusCode = BAD_REQUEST;
         res.end();
       }

src/http-server.ts

@@ -18,7 +18,7 @@ fi
 git pull origin main
 
 echo "👉 Installing deps…"
-npm ci
+# npm ci
 
 echo "👉 Bulding…"
 NODE_ENV=production ENV=production npm run build