-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix gitea-origin-url with default ports (#29085)
When setting `url.host` on a URL object with no port specified (like is the case of default port), the resulting URL's port will not change. Workaround this quirk in the URL standard by explicitely setting port for the http and https protocols. Extracted the logic to a function for the purpose of testing. Initially I wanted to have the function in utils.js, but it turns out esbuild can not treeshake the unused functions which would result in the webcomponents chunk having all 2kB utils.js inlined, so it seemed not worth. Fixes: #29084
- Loading branch information
1 parent
a4859dc
commit b6bf804
Showing
3 changed files
with
34 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,21 @@ | ||
// Convert an absolute or relative URL to an absolute URL with the current origin | ||
export function toOriginUrl(urlStr) { | ||
try { | ||
// only process absolute HTTP/HTTPS URL or relative URLs ('/xxx' or '//host/xxx') | ||
if (urlStr.startsWith('http://') || urlStr.startsWith('https://') || urlStr.startsWith('/')) { | ||
const {origin, protocol, hostname, port} = window.location; | ||
const url = new URL(urlStr, origin); | ||
url.protocol = protocol; | ||
url.hostname = hostname; | ||
url.port = port || (protocol === 'https:' ? '443' : '80'); | ||
return url.toString(); | ||
} | ||
} catch {} | ||
return urlStr; | ||
} | ||
|
||
window.customElements.define('gitea-origin-url', class extends HTMLElement { | ||
connectedCallback() { | ||
const urlStr = this.getAttribute('data-url'); | ||
try { | ||
// only process absolute HTTP/HTTPS URL or relative URLs ('/xxx' or '//host/xxx') | ||
if (urlStr.startsWith('http://') || urlStr.startsWith('https://') || urlStr.startsWith('/')) { | ||
const url = new URL(urlStr, window.origin); | ||
url.protocol = window.location.protocol; | ||
url.host = window.location.host; | ||
this.textContent = url.toString(); | ||
return; | ||
} | ||
} catch {} | ||
this.textContent = urlStr; | ||
this.textContent = toOriginUrl(this.getAttribute('data-url')); | ||
} | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import {toOriginUrl} from './GiteaOriginUrl.js'; | ||
|
||
test('toOriginUrl', () => { | ||
const oldLocation = window.location; | ||
for (const origin of ['https://example.com', 'https://example.com:3000']) { | ||
window.location = new URL(`${origin}/`); | ||
expect(toOriginUrl('/')).toEqual(`${origin}/`); | ||
expect(toOriginUrl('/org/repo.git')).toEqual(`${origin}/org/repo.git`); | ||
expect(toOriginUrl('https://another.com')).toEqual(`${origin}/`); | ||
expect(toOriginUrl('https://another.com/')).toEqual(`${origin}/`); | ||
expect(toOriginUrl('https://another.com/org/repo.git')).toEqual(`${origin}/org/repo.git`); | ||
expect(toOriginUrl('https://another.com:4000')).toEqual(`${origin}/`); | ||
expect(toOriginUrl('https://another.com:4000/')).toEqual(`${origin}/`); | ||
expect(toOriginUrl('https://another.com:4000/org/repo.git')).toEqual(`${origin}/org/repo.git`); | ||
} | ||
window.location = oldLocation; | ||
}); |