Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(platform/gitlab): Strip unicode null characters from markdown #19664

Merged
merged 8 commits into from
Jan 11, 2023
Merged

fix(platform/gitlab): Strip unicode null characters from markdown #19664

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
345e862
Strip unicode null characters from GitLab markdown
nfm Jan 1, 2023
4ec7101
Merge branch 'main' into patch-1
viceice Jan 5, 2023
bdb7fbb
Update lib/modules/platform/gitlab/index.spec.ts
nfm Jan 5, 2023
6417896
Merge branch 'main' into patch-1
viceice Jan 6, 2023
eb8bd3f
Reorder tests so those that mock utils/pr-body are last
nfm Jan 10, 2023
e8330d9
lint fix
rarkins Jan 10, 2023
53ccf77
Revert change in yarn.lock
nfm Jan 11, 2023
a8f5a84
Merge branch 'main' into patch-1
viceice Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/modules/platform/gitlab/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2074,6 +2074,12 @@ These updates have all been created already. Click a checkbox below to force a r
expect(smartTruncate).toHaveBeenCalledTimes(1);
expect(smartTruncate).toHaveBeenCalledWith(expect.any(String), 1000000);
});

it('strips invalid unicode null characters', () => {
expect(
gitlab.massageMarkdown("The source contains 'Ruby\u0000' at: 2.7.6.219")
).toBe("The source contains 'Ruby' at: 2.7.6.219");
});
});

describe('getVulnerabilityAlerts()', () => {
Expand Down
4 changes: 3 additions & 1 deletion lib/modules/platform/gitlab/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,9 @@ export function massageMarkdown(input: string): string {
let desc = input
.replace(regEx(/Pull Request/g), 'Merge Request')
.replace(regEx(/PR/g), 'MR')
.replace(regEx(/\]\(\.\.\/pull\//g), '](!');
.replace(regEx(/\]\(\.\.\/pull\//g), '](!')
// Strip unicode null characters as GitLab markdown does not permit them
.replace(regEx(/\u0000/g), "");
viceice marked this conversation as resolved.
Show resolved Hide resolved
viceice marked this conversation as resolved.
Show resolved Hide resolved

if (semver.lt(defaults.version, '13.4.0')) {
logger.debug(
Expand Down