Skip to content
This repository has been archived by the owner on Jul 1, 2024. It is now read-only.

Non-GitHub requests throwing ReferenceError #434

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Non-GitHub requests throwing ReferenceError #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4644ec
fix: non-github trigger errors
MrGriefs Feb 1, 2022
21beaac
remove unnecessary optional chaining
MrGriefs Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/pr-trigger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ class IgnoredBecause {

export async function httpTrigger(context: Context, req: HttpRequest) {
httpLog(context, req);
const { headers, body } = req, githubId = headers["x-github-delivery"];
const evName = headers["x-github-event"], evAction = body.action;

if (!(await shouldRunRequest(context, req))) {
return reply(context, 204, "Can't handle this request");
}

const { headers, body } = req, githubId = headers["x-github-delivery"];
const evName = headers["x-github-event"], evAction = body.action;

if (evName === "check_run" && evAction === "completed") {
context.log(`>>>>>> name: ${body?.check_run?.name}, sha: ${body?.check_run?.head_sha}`);
if (body?.check_run?.head_sha && body?.repository?.full_name === "DefinitelyTyped/DefinitelyTyped") {
const pr = await runQueryToGetPRMetadataForSHA1("DefinitelyTyped", "DefinitelyTyped", body?.check_run?.head_sha);
context.log(`>>>>>> name: ${body.check_run?.name}, sha: ${body.check_run?.head_sha}`);
if (body.check_run?.head_sha && body.repository?.full_name === "DefinitelyTyped/DefinitelyTyped") {
const pr = await runQueryToGetPRMetadataForSHA1("DefinitelyTyped", "DefinitelyTyped", body.check_run?.head_sha);
if (pr) {
context.log(`>>>>>>>>> pr => num: ${pr.number}, title: "${pr.title}" closed: ${pr.closed}`);
} else {
Expand Down
14 changes: 7 additions & 7 deletions src/util/verify.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export async function httpLog(context: Context, req: HttpRequest) {
const { headers, body } = req;
const githubId = headers["x-github-delivery"];
const event = headers["x-github-event"]!;
const action = body.action;
const action = body?.action;
context.log(`>>> HTTP Trigger ${context.executionContext.functionName} [${
event}.${action
}; gh: ${githubId
Expand All @@ -15,11 +15,6 @@ export async function httpLog(context: Context, req: HttpRequest) {

export async function shouldRunRequest(context: Context, req: HttpRequest, canHandleRequest?: (event: string, action: string) => boolean) {
const isDev = process.env.AZURE_FUNCTIONS_ENVIRONMENT === "Development";
const { headers, body } = req;

const event = headers["x-github-event"]!;
const action = body.action;

// For process.env.GITHUB_WEBHOOK_SECRET see
// https://ms.portal.azure.com/#blade/WebsitesExtension/FunctionsIFrameBlade/id/%2Fsubscriptions%2F57bfeeed-c34a-4ffd-a06b-ccff27ac91b8%2FresourceGroups%2Fdtmergebot%2Fproviders%2FMicrosoft.Web%2Fsites%2FDTMergeBot
const fromGitHub = await verifyIsFromGitHub(req);
Expand All @@ -28,6 +23,10 @@ export async function shouldRunRequest(context: Context, req: HttpRequest, canHa
return false;
}

const { headers, body } = req;
const event = headers["x-github-event"]!;
const action = body.action;

// Optional function for early bailing if it returns false
if (canHandleRequest && !canHandleRequest(event, action)) {
context.log("canHandleRequest returned false");
Expand All @@ -39,10 +38,11 @@ export async function shouldRunRequest(context: Context, req: HttpRequest, canHa


export async function verifyIsFromGitHub(req: HttpRequest) {
if (!req.headers["x-hub-signature-256"] || !req.rawBody) return false;
const secret = process.env.GITHUB_WEBHOOK_SECRET;

// For process.env.GITHUB_WEBHOOK_SECRET see
// https://ms.portal.azure.com/#blade/WebsitesExtension/FunctionsIFrameBlade/id/%2Fsubscriptions%2F57bfeeed-c34a-4ffd-a06b-ccff27ac91b8%2FresourceGroups%2Fdtmergebot%2Fproviders%2FMicrosoft.Web%2Fsites%2FDTMergeBot
return await verify(secret!, req.rawBody, req.headers["x-hub-signature-256"]!);
return await verify(secret!, req.rawBody, req.headers["x-hub-signature-256"]);
}