From 3fdb444961f6ed490279a1a740a7cac81fd5d35c Mon Sep 17 00:00:00 2001 From: Roy Li Date: Wed, 27 Jul 2016 11:23:29 -0700 Subject: [PATCH 001/165] Added new API to handle file upload to repository --- .../RepositoryViewerController.scala | 116 +++++++++++++++++- 1 file changed, 114 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index 2563558d8..4c43b8b68 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -1,7 +1,8 @@ package gitbucket.core.controller -import javax.servlet.http.{HttpServletResponse, HttpServletRequest} +import javax.servlet.http.{HttpServletRequest, HttpServletResponse} +import gitbucket.core.api.UploadFiles import gitbucket.core.plugin.PluginRegistry import gitbucket.core.repo.html import gitbucket.core.helper @@ -16,7 +17,6 @@ import gitbucket.core.model.{Account, WebHook} import gitbucket.core.service.WebHookService._ import gitbucket.core.view import gitbucket.core.view.helpers - import io.github.gitbucket.scalatra.forms._ import org.apache.commons.io.FileUtils import org.eclipse.jgit.api.{ArchiveCommand, Git} @@ -526,6 +526,118 @@ trait RepositoryViewerControllerBase extends ControllerBase { } }) + /** + * Upload file to a branch. + */ + post("/:owner/:repository/files/upload")(collaboratorsOnly { repository => + defining(repository.owner, repository.name){ case (owner, name) => + (for { + data <- extractFromJsonBody[UploadFiles] if data.isValid + } yield { + Directory.getAttachedDir(owner, name) match { + case dir if (dir.exists && dir.isDirectory) => + val _commitFiles = data.fileIds.map { case (fileName, id) => + dir.listFiles.find(_.getName.startsWith(id + ".")).map { file => + val s = scala.io.Source.fromFile(file) // Codec ???? + val byteArray = s.map(_.toByte).toArray + + CommitFile(id, fileName, byteArray) + } + }.toList + + val finalCommitFiles = _commitFiles.flatten + if(finalCommitFiles.size == data.fileIds.size) { + commitFiles( + repository, + files = finalCommitFiles, + branch = data.branch, + path = data.path, + message = data.message) + } + else { + org.scalatra.NotAcceptable( + s"""{"message": + |"$repository doesn't contain all the files you specified in the body"}""".stripMargin) + } + + case _ => org.scalatra.NotFound(s"""{"message": "$repository doesn't contain any attached files"}""") + } + + }) getOrElse + org.scalatra.NotAcceptable("""{"message": "FileIds can't be an empty list"}""") + + } + }) + + /* +Roy Li modification + */ + + case class CommitFile(fileId: String, name: String, fileBytes: Array[Byte]) + + private def commitFiles(repository: RepositoryService.RepositoryInfo, + files: List[CommitFile], + branch: String, path: String, message: String) = { + + + LockUtil.lock(s"${repository.owner}/${repository.name}") { + using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git => + + val loginAccount = context.loginAccount.get + val builder = DirCache.newInCore.builder() + val inserter = git.getRepository.newObjectInserter() + val headName = s"refs/heads/${branch}" + val headTip = git.getRepository.resolve(headName) + + if(headTip != null){ + JGitUtil.processTree(git, headTip) { (path, tree) => + builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId)) + } + } + + files.foreach{item => + val fileName = item.name + val bytes = item.fileBytes + builder.add(JGitUtil.createDirCacheEntry(fileName, + FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes))) + builder.finish() + } + + val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter), + headName, loginAccount.userName, loginAccount.mailAddress, message) + + inserter.flush() + inserter.close() + + // update refs + val refUpdate = git.getRepository.updateRef(headName) + refUpdate.setNewObjectId(commitId) + refUpdate.setForceUpdate(false) + refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)) + //refUpdate.setRefLogMessage("merged", true) + refUpdate.update() + + // update pull request + updatePullRequests(repository.owner, repository.name, branch) + + // record activity + recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch, + List(new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId)))) + + //call web hook + callPullRequestWebHookByRequestBranch("synchronize", repository, branch, context.baseUrl, loginAccount) + val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId)) + callWebHookOf(repository.owner, repository.name, WebHook.Push) { + getAccountByUserName(repository.owner).map{ ownerAccount => + WebHookPushPayload(git, loginAccount, headName, repository, List(commit), ownerAccount, + oldId = headTip, newId = commitId) + } + } + + } + } + } + private def splitPath(repository: RepositoryService.RepositoryInfo, path: String): (String, String) = { val id = repository.branchList.collectFirst { case branch if(path == branch || path.startsWith(branch + "/")) => branch From d6f8a458897b920382e419868dd8486deb193361 Mon Sep 17 00:00:00 2001 From: Roy Li Date: Wed, 27 Jul 2016 11:33:38 -0700 Subject: [PATCH 002/165] added helper case class for json body --- src/main/scala/gitbucket/core/api/UploadFiles.scala | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/main/scala/gitbucket/core/api/UploadFiles.scala diff --git a/src/main/scala/gitbucket/core/api/UploadFiles.scala b/src/main/scala/gitbucket/core/api/UploadFiles.scala new file mode 100644 index 000000000..e682011b6 --- /dev/null +++ b/src/main/scala/gitbucket/core/api/UploadFiles.scala @@ -0,0 +1,12 @@ +package gitbucket.core.api + + +case class UploadFiles(branch: String, path: String, fileIds : Map[String,String], message: String) +{ + def isValid: Boolean = { + + fileIds.size > 0 + } + + +} From a024491296578f00893857d3b704e9f28d7b9524 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 13 Mar 2017 11:24:02 +0900 Subject: [PATCH 003/165] Remove optimization option once --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d219ff3a2..cf4c1303e 100644 --- a/build.sbt +++ b/build.sbt @@ -59,7 +59,7 @@ libraryDependencies ++= Seq( ) // Compiler settings -scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:_") +scalacOptions := Seq("-deprecation", "-language:postfixOps") javacOptions in compile ++= Seq("-target", "8", "-source", "8") javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml" From 0401488ab1355fd1648ca4f94cd6374967e920cd Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 13 Mar 2017 13:00:06 +0900 Subject: [PATCH 004/165] Fix styles --- src/main/twirl/gitbucket/core/settings/edithooks.scala.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/twirl/gitbucket/core/settings/edithooks.scala.html b/src/main/twirl/gitbucket/core/settings/edithooks.scala.html index 7df7107d9..812b929b8 100644 --- a/src/main/twirl/gitbucket/core/settings/edithooks.scala.html +++ b/src/main/twirl/gitbucket/core/settings/edithooks.scala.html @@ -33,9 +33,9 @@
- + +
From 7b8a5a482adb57ac93b257eefb6df09ada71670e Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 13 Mar 2017 13:00:54 +0900 Subject: [PATCH 005/165] (refs #1479)Url encode the branch name --- .../core/settings/branches.scala.html | 8 ++-- .../core/settings/branchprotection.scala.html | 44 +++++++++---------- .../webapp/assets/common/css/gitbucket.css | 14 ------ 3 files changed, 25 insertions(+), 41 deletions(-) diff --git a/src/main/twirl/gitbucket/core/settings/branches.scala.html b/src/main/twirl/gitbucket/core/settings/branches.scala.html index 75331a15e..69c3e19f5 100644 --- a/src/main/twirl/gitbucket/core/settings/branches.scala.html +++ b/src/main/twirl/gitbucket/core/settings/branches.scala.html @@ -46,14 +46,12 @@

- +
@protectedBranchList.map { branch => } @@ -64,4 +62,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html index 9fb7137ae..5bd54131d 100644 --- a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html +++ b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html @@ -33,30 +33,30 @@ Sorry, we couldn’t find any status checks in the last week for this repository.
Please create a commit status by API (Learn more about status checks on GitHub) - }else{ -
@branch - - Edit - + Edit
} - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @repository.map { repository => } - +
diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html index d97b36f0e..d390c17a2 100644 --- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html @@ -43,7 +43,7 @@ }
@if(commits.nonEmpty && context.loginAccount.isDefined){ diff --git a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html index 85e862c9c..1785c8929 100644 --- a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html @@ -21,7 +21,7 @@ @@ -63,4 +63,4 @@ $(function(){ }); } }); - \ No newline at end of file + diff --git a/src/main/twirl/gitbucket/core/repo/delete.scala.html b/src/main/twirl/gitbucket/core/repo/delete.scala.html index 57190ab82..fc7e77136 100644 --- a/src/main/twirl/gitbucket/core/repo/delete.scala.html +++ b/src/main/twirl/gitbucket/core/repo/delete.scala.html @@ -50,10 +50,10 @@ } } - - + + \ No newline at end of file + diff --git a/src/main/twirl/gitbucket/core/repo/editor.scala.html b/src/main/twirl/gitbucket/core/repo/editor.scala.html index cafbd29a1..282d0602a 100644 --- a/src/main/twirl/gitbucket/core/repo/editor.scala.html +++ b/src/main/twirl/gitbucket/core/repo/editor.scala.html @@ -72,9 +72,9 @@ } } - - - + + + + + From 46896da46e77f5e03a4d907be6f1ada07cb02a36 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Fri, 28 Apr 2017 08:26:50 +0900 Subject: [PATCH 086/165] Fix to avoid regular expression error in the filter box --- src/main/twirl/gitbucket/core/pulls/compare.scala.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html index 417717787..17a399a85 100644 --- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html @@ -223,11 +223,12 @@ $(function(){ -} \ No newline at end of file + + } +} From a5971bbdde114c0d1216fe8f32e1b95eaf3a1229 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 6 May 2017 01:44:20 +0900 Subject: [PATCH 108/165] https://github.com/travis-ci/travis-ci/issues/7703 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8eb0548f4..2843b3c68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ before_script: - sudo apt-get install libaio1 - sudo /etc/init.d/mysql stop - sudo /etc/init.d/postgresql stop + - sudo chmod +x /usr/local/bin/sbt cache: directories: - $HOME/.ivy2/cache From b371f76cb6ecb65cb68ae4bd43840e55e3f183f6 Mon Sep 17 00:00:00 2001 From: t-tsutsumi Date: Sat, 6 May 2017 08:10:07 +0900 Subject: [PATCH 109/165] Fix incorrect font color when screen size 768px or less --- src/main/twirl/gitbucket/core/main.scala.html | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html index 13d0411c1..18fbb61c3 100644 --- a/src/main/twirl/gitbucket/core/main.scala.html +++ b/src/main/twirl/gitbucket/core/main.scala.html @@ -72,26 +72,34 @@
    @if(context.loginAccount.isDefined){ -
  • +
  • -
      -
    • New repository
      • -
    • New group
      • + -
    • +
    • @helpers.avatar(context.loginAccount.get.userName, 16) -
        -
      • Your profile
        • -
      • Account settings
        • - @if(context.loginAccount.get.isAdmin){ -
      • System administration
        • - } -
      • Sign out
        • + } else { From 61853a474a4a2d04d0754fa9f1780bddb2b136e0 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 6 May 2017 09:52:14 +0900 Subject: [PATCH 110/165] Rolled back to Jetty 9.3.19.v20170502 because Scalatra 2.5.0 does not work with Jetty 9.4. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d8a31dde7..9b760c734 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ val Organization = "io.github.gitbucket" val Name = "gitbucket" val GitBucketVersion = "4.12.1" val ScalatraVersion = "2.5.0" -val JettyVersion = "9.4.4.v20170414" +val JettyVersion = "9.3.19.v20170502" lazy val root = (project in file(".")).enablePlugins(SbtTwirl, JettyPlugin) From 890dbf99a7bf98454a2509508c183e3f731f9000 Mon Sep 17 00:00:00 2001 From: t-tsutsumi Date: Mon, 8 May 2017 00:58:32 +0900 Subject: [PATCH 111/165] Add Scala-IDE specific files to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8f141005b..d2d9e2240 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,8 @@ project/plugins/project/ .classpath .project .cache +.cache-main +.cache-tests .settings # IntelliJ specific From fe728baee7781054cbe1998e79b9f147328d2511 Mon Sep 17 00:00:00 2001 From: t-tsutsumi Date: Tue, 9 May 2017 04:12:03 +0900 Subject: [PATCH 112/165] Disabling directory listing feature on Jetty --- src/main/java/JettyLauncher.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java index 01245c270..74d280d6e 100644 --- a/src/main/java/JettyLauncher.java +++ b/src/main/java/JettyLauncher.java @@ -96,6 +96,9 @@ public class JettyLauncher { } context.setTempDirectory(tmpDir); + // Disabling the directory listing feature. + context.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false"); + ProtectionDomain domain = JettyLauncher.class.getProtectionDomain(); URL location = domain.getCodeSource().getLocation(); From 2dcc14b4d98a6a8aa0173e6ae74930f13336484f Mon Sep 17 00:00:00 2001 From: t-tsutsumi Date: Tue, 9 May 2017 04:55:55 +0900 Subject: [PATCH 113/165] Fix incorrect redirect URL and authorization in Update branch feature --- .../gitbucket/core/controller/PullRequestsController.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala index cf8c49b64..2ab0e96e4 100644 --- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala +++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala @@ -153,7 +153,7 @@ trait PullRequestsControllerBase extends ControllerBase { } getOrElse NotFound() }) - post("/:owner/:repository/pull/:id/update_branch")(writableUsersOnly { baseRepository => + post("/:owner/:repository/pull/:id/update_branch")(readableUsersOnly { baseRepository => (for { issueId <- params("id").toIntOpt loginAccount <- context.loginAccount @@ -217,7 +217,7 @@ trait PullRequestsControllerBase extends ControllerBase { } } } - redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}") + redirect(s"/${baseRepository.owner}/${baseRepository.name}/pull/${issueId}") }) getOrElse NotFound() }) From 29da986b9fecc382ac9f02d928fcb57104398b84 Mon Sep 17 00:00:00 2001 From: t-tsutsumi Date: Thu, 11 May 2017 03:18:27 +0900 Subject: [PATCH 114/165] Fix delete branch feature of PR does not work at all --- .../controller/PullRequestsController.scala | 38 +++++++++++++------ .../core/pulls/conversation.scala.html | 20 +++++----- .../gitbucket/core/pulls/pullreq.scala.html | 4 +- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala index 2ab0e96e4..2fe780543 100644 --- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala +++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala @@ -97,7 +97,9 @@ trait PullRequestsControllerBase extends ControllerBase { diffs, isEditable(repository), isManageable(repository), + hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount), repository, + getRepository(pullreq.requestUserName, pullreq.requestRepositoryName), flash.toMap.map(f => f._1 -> f._2.toString)) } } @@ -138,19 +140,33 @@ trait PullRequestsControllerBase extends ControllerBase { } getOrElse NotFound() }) - get("/:owner/:repository/pull/:id/delete/*")(writableUsersOnly { repository => - params("id").toIntOpt.map { issueId => - val branchName = multiParams("splat").head - val userName = context.loginAccount.get.userName - if(repository.repository.defaultBranch != branchName){ - using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git => - git.branchDelete().setForce(true).setBranchNames(branchName).call() - recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName) + get("/:owner/:repository/pull/:id/delete_branch")(readableUsersOnly { baseRepository => + (for { + issueId <- params("id").toIntOpt + loginAccount <- context.loginAccount + (issue, pullreq) <- getPullRequest(baseRepository.owner, baseRepository.name, issueId) + owner = pullreq.requestUserName + name = pullreq.requestRepositoryName + if hasDeveloperRole(owner, name, context.loginAccount) + } yield { + val repository = getRepository(owner, name).get + val branchProtection = getProtectedBranchInfo(owner, name, pullreq.requestBranch) + if(branchProtection.enabled){ + flash += "error" -> s"branch ${pullreq.requestBranch} is protected." + } else { + if(repository.repository.defaultBranch != pullreq.requestBranch){ + val userName = context.loginAccount.get.userName + using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git => + git.branchDelete().setForce(true).setBranchNames(pullreq.requestBranch).call() + recordDeleteBranchActivity(repository.owner, repository.name, userName, pullreq.requestBranch) + } + createComment(baseRepository.owner, baseRepository.name, userName, issueId, pullreq.requestBranch, "delete_branch") + } else { + flash += "error" -> s"""Can't delete the default branch "${pullreq.requestBranch}".""" } } - createComment(repository.owner, repository.name, userName, issueId, branchName, "delete_branch") - redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}") - } getOrElse NotFound() + redirect(s"/${baseRepository.owner}/${baseRepository.name}/pull/${issueId}") + }) getOrElse NotFound() }) post("/:owner/:repository/pull/:id/update_branch")(readableUsersOnly { baseRepository => diff --git a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html index 1785c8929..f29d9de26 100644 --- a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html @@ -7,7 +7,9 @@ labels: List[gitbucket.core.model.Label], isEditable: Boolean, isManageable: Boolean, - repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) + isManageableForkedRepository: Boolean, + repository: gitbucket.core.service.RepositoryService.RepositoryInfo, + forkedRepository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers
        @@ -26,11 +28,11 @@
        } - @if(isManageable && issue.closed && pullreq.userName == pullreq.requestUserName && merged && - pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){ + @if(isManageableForkedRepository && issue.closed && merged && + forkedRepository.map(r => (r.branchList.contains(pullreq.requestBranch) && r.repository.defaultBranch != pullreq.requestBranch)).getOrElse(false)){
        - Delete branch + Delete branch
        Pull request successfully merged and closed
        @@ -56,11 +58,9 @@ $(function(){ $.get('@helpers.url(repository)/pull/@issue.issueId/mergeguide', function(data){ $('.check-conflict').html(data); }); } - @if(isManageable){ - $('.delete-branch').click(function(e){ - var branchName = $(e.target).data('name'); - return confirm('Are you sure you want to remove the ' + branchName + ' branch?'); - }); - } + $('.delete-branch').click(function(e){ + var branchName = $(e.target).data('name'); + return confirm('Are you sure you want to remove the ' + branchName + ' branch?'); + }); }); diff --git a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html index e60567732..0606d3e4a 100644 --- a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html @@ -9,7 +9,9 @@ diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo], isEditable: Boolean, isManageable: Boolean, + isManageableForkedRepository: Boolean, repository: gitbucket.core.service.RepositoryService.RepositoryInfo, + forkedRepository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo], flash: Map[String, String])(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers @import gitbucket.core.model.IssueComment @@ -83,7 +85,7 @@ @flash.get("info").map{ info =>
        @info
        } - @gitbucket.core.pulls.html.conversation(issue, pullreq, comments, issueLabels, collaborators, milestones, labels, isEditable, isManageable, repository) + @gitbucket.core.pulls.html.conversation(issue, pullreq, comments, issueLabels, collaborators, milestones, labels, isEditable, isManageable, isManageableForkedRepository, repository, forkedRepository)
        @gitbucket.core.pulls.html.commits(dayByDayCommits, Some(comments), repository) From 352438ee0ad7fda83c379901dd0119aab2226d3e Mon Sep 17 00:00:00 2001 From: t-tsutsumi Date: Fri, 12 May 2017 02:49:25 +0900 Subject: [PATCH 115/165] Fix conditional expression for determining whether it is default branch --- .../gitbucket/core/repo/branches.scala.html | 78 ++++++++++--------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html index a9318d4cc..3dcd2dbaf 100644 --- a/src/main/twirl/gitbucket/core/repo/branches.scala.html +++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html @@ -23,7 +23,7 @@ - @if(branch.mergeInfo.isEmpty){ + @if(repository.repository.defaultBranch == branch.name){ Default } else { @branch.mergeInfo.map{ info => @@ -38,47 +38,49 @@
        - @branch.mergeInfo.map{ info => - @prs.map{ case (pull, issue) => - #@issue.issueId - @if(issue.closed) { - @if(info.isMerged){ - Merged - } else { - Closed + @if(repository.repository.defaultBranch != branch.name){ + @branch.mergeInfo.map{ info => + @prs.map{ case (pull, issue) => + #@issue.issueId + @if(issue.closed) { + @if(info.isMerged){ + Merged + } else { + Closed + } + } else { + Open + } + }.getOrElse{ + @if(context.loginAccount.isDefined){ + New Pull request + } else { + Compare + } } - } else { - Open - } - }.getOrElse{ - @if(context.loginAccount.isDefined){ - New Pull request - } else { - Compare - } - } - @if(hasWritePermission){ - - @if(prs.map(!_._2.closed).getOrElse(false)){ - - } else { - @if(isProtected){ - - } else { - + @if(hasWritePermission){ + + @if(prs.map(!_._2.closed).getOrElse(false)){ + + } else { + @if(isProtected){ + + } else { + + } + } + } } - } - }
        From 19016aa14adef654a9c4c90342dbf558f197441c Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 13 May 2017 16:06:36 +0900 Subject: [PATCH 116/165] =?UTF-8?q?(refs=20#1594)Filter=20the=20comparing?= =?UTF-8?q?=20dropdown=20based=20on=20user=E2=80=99s=20right?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitbucket/core/controller/PullRequestsController.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala index 2fe780543..45b76270e 100644 --- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala +++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala @@ -375,10 +375,10 @@ trait PullRequestsControllerBase extends ControllerBase { title, commits, diffs, - (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match { + ((forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match { case (Some(userName), Some(repositoryName)) => (userName, repositoryName) :: getForkedRepositories(userName, repositoryName) case _ => (forkedRepository.owner, forkedRepository.name) :: getForkedRepositories(forkedRepository.owner, forkedRepository.name) - }, + }).filter { case (owner, name) => hasGuestRole(owner, name, context.loginAccount) }, commits.flatten.map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false)).flatten.toList, originId, forkedId, From 532f418c2f59d0b62b464c9aad3fab99bda351d5 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 13 May 2017 20:54:20 +0900 Subject: [PATCH 117/165] (refs #1591)Bump markedj to 1.0.11 to allow HTML in markdown --- build.sbt | 2 +- src/main/scala/gitbucket/core/view/Markdown.scala | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 9b760c734..14961d377 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ libraryDependencies ++= Seq( "io.github.gitbucket" %% "scalatra-forms" % "1.1.0", "commons-io" % "commons-io" % "2.5", "io.github.gitbucket" % "solidbase" % "1.0.2", - "io.github.gitbucket" % "markedj" % "1.0.10", + "io.github.gitbucket" % "markedj" % "1.0.11", "org.apache.commons" % "commons-compress" % "1.13", "org.apache.commons" % "commons-email" % "1.4", "org.apache.httpcomponents" % "httpclient" % "4.5.3", diff --git a/src/main/scala/gitbucket/core/view/Markdown.scala b/src/main/scala/gitbucket/core/view/Markdown.scala index 88f8fff30..a4d05b6df 100644 --- a/src/main/scala/gitbucket/core/view/Markdown.scala +++ b/src/main/scala/gitbucket/core/view/Markdown.scala @@ -38,7 +38,6 @@ object Markdown { val source = if(enableTaskList) escapeTaskList(markdown) else markdown val options = new Options() - options.setSanitize(true) options.setBreaks(enableLineBreaks) val renderer = new GitBucketMarkedRenderer(options, repository, From 4fc221f4f9dde3f2603124d54fad7ee93d601494 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 15 May 2017 17:15:49 +0900 Subject: [PATCH 118/165] Take first 5 commits to store activity --- .../scala/gitbucket/core/service/ActivityService.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scala/gitbucket/core/service/ActivityService.scala b/src/main/scala/gitbucket/core/service/ActivityService.scala index 433909d77..f75a15c82 100644 --- a/src/main/scala/gitbucket/core/service/ActivityService.scala +++ b/src/main/scala/gitbucket/core/service/ActivityService.scala @@ -59,7 +59,7 @@ trait ActivityService { Activities insert Activity(userName, repositoryName, activityUserName, "open_issue", s"[user:${activityUserName}] opened issue [issue:${userName}/${repositoryName}#${issueId}]", - Some(title), + Some(title), currentDate) def recordCloseIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String) @@ -132,10 +132,10 @@ trait ActivityService { Activities insert Activity(userName, repositoryName, activityUserName, "push", s"[user:${activityUserName}] pushed to [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]", - Some(commits.map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")), + Some(commits.take(5).map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")), currentDate) - def recordCreateTagActivity(userName: String, repositoryName: String, activityUserName: String, + def recordCreateTagActivity(userName: String, repositoryName: String, activityUserName: String, tagName: String, commits: List[JGitUtil.CommitInfo])(implicit s: Session): Unit = Activities insert Activity(userName, repositoryName, activityUserName, "create_tag", @@ -167,7 +167,7 @@ trait ActivityService { None, currentDate) - def recordForkActivity(userName: String, repositoryName: String, activityUserName: String, forkedUserName: String)(implicit s: Session): Unit = + def recordForkActivity(userName: String, repositoryName: String, activityUserName: String, forkedUserName: String)(implicit s: Session): Unit = Activities insert Activity(userName, repositoryName, activityUserName, "fork", s"[user:${activityUserName}] forked [repo:${userName}/${repositoryName}] to [repo:${forkedUserName}/${repositoryName}]", From e919505f4e448113e1fdb6a9ba75cb385d24d727 Mon Sep 17 00:00:00 2001 From: Yasuhiro Takagi Date: Wed, 17 May 2017 21:40:30 +0900 Subject: [PATCH 119/165] function helper.html.dropdown supports filter placeholder developer can specify filter input placeholder in dropdown menu. --- src/main/twirl/gitbucket/core/helper/dropdown.scala.html | 6 +++--- src/main/twirl/gitbucket/core/issues/issueinfo.scala.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html index d31832de6..ea99758a9 100644 --- a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html +++ b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html @@ -2,8 +2,8 @@ prefix: String = "", style : String = "", right : Boolean = false, - filter: String = "")(body: Html) -@defining(if(filter.isEmpty) "" else filter + "-" + scala.util.Random.alphanumeric.take(4).mkString){ filterId => + filter: (String, String) = ("",""))(body: Html) +@defining(if(filter._1.isEmpty) "" else filter._1 + "-" + scala.util.Random.alphanumeric.take(4).mkString){ filterId =>
          @if(filterId.nonEmpty) { -
          • +
          • } @body
        diff --git a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html index 0e61892cc..eb48da1c1 100644 --- a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html +++ b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html @@ -11,7 +11,7 @@ Labels @if(isManageable){
        - @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = "labels") { + @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = ("labels", "Filter Labels")) { @labels.map { label =>
      • @@ -36,7 +36,7 @@ Milestone @if(isManageable){
        - @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = "milestone") { + @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = ("milestone", "Filter Milestone")) {
      • Clear this milestone
        • @milestones.filter(_._1.closedDate.isEmpty).map { case (milestone, _, _) =>
      • @@ -88,7 +88,7 @@ Assignee @if(isManageable){
        - @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = "assignee") { + @gitbucket.core.helper.html.dropdown("Edit", right = true, filter = ("assignee", "Filter Assignee")) {
      • Clear assignee
        • @collaborators.map { collaborator =>
      • From af37d23a0d3b3d8e9432c0c597af4ac60937eaab Mon Sep 17 00:00:00 2001 From: Yasuhiro Takagi Date: Sun, 21 May 2017 17:47:53 +0900 Subject: [PATCH 120/165] dropdown menu filter applied to "variable length" dropdown 1. dropdown menu filter applied where that length is variable. 2. In compare.scala.html, use default dropdown menu function for filter. --- .../core/dashboard/header.scala.html | 4 +-- .../core/issues/listparts.scala.html | 14 ++++---- .../gitbucket/core/pulls/compare.scala.html | 32 +++---------------- 3 files changed, 13 insertions(+), 37 deletions(-) diff --git a/src/main/twirl/gitbucket/core/dashboard/header.scala.html b/src/main/twirl/gitbucket/core/dashboard/header.scala.html index bc174bcbe..1568f630c 100644 --- a/src/main/twirl/gitbucket/core/dashboard/header.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/header.scala.html @@ -18,7 +18,7 @@
        • } - @gitbucket.core.helper.html.dropdown("Organization"){ + @gitbucket.core.helper.html.dropdown("Organization", filter = ("organization", "Find Organization...")){ @groups.map { group =>
      • @@ -60,4 +60,4 @@
        • } -
        \ No newline at end of file +
        diff --git a/src/main/twirl/gitbucket/core/issues/listparts.scala.html b/src/main/twirl/gitbucket/core/issues/listparts.scala.html index fb0ec7ea2..034aa8436 100644 --- a/src/main/twirl/gitbucket/core/issues/listparts.scala.html +++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html @@ -27,7 +27,7 @@ - @gitbucket.core.helper.html.dropdown("Author") { + @gitbucket.core.helper.html.dropdown("Author", filter = ("author", "Find Author...")) { @collaborators.map { collaborator =>
      • @@ -37,7 +37,7 @@
        • } } - @gitbucket.core.helper.html.dropdown("Label") { + @gitbucket.core.helper.html.dropdown("Label", filter = ("label", "Find Label...")) { @labels.map { label =>
      • @@ -48,7 +48,7 @@
        • } } - @gitbucket.core.helper.html.dropdown("Milestone") { + @gitbucket.core.helper.html.dropdown("Milestone", filter = ("milestone", "Find Milestone...")) {
      • @gitbucket.core.helper.html.checkicon(condition.milestone == Some(None)) Issues with no milestone @@ -62,7 +62,7 @@
        • } } - @gitbucket.core.helper.html.dropdown("Assignee") { + @gitbucket.core.helper.html.dropdown("Assignee", filter = ("assignee", "Find Assignee...")) {
      • @gitbucket.core.helper.html.checkicon(condition.assigned == Some(None)) Assigned to nobody @@ -116,7 +116,7 @@
      • Open
      • Close
        • } - @gitbucket.core.helper.html.dropdown("Label") { + @gitbucket.core.helper.html.dropdown("Label", filter = ("label", "Find Label...")) { @labels.map { label =>
      • @@ -127,13 +127,13 @@
        • } } - @gitbucket.core.helper.html.dropdown("Milestone") { + @gitbucket.core.helper.html.dropdown("Milestone", filter = ("milestone", "Find Milestone...")) {
      • No milestone
        • @milestones.filter(_.closedDate.isEmpty).map { milestone =>
      • @milestone.title
        • } } - @gitbucket.core.helper.html.dropdown("Assignee") { + @gitbucket.core.helper.html.dropdown("Assignee", filter = ("assignee", "Find Assignee...")) {
      • Clear assignee
        • @collaborators.map { collaborator =>
      • @helpers.avatar(collaborator, 20) @collaborator
        • diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html index 17a399a85..714f32458 100644 --- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html @@ -20,23 +20,23 @@ @gitbucket.core.html.menu("pulls", repository){
        - @gitbucket.core.helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork") { + @gitbucket.core.helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork", filter=("origin_repo", "Find Repository...")) { @members.map { case (owner, name) =>
      • @gitbucket.core.helper.html.checkicon(owner == originRepository.owner) @owner/@name
        • } } - @gitbucket.core.helper.html.dropdown(originId, "base") { + @gitbucket.core.helper.html.dropdown(originId, "base", filter=("origin_branch", "Find Branch...")) { @originRepository.branchList.map { branch =>
      • @gitbucket.core.helper.html.checkicon(branch == originId) @branch
        • } } ... - @gitbucket.core.helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork") { + @gitbucket.core.helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork", filter=("forked_repo", "Find Repository...")) { @members.map { case (owner, name) =>
      • @gitbucket.core.helper.html.checkicon(owner == forkedRepository.owner) @owner/@name
        • } } - @gitbucket.core.helper.html.dropdown(forkedId, "compare") { + @gitbucket.core.helper.html.dropdown(forkedId, "compare", filter=("forked_branch", "Find Branch...")) { @forkedRepository.branchList.map { branch =>
      • @gitbucket.core.helper.html.checkicon(branch == forkedId) @branch
        • } @@ -221,27 +221,3 @@ $(function(){ } }); - - From dcdc0cfa5567e5aca3853c9c0ab1c2ff44dd08a5 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 23 May 2017 14:48:09 +0900 Subject: [PATCH 121/165] Fix view --- src/main/twirl/gitbucket/core/repo/editor.scala.html | 1 - src/main/webapp/assets/common/css/gitbucket.css | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/twirl/gitbucket/core/repo/editor.scala.html b/src/main/twirl/gitbucket/core/repo/editor.scala.html index 282d0602a..2bb438d5c 100644 --- a/src/main/twirl/gitbucket/core/repo/editor.scala.html +++ b/src/main/twirl/gitbucket/core/repo/editor.scala.html @@ -46,7 +46,6 @@ -
        @helpers.avatarLink(context.loginAccount.get.userName, 48)
        diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 337b989ad..9827b4982 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -343,7 +343,7 @@ div.account-image { ul.dropdown-menu { padding: 2px 0; overflow: auto; - max-height: 100vh; + max-height: 100vh; } ul.dropdown-menu li { @@ -413,7 +413,7 @@ div.headbar { /* Sign-in form */ /****************************************************************************/ div.signin-form { - width: 350px; + width: 300px; margin: 30px auto; } From 5a8516e8e5dc06328fabc274a414ad1ee9936167 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Wed, 24 May 2017 10:08:39 +0900 Subject: [PATCH 122/165] Bump markedj to 1.0.12 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 14961d377..d9e56ce9b 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ libraryDependencies ++= Seq( "io.github.gitbucket" %% "scalatra-forms" % "1.1.0", "commons-io" % "commons-io" % "2.5", "io.github.gitbucket" % "solidbase" % "1.0.2", - "io.github.gitbucket" % "markedj" % "1.0.11", + "io.github.gitbucket" % "markedj" % "1.0.12", "org.apache.commons" % "commons-compress" % "1.13", "org.apache.commons" % "commons-email" % "1.4", "org.apache.httpcomponents" % "httpclient" % "4.5.3", From 43f7a61c4bfe99d572f5ca90c596d09c0c01cffe Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Wed, 24 May 2017 14:39:55 +0900 Subject: [PATCH 123/165] Implementing file upload on the repository viewer --- .../controller/FileUploadController.scala | 7 ++ .../RepositoryViewerController.scala | 116 +++++++++--------- .../gitbucket/core/repo/files.scala.html | 35 +++--- .../gitbucket/core/repo/upload.scala.html | 103 ++++++++++++++++ .../webapp/assets/common/css/gitbucket.css | 4 +- 5 files changed, 187 insertions(+), 78 deletions(-) create mode 100644 src/main/twirl/gitbucket/core/repo/upload.scala.html diff --git a/src/main/scala/gitbucket/core/controller/FileUploadController.scala b/src/main/scala/gitbucket/core/controller/FileUploadController.scala index cff4cebb1..b3926fe84 100644 --- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala +++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala @@ -31,6 +31,13 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R }, FileUtil.isImage) } + post("/tmp"){ + execute({ (file, fileId) => + FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get) + session += Keys.Session.Upload(fileId) -> file.name + }, _ => true) + } + post("/file/:owner/:repository"){ execute({ (file, fileId) => FileUtils.writeByteArrayToFile(new java.io.File( diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index a45c5bb26..bd050cea9 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -1,6 +1,6 @@ package gitbucket.core.controller -import java.io.FileInputStream +import java.io.File import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import gitbucket.core.plugin.PluginRegistry @@ -18,14 +18,12 @@ import gitbucket.core.service.WebHookService._ import gitbucket.core.view import gitbucket.core.view.helpers import io.github.gitbucket.scalatra.forms._ -import org.apache.commons.io.IOUtils +import org.apache.commons.io.FileUtils import org.eclipse.jgit.api.{ArchiveCommand, Git} import org.eclipse.jgit.archive.{TgzFormat, ZipFormat} import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder} import org.eclipse.jgit.errors.MissingObjectException import org.eclipse.jgit.lib._ -import org.eclipse.jgit.revwalk.RevCommit -import org.eclipse.jgit.treewalk._ import org.scalatra._ @@ -45,6 +43,13 @@ trait RepositoryViewerControllerBase extends ControllerBase { ArchiveCommand.registerFormat("zip", new ZipFormat) ArchiveCommand.registerFormat("tar.gz", new TgzFormat) + case class UploadForm( + branch: String, + path: String, + uploadFiles: String, + message: Option[String] + ) + case class EditorForm( branch: String, path: String, @@ -71,6 +76,13 @@ trait RepositoryViewerControllerBase extends ControllerBase { issueId: Option[Int] ) + val uploadForm = mapping( + "branch" -> trim(label("Branch", text(required))), + "path" -> trim(label("Path", text())), + "uploadFiles" -> trim(label("Upload files", text(required))), + "message" -> trim(label("Message", optional(text()))), + )(UploadForm.apply) + val editorForm = mapping( "branch" -> trim(label("Branch", text(required))), "path" -> trim(label("Path", text())), @@ -173,10 +185,37 @@ trait RepositoryViewerControllerBase extends ControllerBase { val (branch, path) = repository.splitPath(multiParams("splat").head) val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName) html.editor(branch, repository, if(path.length == 0) Nil else path.split("/").toList, - None, JGitUtil.ContentInfo("text", None, None, Some("UTF-8")), - protectedBranch) + None, JGitUtil.ContentInfo("text", None, None, Some("UTF-8")), protectedBranch) }) + get("/:owner/:repository/upload/*")(writableUsersOnly { repository => + val (branch, path) = repository.splitPath(multiParams("splat").head) + val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName) + html.upload(branch, repository, if(path.length == 0) Nil else path.split("/").toList, protectedBranch) + }) + + post("/:owner/:repository/upload", uploadForm)(writableUsersOnly { (form, repository) => + val files = form.uploadFiles.split("\n").map { line => + val i = line.indexOf(":") + CommitFile(line.substring(0, i).trim, line.substring(i + 1).trim) + } + + commitFiles( + repository = repository, + branch = form.branch, + path = form.path, + files = files, + message = form.message.getOrElse(s"Add files via upload") + ) + + if(form.path.length == 0){ + redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}") + } else { + redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}/${form.path}") + } + }) + + get("/:owner/:repository/edit/*")(writableUsersOnly { repository => val (branch, path) = repository.splitPath(multiParams("splat").head) val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName) @@ -547,65 +586,30 @@ trait RepositoryViewerControllerBase extends ControllerBase { } }) - /** - * Upload file to a branch. - */ - post("/:owner/:repository/files/upload")(writableUsersOnly { repository => - defining(repository.owner, repository.name){ case (owner, name) => - (for { - data <- extractFromJsonBody[UploadFiles] if data.isValid - } yield { - Directory.getAttachedDir(owner, name) match { - case dir if (dir.exists && dir.isDirectory) => - val _commitFiles = data.fileIds.map { case (fileName, id) => - dir.listFiles.find(_.getName.startsWith(id + ".")).map { file => - CommitFile(id, fileName, using(new FileInputStream(file))(IOUtils.toByteArray)) - } - }.toList - - val finalCommitFiles = _commitFiles.flatten - if(finalCommitFiles.size == data.fileIds.size) { - commitFiles( - repository, - files = finalCommitFiles, - branch = data.branch, - path = data.path, - message = data.message) - } - else { - org.scalatra.NotAcceptable( - s"""{"message": - |"$repository doesn't contain all the files you specified in the body"}""".stripMargin) - } - - case _ => org.scalatra.NotFound(s"""{"message": "$repository doesn't contain any attached files"}""") - } - - }) getOrElse - org.scalatra.NotAcceptable("""{"message": "FileIds can't be an empty list"}""") - - } - }) - case class UploadFiles(branch: String, path: String, fileIds : Map[String,String], message: String) { lazy val isValid: Boolean = fileIds.size > 0 } - case class CommitFile(fileId: String, name: String, fileBytes: Array[Byte]) + case class CommitFile(id: String, name: String) private def commitFiles(repository: RepositoryService.RepositoryInfo, - files: List[CommitFile], + files: Seq[CommitFile], branch: String, path: String, message: String) = { + // prepend path to the filename + val newFiles = files.map { file => + file.copy(name = if(path.length == 0) file.name else s"${path}/${file.name}") + } - _commitFile(repository, branch, path, message) { case (git, headTip, builder, inserter) => + _commitFile(repository, branch, message) { case (git, headTip, builder, inserter) => JGitUtil.processTree(git, headTip) { (path, tree) => - builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId)) + if(!newFiles.exists(_.name.contains(path))) { + builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId)) + } } - files.foreach { item => - val fileName = item.name - val bytes = item.fileBytes - builder.add(JGitUtil.createDirCacheEntry(fileName, + newFiles.foreach { file => + val bytes = FileUtils.readFileToByteArray(new File(getTemporaryDir(session.getId), file.id)) + builder.add(JGitUtil.createDirCacheEntry(file.name, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes))) builder.finish() } @@ -619,7 +623,7 @@ trait RepositoryViewerControllerBase extends ControllerBase { val newPath = newFileName.map { newFileName => if(path.length == 0) newFileName else s"${path}/${newFileName}" } val oldPath = oldFileName.map { oldFileName => if(path.length == 0) oldFileName else s"${path}/${oldFileName}" } - _commitFile(repository, branch, path, message){ case (git, headTip, builder, inserter) => + _commitFile(repository, branch, message){ case (git, headTip, builder, inserter) => val permission = JGitUtil.processTree(git, headTip){ (path, tree) => // Add all entries except the editing file if(!newPath.contains(path) && !oldPath.contains(path)){ @@ -639,7 +643,7 @@ trait RepositoryViewerControllerBase extends ControllerBase { } private def _commitFile(repository: RepositoryService.RepositoryInfo, - branch: String, path: String, message: String)(f: (Git, ObjectId, DirCacheBuilder, ObjectInserter) => Unit) = { + branch: String, message: String)(f: (Git, ObjectId, DirCacheBuilder, ObjectInserter) => Unit) = { LockUtil.lock(s"${repository.owner}/${repository.name}") { using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git => diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html index d1b1c7490..bb9f254eb 100644 --- a/src/main/twirl/gitbucket/core/repo/files.scala.html +++ b/src/main/twirl/gitbucket/core/repo/files.scala.html @@ -22,7 +22,7 @@ s"${(repository.name :: pathList).mkString("/")} at ${helpers.encodeRefName(branch)} - ${repository.owner}/${repository.name}" }, Some(repository)) { @gitbucket.core.html.menu("files", repository, Some(branch), info, error){ -
        +
        @@ -67,27 +67,24 @@
        } - @gitbucket.core.helper.html.branchcontrol(branch, repository, hasWritePermission){ - @repository.branchList.map { x => -
      • @gitbucket.core.helper.html.checkicon(x == branch) @x
        • +
        + @gitbucket.core.helper.html.branchcontrol(branch, repository, hasWritePermission){ + @repository.branchList.map { x => +
      • @gitbucket.core.helper.html.checkicon(x == branch) @x
        • + } } - } - @if(pathList.isEmpty){ - @* - @branchPullRequest.map{ case (pullRequest, issue) => - View #@pullRequest.issueId - }.getOrElse { - New pull request + @if(pathList.nonEmpty){ + @repository.name / + @pathList.zipWithIndex.map { case (section, i) => + @section / + } } - *@ - } else { - @repository.name / - @pathList.zipWithIndex.map { case (section, i) => - @section / - } - } +
        @if(hasWritePermission){ - +
        + + +
        }
        diff --git a/src/main/twirl/gitbucket/core/repo/upload.scala.html b/src/main/twirl/gitbucket/core/repo/upload.scala.html new file mode 100644 index 000000000..8cc7ff3ae --- /dev/null +++ b/src/main/twirl/gitbucket/core/repo/upload.scala.html @@ -0,0 +1,103 @@ +@(branch: String, + repository: gitbucket.core.service.RepositoryService.RepositoryInfo, + pathList: List[String], + protectedBranch: Boolean)(implicit context: gitbucket.core.controller.Context) +@import gitbucket.core.view.helpers +@import gitbucket.core.util.FileUtil +@gitbucket.core.html.main(s"Upload Files at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) { + @gitbucket.core.html.menu("files", repository){ + @if(protectedBranch){ +
        branch @branch is protected.
        + } + + @* + + *@ +
        + @repository.name / + @pathList.zipWithIndex.map { case (section, i) => + @section / + } + + +
        +
        + + + +
        +
        + Drag files here to add them to your repository +
        +
          +
        +
        +
        +
        +
        + Commit changes +
        +
        + +
        +
        + Cancel + + +
        +
        +
        + + } +} + + diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 9827b4982..9de569b9d 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -38,9 +38,7 @@ h6 { .octicon,.mega-octicon{ color : #999; - width: 14px; - height: 14px; - /*font-size: 14px;*/ + font-size: 14px; text-align: center; } From d70c5947fa28ab233080fb60c7b6894afaf05097 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Wed, 24 May 2017 18:31:20 +0900 Subject: [PATCH 124/165] Fix CSS --- .../gitbucket/core/issues/list.scala.html | 2 ++ .../gitbucket/core/repo/upload.scala.html | 22 ++---------- .../webapp/assets/common/css/gitbucket.css | 35 +++++++++++++++---- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/src/main/twirl/gitbucket/core/issues/list.scala.html b/src/main/twirl/gitbucket/core/issues/list.scala.html index 70d2f39ee..e90eb65e6 100644 --- a/src/main/twirl/gitbucket/core/issues/list.scala.html +++ b/src/main/twirl/gitbucket/core/issues/list.scala.html @@ -51,6 +51,7 @@ @if(isManageable){ \ No newline at end of file + From 1b65ae20621db2f2c76321894562dc47214ca880 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 28 May 2017 12:16:33 +0900 Subject: [PATCH 136/165] Don't render contents of Commits tab and Files tab if commits is empty. --- src/main/twirl/gitbucket/core/pulls/pullreq.scala.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html index 34f921184..239ec2dde 100644 --- a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html @@ -88,10 +88,14 @@ @gitbucket.core.pulls.html.conversation(issue, pullreq, commits, comments, issueLabels, collaborators, milestones, labels, isEditable, isManageable, isManageableForkedRepository, repository, forkedRepository)
        - @gitbucket.core.pulls.html.commits(dayByDayCommits, Some(comments), repository) + @if(commits.nonEmpty){ + @gitbucket.core.pulls.html.commits(dayByDayCommits, Some(comments), repository) + }
        - @gitbucket.core.helper.html.diff(diffs, repository, commits.headOption.map(_.id), commits.lastOption.map(_.id), true, Some(pullreq.issueId), isManageable, true) + @if(commits.nonEmpty){ + @gitbucket.core.helper.html.diff(diffs, repository, commits.headOption.map(_.id), commits.lastOption.map(_.id), true, Some(pullreq.issueId), isManageable, true) + }
        } From 43c8518a409cb1f52cb77e6aaccf55f80029e034 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 28 May 2017 13:26:06 +0900 Subject: [PATCH 137/165] (refs #1610)Redirect if the issue is a pull request --- .../core/controller/IssuesController.scala | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/IssuesController.scala b/src/main/scala/gitbucket/core/controller/IssuesController.scala index eeb19ac17..d1499157b 100644 --- a/src/main/scala/gitbucket/core/controller/IssuesController.scala +++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala @@ -76,7 +76,7 @@ trait IssuesControllerBase extends ControllerBase { get("/:owner/:repository/issues")(referrersOnly { repository => val q = request.getParameter("q") if(Option(q).exists(_.contains("is:pr"))){ - redirect(s"/${repository.owner}/${repository.name}/pulls?q=" + StringUtil.urlEncode(q)) + redirect(s"/${repository.owner}/${repository.name}/pulls?q=${StringUtil.urlEncode(q)}") } else { searchIssues(repository) } @@ -84,17 +84,21 @@ trait IssuesControllerBase extends ControllerBase { get("/:owner/:repository/issues/:id")(referrersOnly { repository => defining(repository.owner, repository.name, params("id")){ case (owner, name, issueId) => - getIssue(owner, name, issueId) map { - html.issue( - _, - getComments(owner, name, issueId.toInt), - getIssueLabels(owner, name, issueId.toInt), - getAssignableUserNames(owner, name), - getMilestonesWithIssueCount(owner, name), - getLabels(owner, name), - isIssueEditable(repository), - isIssueManageable(repository), - repository) + getIssue(owner, name, issueId) map { issue => + if(issue.isPullRequest){ + redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}") + } else { + html.issue( + issue, + getComments(owner, name, issueId.toInt), + getIssueLabels(owner, name, issueId.toInt), + getAssignableUserNames(owner, name), + getMilestonesWithIssueCount(owner, name), + getLabels(owner, name), + isIssueEditable(repository), + isIssueManageable(repository), + repository) + } } getOrElse NotFound() } }) From 12857ae6a3fb53be360e778fbd6df3819344e765 Mon Sep 17 00:00:00 2001 From: Shenghan Gao Date: Sat, 27 May 2017 23:57:31 -0700 Subject: [PATCH 138/165] made maxFileSize in FileUploadController configurable --- README.md | 3 +++ src/main/java/JettyLauncher.java | 3 +++ .../gitbucket/core/controller/FileUploadController.scala | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f865456f..6ee2f0177 100644 --- a/README.md +++ b/README.md @@ -38,9 +38,12 @@ You can specify following options: - `--host=[HOSTNAME]` - `--gitbucket.home=[DATA_DIR]` - `--temp_dir=[TEMP_DIR]` +- `--max_file_size=[MAX_FILE_SIZE]` `TEMP_DIR` is used as the [temporary directory for the jetty application context](https://www.eclipse.org/jetty/documentation/9.3.x/ref-temporary-directories.html). This is the directory into which the `gitbucket.war` file is unpacked, the source files are compiled, etc. If given this parameter **must** match the path of an existing directory or the application will quit reporting an error; if not given the path used will be a `tmp` directory inside the gitbucket home. +`MAX_FILE_SIZE` is the max file size for upload files. + You can also deploy `gitbucket.war` to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc) For more information about installation on Mac or Windows Server (with IIS), or configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki). diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java index 74d280d6e..8b91e913a 100644 --- a/src/main/java/JettyLauncher.java +++ b/src/main/java/JettyLauncher.java @@ -39,6 +39,9 @@ public class JettyLauncher { contextPath = "/" + contextPath; } break; + case "--max_file_size": + System.setProperty("gitbucket.maxFileSize", dim[2]); + break; case "--gitbucket.home": System.setProperty("gitbucket.home", dim[1]); break; diff --git a/src/main/scala/gitbucket/core/controller/FileUploadController.scala b/src/main/scala/gitbucket/core/controller/FileUploadController.scala index b3926fe84..9f27caacd 100644 --- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala +++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala @@ -22,7 +22,12 @@ import org.apache.commons.io.{FileUtils, IOUtils} */ class FileUploadController extends ScalatraServlet with FileUploadSupport with RepositoryService with AccountService { - configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024))) + val maxFileSize = if (System.getProperty("gitbucket.maxFileSize") != null) + System.getProperty("gitbucket.maxFileSize").toLong + else + 3 * 1024 * 1024 + + configureMultipartHandling(MultipartConfig(maxFileSize = Some(maxFileSize))) post("/image"){ execute({ (file, fileId) => From e340207cac4fe0eb5df98e3068acdf40d582ae53 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 30 May 2017 15:43:30 +0900 Subject: [PATCH 139/165] Not delete repositories when group is deleted --- .../core/controller/AccountController.scala | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala index 51dd1d124..b7f86e294 100644 --- a/src/main/scala/gitbucket/core/controller/AccountController.scala +++ b/src/main/scala/gitbucket/core/controller/AccountController.scala @@ -312,13 +312,17 @@ trait AccountControllerBase extends AccountManagementControllerBase { defining(params("groupName")){ groupName => // Remove from GROUP_MEMBER updateGroupMembers(groupName, Nil) - // Remove repositories - getRepositoryNamesOfUser(groupName).foreach { repositoryName => - deleteRepository(groupName, repositoryName) - FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName)) - FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName)) - FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName)) + // Disable group + getAccountByUserName(groupName, false).foreach { account => + updateGroup(groupName, account.description, account.url, true) } +// // Remove repositories +// getRepositoryNamesOfUser(groupName).foreach { repositoryName => +// deleteRepository(groupName, repositoryName) +// FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName)) +// FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName)) +// FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName)) +// } } redirect("/") }) From 206a8f5afc0b6a43dcc80412941a802e89665283 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 30 May 2017 16:03:08 +0900 Subject: [PATCH 140/165] Not delete repositories when group is deleted --- .../core/controller/SystemSettingsController.scala | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala index b175eb36b..e0373c1df 100644 --- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala @@ -277,13 +277,13 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase { if(form.isRemoved){ // Remove from GROUP_MEMBER updateGroupMembers(form.groupName, Nil) - // Remove repositories - getRepositoryNamesOfUser(form.groupName).foreach { repositoryName => - deleteRepository(groupName, repositoryName) - FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName)) - FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName)) - FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName)) - } +// // Remove repositories +// getRepositoryNamesOfUser(form.groupName).foreach { repositoryName => +// deleteRepository(groupName, repositoryName) +// FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName)) +// FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName)) +// FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName)) +// } } else { // Update GROUP_MEMBER updateGroupMembers(form.groupName, members) From 2f426990b7cdb266fb983d4c19beadf34ad133bb Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Fri, 2 Jun 2017 07:53:23 +0900 Subject: [PATCH 141/165] (refs #1612)Add password validation to form for registering and editing user. --- .../core/controller/AccountController.scala | 4 ++-- .../core/controller/SystemSettingsController.scala | 4 ++-- .../scala/gitbucket/core/util/Validations.scala | 13 +++++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala index b7f86e294..4786bea44 100644 --- a/src/main/scala/gitbucket/core/controller/AccountController.scala +++ b/src/main/scala/gitbucket/core/controller/AccountController.scala @@ -40,7 +40,7 @@ trait AccountControllerBase extends AccountManagementControllerBase { val newForm = mapping( "userName" -> trim(label("User name" , text(required, maxlength(100), identifier, uniqueUserName, reservedNames))), - "password" -> trim(label("Password" , text(required, maxlength(20)))), + "password" -> trim(label("Password" , text(required, maxlength(20), password))), "fullName" -> trim(label("Full Name" , text(required, maxlength(100)))), "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))), "description" -> trim(label("bio" , optional(text()))), @@ -49,7 +49,7 @@ trait AccountControllerBase extends AccountManagementControllerBase { )(AccountNewForm.apply) val editForm = mapping( - "password" -> trim(label("Password" , optional(text(maxlength(20))))), + "password" -> trim(label("Password" , optional(text(maxlength(20), password)))), "fullName" -> trim(label("Full Name" , text(required, maxlength(100)))), "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))), "description" -> trim(label("bio" , optional(text()))), diff --git a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala index e0373c1df..caebd04b2 100644 --- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala @@ -106,7 +106,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase { val newUserForm = mapping( "userName" -> trim(label("Username" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))), - "password" -> trim(label("Password" ,text(required, maxlength(20)))), + "password" -> trim(label("Password" ,text(required, maxlength(20), password))), "fullName" -> trim(label("Full Name" ,text(required, maxlength(100)))), "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress()))), "isAdmin" -> trim(label("User Type" ,boolean())), @@ -117,7 +117,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase { val editUserForm = mapping( "userName" -> trim(label("Username" ,text(required, maxlength(100), identifier))), - "password" -> trim(label("Password" ,optional(text(maxlength(20))))), + "password" -> trim(label("Password" ,optional(text(maxlength(20), password)))), "fullName" -> trim(label("Full Name" ,text(required, maxlength(100)))), "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress("userName")))), "isAdmin" -> trim(label("User Type" ,boolean())), diff --git a/src/main/scala/gitbucket/core/util/Validations.scala b/src/main/scala/gitbucket/core/util/Validations.scala index 13feccd95..f34a1ee7c 100644 --- a/src/main/scala/gitbucket/core/util/Validations.scala +++ b/src/main/scala/gitbucket/core/util/Validations.scala @@ -19,6 +19,19 @@ trait Validations { } } + /** + * Constraint for the password. + */ + def password: Constraint = new Constraint(){ + override def validate(name: String, value: String, messages: Messages): Option[String] = + if(!value.matches("[a-zA-Z0-9\\-_.]+")){ + Some(s"${name} contains invalid character.") + } else { + None + } + } + + /** * Constraint for the repository identifier. */ From d75d1eed102e78880ede531e7af3b69baa2379cd Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Fri, 2 Jun 2017 11:45:32 +0900 Subject: [PATCH 142/165] Support gollum event in web hook --- .../core/controller/WikiController.scala | 37 +++++++++--- .../core/service/WebHookService.scala | 57 ++++++++++++++++--- .../gitbucket/core/util/RepositoryName.scala | 2 +- 3 files changed, 80 insertions(+), 16 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/WikiController.scala b/src/main/scala/gitbucket/core/controller/WikiController.scala index 49cc97d9d..b32deb096 100644 --- a/src/main/scala/gitbucket/core/controller/WikiController.scala +++ b/src/main/scala/gitbucket/core/controller/WikiController.scala @@ -1,8 +1,10 @@ package gitbucket.core.controller +import gitbucket.core.model.{WebHook, WebHookEvent} import gitbucket.core.service.RepositoryService.RepositoryInfo +import gitbucket.core.service.WebHookService.WebHookGollumPayload import gitbucket.core.wiki.html -import gitbucket.core.service.{AccountService, ActivityService, RepositoryService, WikiService} +import gitbucket.core.service._ import gitbucket.core.util._ import gitbucket.core.util.StringUtil._ import gitbucket.core.util.SyntaxSugars._ @@ -13,11 +15,12 @@ import org.eclipse.jgit.api.Git import org.scalatra.i18n.Messages class WikiController extends WikiControllerBase - with WikiService with RepositoryService with AccountService with ActivityService + with WikiService with RepositoryService with AccountService with ActivityService with WebHookService with ReadableUsersAuthenticator with ReferrerAuthenticator trait WikiControllerBase extends ControllerBase { - self: WikiService with RepositoryService with ActivityService with ReadableUsersAuthenticator with ReferrerAuthenticator => + self: WikiService with RepositoryService with AccountService with ActivityService with WebHookService + with ReadableUsersAuthenticator with ReferrerAuthenticator => case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String) @@ -136,6 +139,11 @@ trait WikiControllerBase extends ControllerBase { ).map { commitId => updateLastActivityDate(repository.owner, repository.name) recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId) + callWebHookOf(repository.owner, repository.name, WebHook.Gollum){ + getAccountByUserName(repository.owner).map { repositoryUser => + WebHookGollumPayload("edited", form.pageName, commitId, repository, repositoryUser, loginAccount) + } + } } if(notReservedPageName(form.pageName)) { redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}") @@ -155,11 +163,24 @@ trait WikiControllerBase extends ControllerBase { post("/:owner/:repository/wiki/_new", newForm)(readableUsersOnly { (form, repository) => if(isEditable(repository)){ defining(context.loginAccount.get){ loginAccount => - saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName, - form.content, loginAccount, form.message.getOrElse(""), None) - - updateLastActivityDate(repository.owner, repository.name) - recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName) + saveWikiPage( + repository.owner, + repository.name, + form.currentPageName, + form.pageName, + form.content, + loginAccount, + form.message.getOrElse(""), + None + ).map { commitId => + updateLastActivityDate(repository.owner, repository.name) + recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName) + callWebHookOf(repository.owner, repository.name, WebHook.Gollum){ + getAccountByUserName(repository.owner).map { repositoryUser => + WebHookGollumPayload("created", form.pageName, commitId, repository, repositoryUser, loginAccount) + } + } + } if(notReservedPageName(form.pageName)) { redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}") diff --git a/src/main/scala/gitbucket/core/service/WebHookService.scala b/src/main/scala/gitbucket/core/service/WebHookService.scala index 2f060de6f..89cb97658 100644 --- a/src/main/scala/gitbucket/core/service/WebHookService.scala +++ b/src/main/scala/gitbucket/core/service/WebHookService.scala @@ -8,7 +8,7 @@ import gitbucket.core.model.Profile._ import gitbucket.core.model.Profile.profile.blockingApi._ import org.apache.http.client.utils.URLEncodedUtils import gitbucket.core.util.JGitUtil.CommitInfo -import gitbucket.core.util.RepositoryName +import gitbucket.core.util.{RepositoryName, StringUtil} import gitbucket.core.service.RepositoryService.RepositoryInfo import org.apache.http.NameValuePair import org.apache.http.client.entity.UrlEncodedFormEntity @@ -18,7 +18,7 @@ import org.eclipse.jgit.lib.ObjectId import org.slf4j.LoggerFactory import scala.concurrent._ -import scala.util.{Success, Failure} +import scala.util.{Failure, Success} import org.apache.http.HttpRequest import org.apache.http.HttpResponse import gitbucket.core.model.WebHookContentType @@ -160,7 +160,7 @@ trait WebHookPullRequestService extends WebHookService { import WebHookService._ // https://developer.github.com/v3/activity/events/types/#issuesevent def callIssuesWebHook(action: String, repository: RepositoryService.RepositoryInfo, issue: Issue, baseUrl: String, sender: Account) - (implicit s: Session, context:JsonFormat.Context): Unit = { + (implicit s: Session, context: JsonFormat.Context): Unit = { callWebHookOf(repository.owner, repository.name, WebHook.Issues){ val users = getAccountsByUserNames(Set(repository.owner, issue.openedUserName), Set(sender)) for{ @@ -178,7 +178,7 @@ trait WebHookPullRequestService extends WebHookService { } def callPullRequestWebHook(action: String, repository: RepositoryService.RepositoryInfo, issueId: Int, baseUrl: String, sender: Account) - (implicit s: Session, context:JsonFormat.Context): Unit = { + (implicit s: Session, c: JsonFormat.Context): Unit = { import WebHookService._ callWebHookOf(repository.owner, repository.name, WebHook.PullRequest){ for{ @@ -224,7 +224,7 @@ trait WebHookPullRequestService extends WebHookService { }).list.groupBy(_._1).mapValues(_.map(_._2)) def callPullRequestWebHookByRequestBranch(action: String, requestRepository: RepositoryService.RepositoryInfo, requestBranch: String, baseUrl: String, sender: Account) - (implicit s: Session, context:JsonFormat.Context): Unit = { + (implicit s: Session, c: JsonFormat.Context): Unit = { import WebHookService._ for{ ((issue, issueUser, pullRequest, baseOwner, headOwner), webHooks) <- getPullRequestsByRequestForWebhook(requestRepository.owner, requestRepository.name, requestBranch) @@ -246,12 +246,13 @@ trait WebHookPullRequestService extends WebHookService { callWebHook(WebHook.PullRequest, webHooks, payload) } } + } trait WebHookPullRequestReviewCommentService extends WebHookService { self: AccountService with RepositoryService with PullRequestService with IssuesService with CommitsService => def callPullRequestReviewCommentWebHook(action: String, comment: CommitComment, repository: RepositoryService.RepositoryInfo, issueId: Int, baseUrl: String, sender: Account) - (implicit s: Session, context:JsonFormat.Context): Unit = { + (implicit s: Session, c: JsonFormat.Context): Unit = { import WebHookService._ callWebHookOf(repository.owner, repository.name, WebHook.PullRequestReviewComment){ for{ @@ -285,7 +286,7 @@ trait WebHookIssueCommentService extends WebHookPullRequestService { import WebHookService._ def callIssueCommentWebHook(repository: RepositoryService.RepositoryInfo, issue: Issue, issueCommentId: Int, sender: Account) - (implicit s: Session, context:JsonFormat.Context): Unit = { + (implicit s: Session, c: JsonFormat.Context): Unit = { callWebHookOf(repository.owner, repository.name, WebHook.IssueComment){ for{ issueComment <- getComment(repository.owner, repository.name, issueCommentId.toString()) @@ -470,4 +471,46 @@ object WebHookService { sender = senderPayload) } } + + // https://developer.github.com/v3/activity/events/types/#gollumevent + case class WebHookGollumPayload( + pages: Seq[WebHookGollumPagePayload], + repository: ApiRepository, + sender: ApiUser + ) extends WebHookPayload + + case class WebHookGollumPagePayload( + page_name: String, + title: String, + summary: Option[String] = None, + action: String, // created or edited + sha: String, // SHA of the latest commit + html_url: ApiPath + ) + + object WebHookGollumPayload { + def apply( + action: String, + pageName: String, + sha: String, + repository: RepositoryInfo, + repositoryUser: Account, + sender: Account + ): WebHookGollumPayload = { + WebHookGollumPayload( + pages = Seq( + WebHookGollumPagePayload( + action = action, + page_name = pageName, + title = pageName, + sha = sha, + html_url = ApiPath(s"/${RepositoryName(repository).fullName}/wiki/${StringUtil.urlDecode(pageName)}") + ) + ), + repository = ApiRepository(repository, repositoryUser), + sender = ApiUser(sender) + ) + } + } + } diff --git a/src/main/scala/gitbucket/core/util/RepositoryName.scala b/src/main/scala/gitbucket/core/util/RepositoryName.scala index e7d293d11..9f0825b40 100644 --- a/src/main/scala/gitbucket/core/util/RepositoryName.scala +++ b/src/main/scala/gitbucket/core/util/RepositoryName.scala @@ -1,7 +1,7 @@ package gitbucket.core.util // TODO Move to gitbucket.core.api package? -case class RepositoryName(owner:String, name:String){ +case class RepositoryName(owner: String, name: String){ val fullName = s"${owner}/${name}" } From 2ec8189d47f7870290fca0dc00623b5ae3e2230d Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Fri, 2 Jun 2017 17:46:25 +0900 Subject: [PATCH 143/165] Call wiki web hook in pushing via git client --- .../core/service/WebHookService.scala | 11 ++- .../core/servlet/GitRepositoryServlet.scala | 84 +++++++++++++++++-- 2 files changed, 87 insertions(+), 8 deletions(-) diff --git a/src/main/scala/gitbucket/core/service/WebHookService.scala b/src/main/scala/gitbucket/core/service/WebHookService.scala index 89cb97658..c96e31235 100644 --- a/src/main/scala/gitbucket/core/service/WebHookService.scala +++ b/src/main/scala/gitbucket/core/service/WebHookService.scala @@ -496,9 +496,16 @@ object WebHookService { repository: RepositoryInfo, repositoryUser: Account, sender: Account + ): WebHookGollumPayload = apply(Seq((action, pageName, sha)), repository, repositoryUser, sender) + + def apply( + pages: Seq[(String, String, String)], + repository: RepositoryInfo, + repositoryUser: Account, + sender: Account ): WebHookGollumPayload = { WebHookGollumPayload( - pages = Seq( + pages = pages.map { case (action, pageName, sha) => WebHookGollumPagePayload( action = action, page_name = pageName, @@ -506,7 +513,7 @@ object WebHookService { sha = sha, html_url = ApiPath(s"/${RepositoryName(repository).fullName}/wiki/${StringUtil.urlDecode(pageName)}") ) - ), + }, repository = ApiRepository(repository, repositoryUser), sender = ApiUser(sender) ) diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala index c4ffe413e..a6af98b24 100644 --- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala @@ -1,6 +1,7 @@ package gitbucket.core.servlet import java.io.File +import java.util import java.util.Date import gitbucket.core.api @@ -22,6 +23,7 @@ import org.slf4j.LoggerFactory import javax.servlet.ServletConfig import javax.servlet.http.{HttpServletRequest, HttpServletResponse} +import org.eclipse.jgit.diff.DiffEntry.ChangeType import org.json4s.jackson.Serialization._ @@ -161,6 +163,12 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] receivePack.setPostReceiveHook(hook) } } + + if(repository.endsWith(".wiki")){ + defining(request) { implicit r => + receivePack.setPostReceiveHook(new WikiCommitHook(owner, repository.replaceFirst("\\.wiki$", ""), pusher, baseUrl)) + } + } } } @@ -170,7 +178,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] import scala.collection.JavaConverters._ -class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)/*(implicit session: Session)*/ +class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String) extends PostReceiveHook with PreReceiveHook with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService with WebHookPullRequestService with CommitsService { @@ -185,9 +193,10 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: // call pre-commit hook PluginRegistry().getReceiveHooks .flatMap(_.preReceive(owner, repository, receivePack, command, pusher)) - .headOption.foreach { error => - command.setResult(ReceiveCommand.Result.REJECTED_OTHER_REASON, error) - } + .headOption + .foreach { error => + command.setResult(ReceiveCommand.Result.REJECTED_OTHER_REASON, error) + } } using(Git.open(Directory.getRepositoryDir(owner, repository))) { git => existIds = JGitUtil.getAllCommitIds(git) @@ -285,8 +294,10 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: // call web hook callWebHookOf(owner, repository, WebHook.Push) { - for (pusherAccount <- getAccountByUserName(pusher); - ownerAccount <- getAccountByUserName(owner)) yield { + for { + pusherAccount <- getAccountByUserName(pusher) + ownerAccount <- getAccountByUserName(owner) + } yield { WebHookPushPayload(git, pusherAccount, command.getRefName, repositoryInfo, newCommits, ownerAccount, newId = command.getNewId(), oldId = command.getOldId()) } @@ -309,6 +320,67 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: } +class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl: String) + extends PostReceiveHook with WebHookService with AccountService with RepositoryService { + + private val logger = LoggerFactory.getLogger(classOf[WikiCommitHook]) + + override def onPostReceive(receivePack: ReceivePack, commands: util.Collection[ReceiveCommand]): Unit = { + Database() withTransaction { implicit session => + try { + commands.asScala.headOption.foreach { command => + implicit val apiContext = api.JsonFormat.Context(baseUrl) + val refName = command.getRefName.split("/") + val commitIds = if (refName(1) == "tags") { + None + } else { + command.getType match { + case ReceiveCommand.Type.DELETE => None + case _ => Some((command.getOldId.getName, command.getNewId.name)) + } + } + + commitIds.map { case (oldCommitId, newCommitId) => + val commits = using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git => + JGitUtil.getCommitLog(git, oldCommitId, newCommitId).flatMap { commit => + val diffs = JGitUtil.getDiffs(git, commit.id, false) + diffs._1.collect { case diff if diff.newPath.toLowerCase.endsWith(".md") => + val action = if(diff.changeType == ChangeType.ADD) "created" else "edited" + val fileName = diff.newPath + println(action + " - " + fileName + " - " + commit.id) + (action, fileName, commit.id) + } + } + } + + val pages = commits + .groupBy { case (action, fileName, commitId) => fileName } + .map { case (fileName, commits) => + (commits.head._1, fileName, commits.last._3) + } + + callWebHookOf(owner, repository, WebHook.Gollum) { + for { + pusherAccount <- getAccountByUserName(pusher) + repositoryUser <- getAccountByUserName(owner) + repositoryInfo <- getRepository(owner, repository) + } yield { + WebHookGollumPayload(pages.toSeq, repositoryInfo, repositoryUser, pusherAccount) + } + } + } + } + } catch { + case ex: Exception => { + logger.error(ex.toString, ex) + throw ex + } + } + } + } + +} + object GitLfs { case class BatchRequest( From a7a53610e6032c9ce637f36722340f576ff367e9 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Fri, 2 Jun 2017 18:46:15 +0900 Subject: [PATCH 144/165] Add Gollum event option to web hook configuration page --- src/main/scala/gitbucket/core/service/WebHookService.scala | 2 +- src/main/twirl/gitbucket/core/settings/edithooks.scala.html | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/service/WebHookService.scala b/src/main/scala/gitbucket/core/service/WebHookService.scala index c96e31235..35fe84772 100644 --- a/src/main/scala/gitbucket/core/service/WebHookService.scala +++ b/src/main/scala/gitbucket/core/service/WebHookService.scala @@ -42,7 +42,7 @@ trait WebHookService { def getWebHooksByEvent(owner: String, repository: String, event: WebHook.Event)(implicit s: Session): List[WebHook] = WebHooks.filter(_.byRepository(owner, repository)) .join(WebHookEvents).on { (wh, whe) => whe.byWebHook(wh) } - .filter { case (wh, whe) => whe.event === event.bind} + .filter { case (wh, whe) => whe.event === event.bind } .map{ case (wh, whe) => wh } .list.distinct diff --git a/src/main/twirl/gitbucket/core/settings/edithooks.scala.html b/src/main/twirl/gitbucket/core/settings/edithooks.scala.html index 812b929b8..35c417271 100644 --- a/src/main/twirl/gitbucket/core/settings/edithooks.scala.html +++ b/src/main/twirl/gitbucket/core/settings/edithooks.scala.html @@ -55,7 +55,9 @@ + --> +