Skip to content

fix(source-control): recognize encoded Gitea repository URLs #18

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

Open
kalvenschraut wants to merge 1 commit into from
Open

fix(source-control): recognize encoded Gitea repository URLs #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/server/src/sourceControl/giteaRepository.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ it("accepts PR numbers and URLs only from the selected repository", () => {
giteaPullRequestNumber(`${base}/TEAM/REPO/pulls/42/files`, "team/repo", base),
42,
);
assert.strictEqual(
giteaPullRequestNumber(`${base}/%C3%A9quipe/r%C3%A9po/pulls/43/files`, "équipe/répo", base),
43,
);
for (const ref of [
"0",
"-1",
Expand Down
3 changes: 2 additions & 1 deletion apps/server/src/sourceControl/giteaRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ export function giteaPullRequestNumber(
try {
const url = new URL(reference);
const base = new URL(baseUrl);
const expected = `${base.pathname.replace(/\/+$/u, "")}/${repository}/pulls/`;
const encodedRepository = repository.split("/").map(encodeURIComponent).join("/");
const expected = `${base.pathname.replace(/\/+$/u, "")}/${encodedRepository}/pulls/`;
if (
url.origin !== base.origin ||
!url.pathname.toLowerCase().startsWith(expected.toLowerCase())
Expand Down