[gitea] 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: https://github.com/go-gitea/gitea/issues/29084 (cherry picked from commit b6bf8041d8e8ee845728687b1f358f1d482afff2)
This commit is contained in:
		
					parent
					
						
							
								00370f17a4
							
						
					
				
			
			
				commit
				
					
						73e32eae5b
					
				
			
		
					 3 changed files with 34 additions and 13 deletions
				
			
		| 
						 | 
				
			
			@ -811,7 +811,7 @@ rules:
 | 
			
		|||
  wc/no-constructor-params: [2]
 | 
			
		||||
  wc/no-constructor: [2]
 | 
			
		||||
  wc/no-customized-built-in-elements: [2]
 | 
			
		||||
  wc/no-exports-with-element: [2]
 | 
			
		||||
  wc/no-exports-with-element: [0]
 | 
			
		||||
  wc/no-invalid-element-name: [2]
 | 
			
		||||
  wc/no-invalid-extends: [2]
 | 
			
		||||
  wc/no-method-prefixed-with-on: [2]
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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'));
 | 
			
		||||
  }
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										17
									
								
								web_src/js/webcomponents/GiteaOriginUrl.test.js
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								web_src/js/webcomponents/GiteaOriginUrl.test.js
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -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;
 | 
			
		||||
});
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue