Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-06 06:39:15 +01:00
Code Issues Packages Projects Releases Activity

Omit default port in protocol urls (#2014)

Browse Source 
This omits the port in the protocol urls when the port is the default port for the protocol.
So if you have your server https://my.scm.net/scm and the repository admin/test, the protocol url is no longer https://my.scm.net:443/scm/repo/admin/test, but simply https://my.scm.net/scm/repo/admin/test without the :443.
This commit is contained in:
René Pfeuffer
2022-04-29 11:57:28 +02:00
committed by GitHub
parent 84f7c5c099
commit b8e2ae747a
3 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
scm-webapp/src/main/java/sonia/scm/DefaultRootURL.java
View File

@@ -24,6 +24,10 @@
package sonia.scm;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.inject.OutOfScopeException;
import com.google.inject.ProvisionException;
import org.slf4j.Logger;
@@ -37,6 +41,7 @@ import javax.servlet.http.HttpServletRequest;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
/**
* Default implementation of {@link RootURL}.
@@ -50,21 +55,29 @@ public class DefaultRootURL implements RootURL {
private final Provider<HttpServletRequest> requestProvider;
private final ScmConfiguration configuration;
private final LoadingCache<String, URL> urlCache;
@Inject
public DefaultRootURL(Provider<HttpServletRequest> requestProvider, ScmConfiguration configuration) {
this(requestProvider, configuration, new UrlFromString());
}
@VisibleForTesting
DefaultRootURL(Provider<HttpServletRequest> requestProvider, ScmConfiguration configuration, UrlFromString cacheLoader) {
this.requestProvider = requestProvider;
this.configuration = configuration;
this.urlCache = CacheBuilder.newBuilder().maximumSize(10).build(cacheLoader);
}
@Override
public URL get() {
String url = fromRequest().orElse(configuration.getBaseUrl());
String url = fromRequest().orElseGet(configuration::getBaseUrl);
if (url == null) {
throw new IllegalStateException("The configured base url is empty. This can only happened if SCM-Manager has not received any requests.");
}
try {
return new URL(url);
} catch (MalformedURLException e) {
return urlCache.get(url);
} catch (ExecutionException e) {
throw new IllegalStateException(String.format("base url \"%s\" is malformed", url), e);
}
}
@@ -81,4 +94,16 @@ public class DefaultRootURL implements RootURL {
throw ex;
}
}
@VisibleForTesting
static class UrlFromString extends CacheLoader<String, URL> {
@Override
public URL load(String urlString) throws MalformedURLException {
URL url = new URL(urlString);
if (url.getPort() == url.getDefaultPort()) {
return new URL(url.getProtocol(), url.getHost(), -1, url.getFile());
}
return url;
}
}
}