fix(git): commitEntry normalize user (#1813)

faker-js · Feb 4, 2023 · 667599d · 667599d
1 parent 8e4526d
commit 667599d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/modules/git/index.ts b/src/modules/git/index.ts
@@ -109,9 +109,12 @@ export class GitModule {
     const lastName = this.faker.person.lastName();
     const fullName = this.faker.person.fullName({ firstName, lastName });
     const username = this.faker.internet.userName(firstName, lastName);
-    const user = this.faker.helpers.arrayElement([fullName, username]);
+    let user = this.faker.helpers.arrayElement([fullName, username]);
     const email = this.faker.internet.email(firstName, lastName);
 
+    // Normalize user according to https://github.com/libgit2/libgit2/issues/5342
+    user = user.replace(/^[\.,:;"\\']|[\<\>\n]|[\.,:;"\\']$/g, '');
+
     lines.push(
       `Author: ${user} <${email}>`,
       `Date: ${this.commitDate({ refDate })}`,

diff --git a/test/git.spec.ts b/test/git.spec.ts
@@ -54,12 +54,12 @@ describe('git', () => {
           expect(parts[0]).toMatch(/^commit [a-f0-9]+$/);
           if (parts.length === 7) {
             expect(parts[1]).toMatch(/^Merge: [a-f0-9]+ [a-f0-9]+$/);
-            expect(parts[2]).toMatch(/^Author: [\w_\. ]+ \<[\w\.]+@[\w\.]+\>$/);
+            expect(parts[2]).toMatch(/^Author: [^\<\>]+ \<[\w\.]+@[\w\.]+\>$/);
             expect(parts[3]).toMatch(/^Date: .+$/);
             expect(parts[4]).toBe('');
             expect(parts[5]).toMatch(/^\s{4}.+$/);
           } else {
-            expect(parts[1]).toMatch(/^Author: [\w_\. ]+ \<[\w\.]+@[\w\.]+\>$/);
+            expect(parts[1]).toMatch(/^Author: [^\<\>]+ \<[\w\.]+@[\w\.]+\>$/);
             expect(parts[2]).toMatch(/^Date: .+$/);
             expect(parts[3]).toBe('');
             expect(parts[4]).toMatch(/^\s{4}.+$/);