Skip to content

Commit 61241f7

Browse files
authored
ci: adds codeql-analysis.yml for codeql execution (#694)
1 parent 053fa19 commit 61241f7

File tree

3 files changed

+121
-4
lines changed

3 files changed

+121
-4
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ "master" ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ "master" ]
20+
schedule:
21+
- cron: '28 11 * * 6'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'typescript' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
38+
39+
steps:
40+
- name: Checkout repository
41+
uses: actions/checkout@v3
42+
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v2
46+
with:
47+
languages: ${{ matrix.language }}
48+
# If you wish to specify custom queries, you can do so here or in a config file.
49+
# By default, queries listed here will override any specified in a config file.
50+
# Prefix the list here with "+" to use these queries and those in the config file.
51+
52+
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
53+
# queries: security-extended,security-and-quality
54+
55+
56+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
57+
# If this step fails, then you should remove it and run the build manually (see below)
58+
- name: Autobuild
59+
uses: github/codeql-action/autobuild@v2
60+
61+
# ℹ️ Command-line programs to run using the OS shell.
62+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
63+
64+
# If the Autobuild fails above, remove it and uncomment the following three lines.
65+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
66+
67+
# - run: |
68+
# echo "Run, Build Application using script"
69+
# ./location_of_script_within_repo/buildscript.sh
70+
71+
- name: Perform CodeQL Analysis
72+
uses: github/codeql-action/analyze@v2

src/middleware/node/middleware.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,18 @@ export async function middleware(
9393

9494
if (didTimeout) return;
9595

96-
const statusCode = Array.from(error as WebhookEventHandlerError)[0].status;
97-
response.statusCode = typeof statusCode !== "undefined" ? statusCode : 500;
98-
response.end(String(error));
96+
const err = Array.from(error as WebhookEventHandlerError)[0];
97+
const errorMessage = err.message
98+
? `${err.name}: ${err.message}`
99+
: "Error: An Unspecified error occurred";
100+
response.statusCode = typeof err.status !== "undefined" ? err.status : 500;
101+
102+
options.log.error(error);
103+
104+
response.end(
105+
JSON.stringify({
106+
error: errorMessage,
107+
})
108+
);
99109
}
100110
}

test/integration/node-middleware.test.ts

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,42 @@ describe("createNodeMiddleware(webhooks)", () => {
264264
}
265265
);
266266

267-
await expect(response.text()).resolves.toMatch(/boom/);
267+
await expect(response.text()).resolves.toMatch(/Error: boom/);
268+
expect(response.status).toEqual(500);
269+
270+
server.close();
271+
});
272+
273+
test("Handles empty errors", async () => {
274+
const webhooks = new Webhooks({
275+
secret: "mySecret",
276+
});
277+
278+
webhooks.on("push", () => {
279+
throw new Error();
280+
});
281+
282+
const server = createServer(createNodeMiddleware(webhooks)).listen();
283+
284+
// @ts-expect-error complains about { port } although it's included in returned AddressInfo interface
285+
const { port } = server.address();
286+
287+
const response = await fetch(
288+
`http://localhost:${port}/api/github/webhooks`,
289+
{
290+
method: "POST",
291+
headers: {
292+
"X-GitHub-Delivery": "123e4567-e89b-12d3-a456-426655440000",
293+
"X-GitHub-Event": "push",
294+
"X-Hub-Signature-256": signatureSha256,
295+
},
296+
body: pushEventPayload,
297+
}
298+
);
299+
300+
await expect(response.text()).resolves.toMatch(
301+
/Error: An Unspecified error occurred/
302+
);
268303
expect(response.status).toEqual(500);
269304

270305
server.close();

0 commit comments

Comments
 (0)