From aad02ec132acf366adde4e600b308bb0aa716e2c Mon Sep 17 00:00:00 2001 From: "github-agentic-autofix[bot]" <314318003+GitHub Agentic Autofix@users.noreply.github.com> Date: Thu, 12 Nov 2026 16:01:58 +0000 Subject: [PATCH 1/3] Initial plan From f44ac1af6cc85260e5caac64f76112fff6382a2c Mon Sep 17 00:00:00 2001 From: "github-agentic-autofix[bot]" <314318003+GitHub Agentic Autofix@users.noreply.github.com> Date: Thu, 12 Nov 2026 16:05:25 +0000 Subject: [PATCH 2/3] Fix SQL injection in survey persistence Co-authored-by: mageroni <107436170+mageroni@users.noreply.github.com> --- index.js | 55 +++++++++++++++++++++++++++----------- test/index.test.js | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 16 deletions(-) diff --git a/index.js b/index.js index b114e64..ee62c28 100644 --- a/index.js +++ b/index.js @@ -18,6 +18,23 @@ const { LANGUAGE_API_KEY, LANGUAGE_API_ENDPOINT, DATABASE_CONNECTION_STRING, VALIDATE_SEAT_ASSIGNMENT, APPLICATIONINSIGHTS_CONNECTION_STRING } = process.env; +const SURVEY_COLUMNS = [ + "enterprise_name", + "organization_name", + "repository_name", + "issue_id", + "issue_number", + "PR_number", + "assignee_name", + "is_copilot_used", + "saving_percentage", + "usage_frequency", + "savings_invested", + "comment", + "created_at", + "completed_at", +]; + export default (app) => { // Your code here app.log.info("Yay, the app was loaded!"); @@ -279,27 +296,33 @@ export default (app) => { app.log.info("Database has been created and issue id existence has been confirmed"); if (result.recordset.length > 0) { - // create query - let update_query = `UPDATE [SurveyResults] SET [is_copilot_used] = ${newContent.is_copilot_used}`; - - for (let key in newContent) { - if (newContent.hasOwnProperty(key) && newContent[key] !== undefined && key !== "is_copilot_used") { - update_query += `, [${key}] = '${newContent[key]}'`; - } - } - - update_query += ` WHERE [issue_id] = ${newContent.issue_id}`; + const updateColumns = SURVEY_COLUMNS.filter( + (column) => column !== "is_copilot_used" && newContent[column] !== undefined + ); + const updateRequest = new sql.Request(conn); + updateRequest.input("is_copilot_used", newContent.is_copilot_used); + updateColumns.forEach((column, index) => { + updateRequest.input(`value${index}`, newContent[column]); + }); + updateRequest.input("issue_id", newContent.issue_id); + const update_query = `UPDATE [SurveyResults] SET [is_copilot_used] = @is_copilot_used, ${updateColumns + .map((column, index) => `[${column}] = @value${index}`) + .join(", ")} WHERE [issue_id] = @issue_id`; // update existing record - let update_result = await sql.query(update_query); + let update_result = await updateRequest.query(update_query); app.log.info(update_result); } else { // insert new record if it doesn't exist - let keys = Object.keys(newContent).join(', '); - let values = Object.values(newContent).map(value => `'${value}'`).join(', '); - - let insert_query = `INSERT INTO SurveyResults (${keys}) VALUES (${values})`; - let insert_result = await sql.query(insert_query); + const insertColumns = SURVEY_COLUMNS.filter((column) => newContent[column] !== undefined); + const insertRequest = new sql.Request(conn); + insertColumns.forEach((column, index) => { + insertRequest.input(`value${index}`, newContent[column]); + }); + const insert_query = `INSERT INTO SurveyResults (${insertColumns + .map((column) => `[${column}]`) + .join(", ")}) VALUES (${insertColumns.map((_, index) => `@value${index}`).join(", ")})`; + let insert_result = await insertRequest.query(insert_query); app.log.info(insert_result); } } catch (err) { diff --git a/test/index.test.js b/test/index.test.js index d56d894..ae874f4 100644 --- a/test/index.test.js +++ b/test/index.test.js @@ -25,11 +25,16 @@ jest.unstable_mockModule("mssql", () => ({ connect: jest.fn(), query: jest.fn().mockResolvedValue({ recordset: [] }), close: jest.fn(), + Request: jest.fn().mockImplementation(() => ({ + input: jest.fn().mockReturnThis(), + query: jest.fn().mockResolvedValue({}), + })), }, })); // Dynamically import the app AFTER mocks are registered const { default: myProbotApp } = await import(".."); +const { default: sql } = await import("mssql"); const requireJSON = createRequire(import.meta.url); const payload_pr_closed = requireJSON("./fixtures/pull_request.closed.json"); @@ -174,7 +179,68 @@ describe("My Probot app", () => { expect(mock.pendingMocks()).toStrictEqual([]); }); + test("parameterizes survey data containing SQL syntax", async () => { + const injection = "'; DROP TABLE SurveyResults;--"; + const payload = structuredClone(issue_comment_created); + payload.comment.body = injection; + + const mock = nock("https://api.github.com") + .post("/app/installations/35217443/access_tokens") + .reply(200, { + token: "test", + permissions: { + issues: "write", + }, + }) + .patch("/repos/mageroni/TestRepo/issues/60") + .reply(200); + + sql.Request.mockClear(); + + await probot.receive({ name: "issue_comment", payload }); + + const request = sql.Request.mock.results[0].value; + const query = request.query.mock.calls[0][0]; + expect(query).not.toContain(injection); + expect(query).toContain("@value11"); + expect(request.input).toHaveBeenCalledWith("value11", injection); + expect(mock.pendingMocks()).toStrictEqual([]); + }); + + test("parameterizes updates to existing survey data", async () => { + const injection = "'; DROP TABLE SurveyResults;--"; + const payload = structuredClone(issue_comment_created); + payload.comment.body = injection; + sql.query.mockImplementation((queryParts) => ({ + recordset: queryParts.join("").includes("SELECT * FROM SurveyResults") ? [{}] : [], + })); + + const mock = nock("https://api.github.com") + .post("/app/installations/35217443/access_tokens") + .reply(200, { + token: "test", + permissions: { + issues: "write", + }, + }) + .patch("/repos/mageroni/TestRepo/issues/60") + .reply(200); + + sql.Request.mockClear(); + + await probot.receive({ name: "issue_comment", payload }); + + const request = sql.Request.mock.results[0].value; + const query = request.query.mock.calls[0][0]; + expect(query).toContain("UPDATE [SurveyResults]"); + expect(query).not.toContain(injection); + expect(query).toContain("[comment] = @value10"); + expect(request.input).toHaveBeenCalledWith("value10", injection); + expect(mock.pendingMocks()).toStrictEqual([]); + }); + afterEach(() => { + sql.query.mockReset().mockResolvedValue({ recordset: [] }); nock.cleanAll(); nock.enableNetConnect(); }); From fe342507c2eeed36e9e7d4e9520ead5e00a21267 Mon Sep 17 00:00:00 2001 From: Mabel Geronimo <107436170+mageroni@users.noreply.github.com> Date: Thu, 12 Nov 2026 10:21:34 -0600 Subject: [PATCH 3/3] Update query validation and input expectations Refactor query validation to extract comment parameter and check format. Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- test/index.test.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/index.test.js b/test/index.test.js index ae874f4..927b2bd 100644 --- a/test/index.test.js +++ b/test/index.test.js @@ -202,8 +202,10 @@ describe("My Probot app", () => { const request = sql.Request.mock.results[0].value; const query = request.query.mock.calls[0][0]; expect(query).not.toContain(injection); - expect(query).toContain("@value11"); - expect(request.input).toHaveBeenCalledWith("value11", injection); + const [, columns, values] = query.match(/\(([^)]*)\) VALUES \(([^)]*)\)/); + const commentParam = values.split(", ")[columns.split(", ").indexOf("[comment]")]; + expect(commentParam).toMatch(/^@\w+$/); + expect(request.input).toHaveBeenCalledWith(commentParam.slice(1), injection); expect(mock.pendingMocks()).toStrictEqual([]); });