Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-21 23:12:11 +01:00
Code Issues Packages Projects Releases Activity

Fix redirect to https

Browse Source 
Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
This commit is contained in:
Rene Pfeuffer
2024-01-10 17:56:54 +01:00
parent 7f0da35659
commit a67d623042
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scm-server/src/main/java/sonia/scm/server/ServerConfiguration.java
View File

@@ -24,6 +24,7 @@
package sonia.scm.server;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.ForwardedRequestCustomizer;
import org.eclipse.jetty.server.Handler;
@@ -34,6 +35,7 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.SecuredRedirectHandler;
import org.eclipse.jetty.util.resource.ResourceCollection;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.WebAppContext;
@@ -110,7 +112,7 @@ public final class ServerConfiguration {
private void configureHttp(Server server) {
HttpConfiguration httpConfig = createCustomHttpConfig();
redirectHttpToHttps(httpConfig);
configureHttps(httpConfig);
ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
System.out.println("Set http address binding to " + configYaml.getAddressBinding());
connector.setHost(configYaml.getAddressBinding());
@@ -119,17 +121,20 @@ public final class ServerConfiguration {
server.addConnector(connector);
}
private void redirectHttpToHttps(HttpConfiguration httpConfig) {
private void configureHttps(HttpConfiguration httpConfig) {
ServerConfigYaml.SSLConfig https = configYaml.getHttps();
if (configYaml.getHttps().isRedirectHttpToHttps()) {
httpConfig.setSecurePort(https.getSslPort());
httpConfig.setSecureScheme("https");
}
httpConfig.setSecurePort(https.getSslPort());
httpConfig.setSecureScheme("https");
}
private void configureHandler(Server server) {
HandlerCollection handlerCollection = new HandlerCollection();
handlerCollection.setHandlers(new Handler[]{createWebAppContext(), createDocRoot()});
if (configYaml.getHttps().isRedirectHttpToHttps()) {
System.out.println("Set http to https redirect");
handlerCollection.addHandler(new SecuredRedirectHandler(HttpStatus.MOVED_PERMANENTLY_301));
}
handlerCollection.addHandler(createWebAppContext());
handlerCollection.addHandler(createDocRoot());
server.setHandler(handlerCollection);
}