replace ssl and forward parameters with base url to fix #32

scm-webapp/src/main/java/sonia/scm/ScmServletModule.java

@@ -45,8 +45,8 @@ import sonia.scm.cache.CacheManager;
 import sonia.scm.cache.EhCacheManager;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.filter.AdminSecurityFilter;
+import sonia.scm.filter.BaseUrlFilter;
 import sonia.scm.filter.GZipFilter;
-import sonia.scm.filter.SSLFilter;
 import sonia.scm.filter.SecurityFilter;
 import sonia.scm.group.GroupManager;
 import sonia.scm.group.xml.XmlGroupManager;
@@ -225,7 +225,7 @@ public class ScmServletModule extends ServletModule
      * filter(PATTERN_PAGE,
      *      PATTERN_STATIC_RESOURCES).through(StaticResourceFilter.class);
      */
-    filter(PATTERN_ALL).through(SSLFilter.class);
+    filter(PATTERN_ALL).through(BaseUrlFilter.class);
     filterRegex(RESOURCE_REGEX).through(GZipFilter.class);
     filter(PATTERN_RESTAPI, PATTERN_DEBUG).through(SecurityFilter.class);
     filter(PATTERN_CONFIG, PATTERN_ADMIN).through(AdminSecurityFilter.class);

scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java

@@ -263,22 +263,10 @@ public class RepositoryResource
 
     if (handler != null)
     {
-      HttpServletRequest request = requestProvider.get();
-      StringBuilder url = new StringBuilder(request.getScheme());
+      String url = handler.createResourcePath(repository);
 
-      url.append("://").append(configuration.getServername());
-      url.append(":").append(HttpUtil.getServerPort(configuration, request));
-
-      String ctxPath = request.getContextPath();
-
-      if (ctxPath.endsWith("/"))
-      {
-        ctxPath = ctxPath.substring(0, ctxPath.length() - 1);
-      }
-
-      url.append(ctxPath);
-      url.append(handler.createResourcePath(repository));
-      repository.setUrl(url.toString());
+      url = HttpUtil.getCompleteUrl(configuration, url);
+      repository.setUrl(url);
     }
   }
 

scm-webapp/src/main/java/sonia/scm/filter/BaseUrlFilter.java

@@ -39,6 +39,8 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import sonia.scm.config.ScmConfiguration;
+import sonia.scm.util.HttpUtil;
+import sonia.scm.util.Util;
 import sonia.scm.web.filter.HttpFilter;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -55,7 +57,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author Sebastian Sdorra
  */
 @Singleton
-public class SSLFilter extends HttpFilter
+public class BaseUrlFilter extends HttpFilter
 {
 
   /**
@@ -65,7 +67,7 @@ public class SSLFilter extends HttpFilter
    * @param configuration
    */
   @Inject
-  public SSLFilter(ScmConfiguration configuration)
+  public BaseUrlFilter(ScmConfiguration configuration)
   {
     this.configuration = configuration;
   }
@@ -88,20 +90,59 @@ public class SSLFilter extends HttpFilter
                           HttpServletResponse response, FilterChain chain)
           throws IOException, ServletException
   {
-    if (request.isSecure() ||!configuration.isEnableSSL())
+    if (Util.isEmpty(configuration.getBaseUrl()))
+    {
+      configuration.setBaseUrl(createDefaultBaseUrl(request));
+    }
+
+    if (!configuration.isForceBaseUrl() || isBaseUrl(request))
     {
       chain.doFilter(request, response);
     }
     else
     {
-      StringBuilder url = new StringBuilder("https://");
+      String url = HttpUtil.getCompleteUrl(configuration,
+                     HttpUtil.getStrippedURI(request));
 
-      url.append(request.getServerName()).append(":");
-      url.append(configuration.getSslPort()).append(request.getRequestURI());
-      response.sendRedirect(url.toString());
+      response.sendRedirect(url);
     }
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param request
+   *
+   * @return
+   */
+  private String createDefaultBaseUrl(HttpServletRequest request)
+  {
+    StringBuilder sb = new StringBuilder(request.getScheme());
+
+    sb.append("://").append(request.getServerName()).append(":");
+    sb.append(String.valueOf(request.getServerPort()));
+    sb.append(request.getContextPath());
+
+    return sb.toString();
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param request
+   *
+   * @return
+   */
+  private boolean isBaseUrl(HttpServletRequest request)
+  {
+    return request.getRequestURL().toString().startsWith(
+        configuration.getBaseUrl());
+  }
+
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */

scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java

@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
 
 import sonia.scm.SCMContext;
 import sonia.scm.config.ScmConfiguration;
-import sonia.scm.util.HttpUtil;
 import sonia.scm.util.IOUtil;
 import sonia.scm.util.SystemUtil;
 import sonia.scm.util.Util;
@@ -211,7 +210,8 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
   private EnvList createEnvironment()
   {
     String pathInfo = request.getPathInfo();
-    int serverPort = HttpUtil.getServerPort(configuration, request);
+
+    // int serverPort = HttpUtil.getServerPort(configuration, request);
     String scriptName = request.getRequestURI().substring(0,
                           request.getRequestURI().length() - pathInfo.length());
     String scriptPath = context.getRealPath(scriptName);
@@ -260,7 +260,8 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
     env.set(ENV_SCRIPT_NAME, scriptName);
     env.set(ENV_SCRIPT_FILENAME, scriptPath);
     env.set(ENV_SERVER_NAME, Util.nonNull(request.getServerName()));
-    env.set(ENV_SERVER_PORT, Integer.toString(serverPort));
+
+    // env.set(ENV_SERVER_PORT, Integer.toString(serverPort));
     env.set(ENV_SERVER_PROTOCOL, Util.nonNull(request.getProtocol()));
     env.set(
         ENV_SERVER_SOFTWARE,