Merge pull request #1973 from gitgitgadget/some-fixes

Some more fixes ;-)

Author: dscho

lib/ci-helper.ts

@@ -541,13 +541,13 @@ export class CIHelper {
             }
         }
 
-        const match = comment.body.match(/^\s*(\/[-a-z]+)(\s+(.*?))?\s*$/);
+        const match = comment.body.trim().match(/^(\/[-a-z]+)\s*(.*)$/);
         if (!match) {
             console.log(`Not a command; doing nothing: '${comment.body}'`);
             return; /* nothing to do */
         }
         const command = match[1];
-        const argument = match[3];
+        const argument = match[2].trim();
         const prKey = {
             owner: repositoryOwner,
             repo: this.config.repo.name,

lib/git-notes.ts

@@ -219,6 +219,7 @@ export class GitNotes {
                 continue;
             }
 
+            // eslint-disable-next-line security/detect-unsafe-regex
             const removeAdd = split[i + 6].match(/^(?:-(.*)\n)?\+(.*)$/);
             if (!removeAdd) throw new Error(`Not a single modified line?\n${split[i + 6]}`);
 

lib/mail-archive-helper.ts

@@ -240,6 +240,7 @@ export class MailArchiveGitHelper {
         let counter = 0;
         const lineHandler = async (line: string): Promise<void> => {
             if (line.startsWith("@@ ")) {
+                // eslint-disable-next-line security/detect-unsafe-regex
                 const match = line.match(/^@@ -(\d+,)?\d+ \+(\d+,)?(\d+)?/);
                 if (match) {
                     if (counter) {

lib/mail-commit-mapping.ts

@@ -42,6 +42,7 @@ export class MailCommitMapping {
             refs.push(`+refs/heads/*:refs/remotes/${this.config.repo.maintainerBranch}/*`);
         }
         if (refs.length) {
+            console.log(`Updating mail-to-commit/refs: ${refs.join(", ")}`);
             await git(["fetch", `https://github.com/${this.config.repo.owner}/${this.config.repo.name}`, ...refs], {
                 workDir: this.workDir,
             });

lib/patch-series.ts

@@ -1,3 +1,4 @@
+/* eslint-disable security/detect-unsafe-regex */
 import addressparser from "nodemailer/lib/addressparser/index.js";
 import mimeFuncs from "nodemailer/lib/mime-funcs/index.js";
 import { commitExists, git, gitConfig, gitShortHash, revListCount, revParse } from "./git.js";

lib/project-config.ts

@@ -80,6 +80,7 @@ export async function loadConfig(file: string): Promise<IConfig> {
         const { default: newConfig } = (await import(file)) as importedConfig;
         loadedConfig = newConfig;
     } else {
+        // eslint-disable-next-line security/detect-non-literal-fs-filename
         const fileText = fs.readFileSync(file, { encoding: "utf-8" });
         loadedConfig = JSON.parse(fileText) as IConfig;
     }

lib/send-mail.ts

@@ -125,6 +125,7 @@ export function parseMBoxMessageIDAndReferences(parsed: IParsedMBox): { messageI
      * using regular expressions due to its recursive nature) but seems to be
      * good enough for the Git mailing list.
      */
+    // eslint-disable-next-line security/detect-unsafe-regex
     const msgIdRegex = /^\s*<([^>]+)>(\s*|,)(\([^")]*("[^"]*")?\)\s*|\([^)]*\)$)?(<.*)?$/;
     for (const header of parsed.headers ?? []) {
         if (header.key.match(/In-Reply-To|References/i)) {

lib/sous-chef.ts

@@ -18,6 +18,7 @@ export class SousChef {
 
             const branches = sections[i + 1].split(/\n\* ([a-z][^]+?)\n\n/m);
             for (let j = 1; j < branches.length; j += 2) {
+                // eslint-disable-next-line security/detect-unsafe-regex
                 const match = branches[j].match(/([^ ]+).*\n *(\(merged to [^)]+\))?/m);
                 if (!match) {
                     continue;

tests/git-notes.test.ts

@@ -120,7 +120,7 @@ test("push()", async () => {
     interface O {
         hello: string;
         bye?: string;
-    };
+    }
     const o: O = { hello: "world" };
     await notes.set("", o);
     await notes.push(remoteRepo.workDir);