Merge AnonymousAccessController and GitHubCompatibleAccessController

src/main/scala/ScalatraBootstrap.scala

@@ -27,8 +27,7 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
     context.getFilterRegistration("apiAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
 
     // Register controllers
-    context.mount(new GitHubCompatibleAccessController, "/*")
-    context.mount(new AnonymousAccessController, "/*")
+    context.mount(new PreProcessController, "/*")
 
     context.addFilter("pluginControllerFilter", new PluginControllerFilter)
     context.getFilterRegistration("pluginControllerFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")

src/main/scala/gitbucket/core/controller/AnonymousAccessController.scala

@@ -1,14 +0,0 @@
-package gitbucket.core.controller
-
-class AnonymousAccessController extends AnonymousAccessControllerBase
-
-trait AnonymousAccessControllerBase extends ControllerBase {
-  get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
-    if(!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
-      !context.currentPath.startsWith("/register")) {
-      Unauthorized()
-    } else {
-      pass()
-    }
-  }
-}

src/main/scala/gitbucket/core/controller/GitHubCompatibleAccessController.scala

@@ -1,29 +0,0 @@
-package gitbucket.core.controller
-
-import org.scalatra.MovedPermanently
-
-class GitHubCompatibleAccessController extends GitHubCompatibleAccessControllerBase
-
-/**
-  * Provides GitHub compatible URLs for Git client.
-  *
-  * <ul>
-  *   <li>git clone http://localhost:8080/owner/repo</li>
-  *   <li>git clone http://localhost:8080/owner/repo.git</li>
-  * </ul>
-  */
-trait GitHubCompatibleAccessControllerBase extends ControllerBase {
-  /**
-    * Git client initiates a connection with /info/refs
-    *
-    * @see https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols
-    */
-  get("/*/*/info/refs") {
-    redirectToGitServlet()
-  }
-
-  private def redirectToGitServlet(): Unit = {
-    val query = Option(request.getQueryString).map("?" + _).getOrElse("")
-    halt(MovedPermanently(baseUrl + "/git" + request.getRequestURI + query))
-  }
-}

src/main/scala/gitbucket/core/controller/PreProcessController.scala

@@ -0,0 +1,40 @@
+package gitbucket.core.controller
+
+import org.scalatra.MovedPermanently
+
+class PreProcessController extends PreProcessControllerBase
+
+trait PreProcessControllerBase extends ControllerBase {
+
+  /**
+   * Provides GitHub compatible URLs for Git client.
+   *
+   * <ul>
+   *   <li>git clone http://localhost:8080/owner/repo</li>
+   *   <li>git clone http://localhost:8080/owner/repo.git</li>
+   * </ul>
+   *
+   * @see https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols
+   */
+  get("/*/*/info/refs") {
+    val query = Option(request.getQueryString).map("?" + _).getOrElse("")
+    halt(MovedPermanently(baseUrl + "/git" + request.getRequestURI + query))
+  }
+
+  /**
+   * Filter requests from anonymous users.
+   *
+   * If anonymous access is allowed, pass all requests.
+   * But if it's not allowed, demands authentication except some paths.
+   */
+  get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
+    if(!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
+      !context.currentPath.startsWith("/register")) {
+      Unauthorized()
+    } else {
+      pass()
+    }
+  }
+
+
+}