From c3e668d200e3864279f7de6e7ca069a2ad334992 Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 4 Jul 2013 12:50:10 +0900 Subject: [PATCH] Fix problem when GitBucket is working on non root context. --- src/main/scala/app/WikiController.scala | 6 +++--- src/main/scala/servlet/BasicAuthenticationFilter.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala index e24bfaca5..c9fa16a39 100644 --- a/src/main/scala/app/WikiController.scala +++ b/src/main/scala/app/WikiController.scala @@ -76,7 +76,7 @@ trait WikiControllerBase extends ControllerBase { form.content, context.loginAccount.get, form.message.getOrElse("")) updateLastActivityDate(repository.owner, repository.name) - redirect("%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName)) + redirect("/%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName)) }) get("/:owner/:repository/wiki/_new")(collaboratorsOnly { @@ -88,7 +88,7 @@ trait WikiControllerBase extends ControllerBase { form.content, context.loginAccount.get, form.message.getOrElse("")) updateLastActivityDate(repository.owner, repository.name) - redirect("%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName)) + redirect("/%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName)) }) get("/:owner/:repository/wiki/:page/_delete")(collaboratorsOnly { repository => @@ -97,7 +97,7 @@ trait WikiControllerBase extends ControllerBase { deleteWikiPage(repository.owner, repository.name, pageName, context.loginAccount.get.userName, "Delete %s".format(pageName)) updateLastActivityDate(repository.owner, repository.name) - redirect("%s/%s/wiki".format(repository.owner, repository.name)) + redirect("/%s/%s/wiki".format(repository.owner, repository.name)) }) get("/:owner/:repository/wiki/_pages")(referrersOnly { repository => diff --git a/src/main/scala/servlet/BasicAuthenticationFilter.scala b/src/main/scala/servlet/BasicAuthenticationFilter.scala index d84984523..dac50f172 100644 --- a/src/main/scala/servlet/BasicAuthenticationFilter.scala +++ b/src/main/scala/servlet/BasicAuthenticationFilter.scala @@ -22,7 +22,7 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou val response = res.asInstanceOf[HttpServletResponse] try { - val paths = request.getRequestURI.split("/") + val paths = request.getRequestURI.substring(request.getContextPath.length).split("/") val repositoryOwner = paths(2) val repositoryName = paths(3).replaceFirst("\\.git$", "")