Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-14 17:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #812)Prepend '/' to repository name

Browse Source
This commit is contained in:
Naoki Takezoe
2015-07-05 15:02:43 +09:00
parent f0d4c6546a
commit 573eabee93
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
View File

@@ -62,13 +62,8 @@ class GitBucketRepositoryResolver(parent: FileResolver[HttpServletRequest]) exte
private val resolver = new FileResolver[HttpServletRequest](new File(Directory.GitBucketHome), true) private val resolver = new FileResolver[HttpServletRequest](new File(Directory.GitBucketHome), true)
override def open(req: HttpServletRequest, name: String): Repository = { override def open(req: HttpServletRequest, name: String): Repository = {
// // Check routing which are provided by plug-in
// val routing = PluginRegistry().getRepositoryRoutings().find {
// case GitRepositoryRouting(urlPattern, _, _) => name.matches(urlPattern)
// }
// Rewrite repository path if routing is marched // Rewrite repository path if routing is marched
PluginRegistry().getRepositoryRouting(name).map { case GitRepositoryRouting(urlPattern, localPath, _) => PluginRegistry().getRepositoryRouting("/" + name).map { case GitRepositoryRouting(urlPattern, localPath, _) =>
val path = urlPattern.r.replaceFirstIn(name, localPath) val path = urlPattern.r.replaceFirstIn(name, localPath)
resolver.open(req, path) resolver.open(req, path)
}.getOrElse { }.getOrElse {

4
src/main/scala/gitbucket/core/ssh/GitCommand.scala
View File

@@ -167,7 +167,7 @@ class GitCommandFactory(baseUrl: String) extends CommandFactory {
} }
} }
private def pluginRepository(repoName: String): Boolean = PluginRegistry().getRepositoryRouting(repoName).isDefined private def pluginRepository(repoName: String): Boolean = PluginRegistry().getRepositoryRouting("/" + repoName).isDefined
private def routing(repoName: String): GitRepositoryRouting = PluginRegistry().getRepositoryRouting(repoName).get private def routing(repoName: String): GitRepositoryRouting = PluginRegistry().getRepositoryRouting("/" + repoName).get
} }