diff --git a/CHANGELOG.md b/CHANGELOG.md index ecfed8f..143e619 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,33 @@ # Changelog All changes to the project will be documented in this file. +### 4.26.0 - 30 Jun 2018 +- Installing plugins from the central registry +- Repositories tab in the dashboard +- Fork dialog enhancement +- Adjust pull request creation suggestor +- Keep showing incompleted task list +- New notification hooks + +### 4.25.0 - 29 May 2018 +- Security improvements +- Show mail address at the profile page +- Task list on commit comments +- More detailed editing history of issues and pull requests +- Expose user public keys +- Download repository improvements + +### 4.24.1 - 1 May 2018 +- Fix bug in Web API authentication + +### 4.24.0 - 30 Apr 2018 +- Diff for each review comment on pull requests +- Extra mail addresses support +- Show tags at the commit list +- Keep wrap mode of the online editor +- Renew layout of gitbucket-gist-plugin +- Web API of gitbucket-ci-plugin + ### 4.23.1 - 10 Apr 2018 - Fix bug that the contents API doesn't work for the repository root - Fix shutdown problem in Tomcat deployment diff --git a/README.md b/README.md index 5b9b714..6307665 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12) +GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.12) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE) ========= GitBucket is a Git web platform powered by Scala offering: @@ -68,19 +68,14 @@ - If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue. - The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. -What's New in 4.23.x +What's New in 4.26.x ------------- -### 4.23.1 - 10 Apr 2018 -- Fix bug that the contents API doesn't work for the repository root -- Fix shutdown problem in Tomcat deployment -- Render by plugins at the blob view even if it's a binary file - -### 4.23.0 - 31 Mar 2018 -- Allow tail slash in URL -- Display commit message of tags at the releases page -- Add labels property to issues and pull requests API response -- Plugins list API -- Git authentication with personal access token -- Max parallel builds and max stored history in CI plugin became configurable +### 4.26.0 - 30 Jun 2018 +- Installing plugins from the central registry +- Repositories tab in the dashboard +- Fork dialog enhancement +- Adjust pull request creation suggestor +- Keep showing incompleted task list +- New notification hooks See the [change log](CHANGELOG.md) for all of the updates. diff --git a/build.sbt b/build.sbt index a2c6012..a31963b 100644 --- a/build.sbt +++ b/build.sbt @@ -3,12 +3,12 @@ val Organization = "io.github.gitbucket" val Name = "gitbucket" -val GitBucketVersion = "4.23.1" +val GitBucketVersion = "4.26.0" val ScalatraVersion = "2.6.1" val JettyVersion = "9.4.7.v20170914" lazy val root = (project in file(".")) - .enablePlugins(SbtTwirl, ScalatraPlugin, JRebelPlugin) + .enablePlugins(SbtTwirl, ScalatraPlugin) .settings( ) @@ -16,7 +16,7 @@ organization := Organization name := Name version := GitBucketVersion -scalaVersion := "2.12.5" +scalaVersion := "2.12.6" scalafmtOnCompile := true @@ -30,8 +30,8 @@ ) libraryDependencies ++= Seq( - "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "4.11.0.201803080745-r", - "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "4.11.0.201803080745-r", + "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "5.0.1.201806211838-r", + "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "5.0.1.201806211838-r", "org.scalatra" %% "scalatra" % ScalatraVersion, "org.scalatra" %% "scalatra-json" % ScalatraVersion, "org.scalatra" %% "scalatra-forms" % ScalatraVersion, @@ -47,7 +47,7 @@ "com.github.takezoe" %% "blocking-slick-32" % "0.0.10", "com.novell.ldap" % "jldap" % "2009-10-07", "com.h2database" % "h2" % "1.4.196", - "org.mariadb.jdbc" % "mariadb-java-client" % "2.2.3", + "org.mariadb.jdbc" % "mariadb-java-client" % "2.2.5", "org.postgresql" % "postgresql" % "42.1.4", "ch.qos.logback" % "logback-classic" % "1.2.3", "com.zaxxer" % "HikariCP" % "2.7.4", @@ -97,21 +97,6 @@ case x => MergeStrategy.first } -// JRebel -//Seq(jrebelSettings: _*) - -//jrebel.webLinks += (target in webappPrepare).value -//jrebel.enabled := System.getenv().get("JREBEL") != null -javaOptions in Jetty ++= Option(System.getenv().get("JREBEL")).toSeq.flatMap { path => - if (path.endsWith(".jar")) { - // Legacy JRebel agent - Seq("-noverify", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", s"-javaagent:${path}") - } else { - // New JRebel agent - Seq(s"-agentpath:${path}") - } -} - // Exclude a war file from published artifacts signedArtifacts := { signedArtifacts.value.filterNot { @@ -171,12 +156,17 @@ // include plugins val pluginsDir = temp / "WEB-INF" / "classes" / "plugins" IO createDirectory (pluginsDir) - IO copyFile (Keys.baseDirectory.value / "plugins.json", pluginsDir / "plugins.json") - val json = IO read (Keys.baseDirectory.value / "plugins.json") - PluginsJson.getUrls(json).foreach { url => - log info s"Download: ${url}" - IO transfer (new java.net.URL(url).openStream, pluginsDir / url.substring(url.lastIndexOf("/") + 1)) + val plugins = IO readLines (Keys.baseDirectory.value / "src" / "main" / "resources" / "bundle-plugins.txt") + plugins.foreach { plugin => + plugin.trim.split(":") match { + case Array(pluginId, pluginVersion) => + val url = "https://plugins.gitbucket-community.org/releases/" + + s"gitbucket-${pluginId}-plugin/gitbucket-${pluginId}-plugin-gitbucket_${version.value}-${pluginVersion}.jar" + log info s"Download: ${url}" + IO transfer (new java.net.URL(url).openStream, pluginsDir / url.substring(url.lastIndexOf("/") + 1)) + case _ => () + } } // zip it up diff --git a/doc/comment_action.md b/doc/comment_action.md index 55d154b..3adae83 100644 --- a/doc/comment_action.md +++ b/doc/comment_action.md @@ -6,22 +6,26 @@ To determine if it was any operation, you see the `ACTION` column. And in the case of some actions, `CONTENT` column value contains additional information. -|ACTION |CONTENT | -|----------------|----------------------| -|comment |comment | -|close_comment |comment | -|reopen_comment |comment | -|close |"Close" | -|reopen |"Reopen" | -|commit |comment commitId | -|merge |comment | -|delete_branch |branchName | -|refer |issueId:title | -|add_label |labelName | -|delete_label |labelName | -|change_priority |oldPriority:priority | -|change_milestone|oldMilestone:milestone| -|assign |oldAssigned:assigned | +|ACTION |CONTENT | +|----------------|--------------------------| +|comment |comment | +|close_comment |comment | +|reopen_comment |comment | +|close |"Close" | +|reopen |"Reopen" | +|commit |comment commitId | +|merge |comment | +|delete_branch |branchName | +|refer |issueId:title | +|add_label |labelName | +|delete_label |labelName | +|change_priority |oldPriority:priority | +|change_milestone|oldMilestone:milestone | +|assign |oldAssigned:assigned | +|change_title |oldTitle(CRLF)title \[1\] | + +\[1\]: (CRLF) is "\r\n" + ### comment @@ -79,3 +83,7 @@ ### assign This value is saved when users have assign issue/PR to user or remove the assign. + +### change_title + +This value is saved when users have changed the title. diff --git a/doc/jrebel.md b/doc/jrebel.md deleted file mode 100644 index eba28f2..0000000 --- a/doc/jrebel.md +++ /dev/null @@ -1,119 +0,0 @@ -JRebel integration (optional) -============================= - -[JRebel](https://zeroturnaround.com/software/jrebel/) is a JVM plugin that makes developing web apps much faster. -JRebel is generally able to eliminate the need for the slow "app restart" per modification of codes. Alsp it's only used during development, and doesn't change your deployed app in any way. - -JRebel is not open source, but we can use it free for non-commercial use. - ----- - -## 1. Get a JRebel license - -Sign up for a [myJRebel](https://my.jrebel.com/register). You will need to create an account. - -## 2. Download JRebel - -Download the most recent ["nosetup" JRebel zip](https://zeroturnaround.com/software/jrebel/download/prev-releases/). -Next, unzip the downloaded file. - -## 3. Activate - -Follow `readme.txt` in the extracted directory to activate your downloaded JRebel. - -You don't need to integrate with your IDE, since we're using sbt to do the servlet deployment. - -## 4. Tell jvm where JRebel is - -Fortunately, the gitbucket project is already set up to use JRebel. -You only need to tell jvm where to find the jrebel jar. - -To do so, edit your shell resource file (usually `~/.bash_profile` on Mac, and `~/.bashrc` on Linux) and set the environment variable `JREBEL`. -For example, if you unzipped your JRebel download in your home directory, you would use: - -```bash -export JREBEL=~/jrebel/legacy/jrebel.jar # legacy agent -export JREBEL=~/jrebel/lib/libjrebel64.dylib # new agent -``` - -You can choose the legacy JRebel agent or the new one. -See [the document](https://zeroturnaround.com/software/jrebel/jrebel7-agent-upgrade-cli/) for details. - -Now reload your shell: - -``` -$ source ~/.bash_profile # on Mac -$ source ~/.bashrc # on Linux -``` - -## 5. See it in action! - -Now you're ready to use JRebel with the gitbucket. -When you run sbt as normal, you will see a long message from JRebel, indicating it has loaded. -Here's an abbreviated version of what you will see: - -``` -$ ./sbt -[info] Loading project definition from /git/gitbucket/project -[info] Set current project to gitbucket (in build file:/git/gitbucket/) -> -``` - -You will start the servlet container slightly differently now that you're using sbt. - -``` -> jetty:quickstart -: -2017-09-21 15:46:35 JRebel: -2017-09-21 15:46:35 JRebel: ############################################################# -2017-09-21 15:46:35 JRebel: -2017-09-21 15:46:35 JRebel: Legacy Agent 7.0.15 (201709080836) -2017-09-21 15:46:35 JRebel: (c) Copyright ZeroTurnaround AS, Estonia, Tartu. -2017-09-21 15:46:35 JRebel: -2017-09-21 15:46:35 JRebel: Over the last 2 days JRebel prevented -2017-09-21 15:46:35 JRebel: at least 8 redeploys/restarts saving you about 0.3 hours. -2017-09-21 15:46:35 JRebel: -2017-09-21 15:46:35 JRebel: Licensed to Naoki Takezoe (using myJRebel). -2017-09-21 15:46:35 JRebel: -2017-09-21 15:46:35 JRebel: -2017-09-21 15:46:35 JRebel: ############################################################# -2017-09-21 15:46:35 JRebel: -: - -> ~compile -[success] Total time: 2 s, completed 2017/09/21 15:50:06 -1. Waiting for source changes... (press enter to interrupt) -``` - -Finally, change your code. -For example, you can change the title on `src/main/twirl/gitbucket/core/main.scala.html` like this: - -```html -: - -: -``` - -If JRebel is doing is correctly installed you will see a notice for you: - -``` -1. Waiting for source changes... (press enter to interrupt) -[info] Compiling 1 Scala source to /Users/naoki.takezoe/gitbucket/target/scala-2.12/classes... -[success] Total time: 1 s, completed 2017/09/21 15:55:40 -``` - -And you reload browser, JRebel give notice of that it has reloaded classes: - -``` -2. Waiting for source changes... (press enter to interrupt) -2017-09-21 15:55:40 JRebel: Reloading class 'gitbucket.core.html.main$'. -``` - -## 6. Limitations - -JRebel is nearly always able to eliminate the need to explicitly reload your container after a code change. However, if you change any of your routing patterns, there is nothing JRebel can do, you will have to restart by `jetty:quickstart`. diff --git a/doc/readme.md b/doc/readme.md index 7ef6e3b..a03cae9 100644 --- a/doc/readme.md +++ b/doc/readme.md @@ -8,5 +8,4 @@ * [Activity Types](activity.md) * [Automatic Schema Updating](auto_update.md) * [Release Operation](release.md) - * [JRebel integration (optional)](jrebel.md) * [Licenses](licenses.md) diff --git a/doc/release.md b/doc/release.md index d417cb7..1d6df7d 100644 --- a/doc/release.md +++ b/doc/release.md @@ -47,7 +47,7 @@ For plug-in development, we have to publish the GitBucket jar file to the Maven central repository as well. At first, hit following command to publish artifacts to the sonatype OSS repository: ```bash -$ sbt publish-signed +$ sbt publishSigned ``` Then logged-in https://oss.sonatype.org/ and delete following files from the staging repository: diff --git a/plugins.json b/plugins.json deleted file mode 100644 index 4f029ce..0000000 --- a/plugins.json +++ /dev/null @@ -1,54 +0,0 @@ -[ - { - "id": "notifications", - "name": "Notifications Plugin", - "description": "Provides notifications feature on GitBucket.", - "versions": [ - { - "version": "1.5.0", - "range": ">=4.23.0", - "url": "https://github.com/gitbucket/gitbucket-notifications-plugin/releases/download/1.5.0/gitbucket-notifications-plugin-assembly-1.5.0.jar" - } - ], - "default": true - }, - { - "id": "emoji", - "name": "Emoji Plugin", - "description": "Provides Emoji support for GitBucket.", - "versions": [ - { - "version": "4.5.0", - "range": ">=4.18.0", - "url": "https://github.com/gitbucket/gitbucket-emoji-plugin/releases/download/4.5.0/gitbucket-emoji-plugin_2.12-4.5.0.jar" - } - ], - "default": false - }, - { - "id": "gist", - "name": "Gist Plugin", - "description": "Provides Gist feature on GitBucket.", - "versions": [ - { - "version": "4.13.0", - "range": ">=4.23.0", - "url": "https://github.com/gitbucket/gitbucket-gist-plugin/releases/download/4.13.0/gitbucket-gist-plugin-assembly-4.13.0.jar" - } - ], - "default": false - }, - { - "id": "pages", - "name": "Pages Plugin", - "description": "Project pages for gitbucket", - "versions": [ - { - "version": "1.7.0", - "range": ">=4.23.0", - "url": "https://github.com/gitbucket/gitbucket-pages-plugin/releases/download/v1.7.0/gitbucket-pages-plugin_2.12-1.7.0.jar" - } - ], - "default": false - } -] diff --git a/project/build.properties b/project/build.properties index 609a2d1..d6e3507 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.3 +sbt.version=1.1.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index d0a6b26..b70719e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,8 @@ scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature") -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.4.0") +addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.0") addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.13") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5") -//addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.0.0") -//addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0") addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.1") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") addSbtCoursier diff --git a/src/main/resources/bundle-plugins.txt b/src/main/resources/bundle-plugins.txt new file mode 100644 index 0000000..f35ec65 --- /dev/null +++ b/src/main/resources/bundle-plugins.txt @@ -0,0 +1 @@ +notifications:1.6.0 diff --git a/src/main/resources/update/gitbucket-core_4.24.xml b/src/main/resources/update/gitbucket-core_4.24.xml new file mode 100644 index 0000000..03249f5 --- /dev/null +++ b/src/main/resources/update/gitbucket-core_4.24.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/main/resources/update/gitbucket-core_4.25.xml b/src/main/resources/update/gitbucket-core_4.25.xml new file mode 100644 index 0000000..8f78bd2 --- /dev/null +++ b/src/main/resources/update/gitbucket-core_4.25.xml @@ -0,0 +1,8 @@ + + + + + + EXTRA_MAIL_ADDRESS = '' + + diff --git a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala index bcca992..99b0c6e 100644 --- a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala +++ b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala @@ -51,5 +51,9 @@ new Version("4.21.2"), new Version("4.22.0", new LiquibaseMigration("update/gitbucket-core_4.22.xml")), new Version("4.23.0", new LiquibaseMigration("update/gitbucket-core_4.23.xml")), - new Version("4.23.1") + new Version("4.23.1"), + new Version("4.24.0", new LiquibaseMigration("update/gitbucket-core_4.24.xml")), + new Version("4.24.1"), + new Version("4.25.0", new LiquibaseMigration("update/gitbucket-core_4.25.xml")), + new Version("4.26.0") ) diff --git a/src/main/scala/gitbucket/core/api/ApiPullRequestReviewComment.scala b/src/main/scala/gitbucket/core/api/ApiPullRequestReviewComment.scala index 7516b2e..26da9ed 100644 --- a/src/main/scala/gitbucket/core/api/ApiPullRequestReviewComment.scala +++ b/src/main/scala/gitbucket/core/api/ApiPullRequestReviewComment.scala @@ -17,7 +17,7 @@ commit_id: String, // "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c", // "original_commit_id": "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c", user: ApiUser, - body: String, // "Maybe you should use more emojji on this line.", + body: String, // "Maybe you should use more emoji on this line.", created_at: Date, // "2015-05-05T23:40:27Z", updated_at: Date // "2015-05-05T23:40:27Z", )(repositoryName: RepositoryName, issueId: Int) diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala index 6223eb5..7663ba9 100644 --- a/src/main/scala/gitbucket/core/controller/AccountController.scala +++ b/src/main/scala/gitbucket/core/controller/AccountController.scala @@ -1,8 +1,10 @@ package gitbucket.core.controller +import java.io.File + import gitbucket.core.account.html import gitbucket.core.helper -import gitbucket.core.model.{AccountWebHook, GroupMember, RepositoryWebHook, Role, WebHook, WebHookContentType} +import gitbucket.core.model._ import gitbucket.core.plugin.PluginRegistry import gitbucket.core.service._ import gitbucket.core.service.WebHookService._ @@ -54,6 +56,7 @@ password: String, fullName: String, mailAddress: String, + extraMailAddresses: List[String], description: Option[String], url: Option[String], fileId: Option[String] @@ -63,6 +66,7 @@ password: Option[String], fullName: String, mailAddress: String, + extraMailAddresses: List[String], description: Option[String], url: Option[String], fileId: Option[String], @@ -78,6 +82,9 @@ "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()))), + "extraMailAddresses" -> list( + trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress()))) + ), "description" -> trim(label("bio", optional(text()))), "url" -> trim(label("URL", optional(text(maxlength(200))))), "fileId" -> trim(label("File ID", optional(text()))) @@ -87,6 +94,9 @@ "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")))), + "extraMailAddresses" -> list( + trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress("userName")))) + ), "description" -> trim(label("bio", optional(text()))), "url" -> trim(label("URL", optional(text(maxlength(200))))), "fileId" -> trim(label("File ID", optional(text()))), @@ -219,13 +229,15 @@ get("/:userName") { val userName = params("userName") getAccountByUserName(userName).map { account => + val extraMailAddresses = getAccountExtraMailAddresses(userName) params.getOrElse("tab", "repositories") match { // Public Activity case "activity" => gitbucket.core.account.html.activity( account, if (account.isGroupAccount) Nil else getGroupsByUserName(userName), - getActivitiesByUser(userName, true) + getActivitiesByUser(userName, true), + extraMailAddresses ) // Members @@ -234,6 +246,7 @@ gitbucket.core.account.html.members( account, members, + extraMailAddresses, context.loginAccount.exists( x => members.exists { member => @@ -250,6 +263,7 @@ account, if (account.isGroupAccount) Nil else getGroupsByUserName(userName), getVisibleRepositories(context.loginAccount, Some(userName)), + extraMailAddresses, context.loginAccount.exists( x => members.exists { member => @@ -268,6 +282,12 @@ helper.xml.feed(getActivitiesByUser(userName, true)) } + get("/:userName.keys") { + val keys = getPublicKeys(params("userName")) + contentType = "text/plain; charset=utf-8" + keys.map(_.publicKey).mkString("", "\n", "\n") + } + get("/:userName/_avatar") { val userName = params("userName") contentType = "image/png" @@ -276,7 +296,9 @@ response.setDateHeader("Last-Modified", account.updatedDate.getTime) account.image .map { image => - Some(RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))) + Some( + RawData(FileUtil.getMimeType(image), new File(getUserUploadDir(userName), FileUtil.checkFilename(image))) + ) } .getOrElse { if (account.isGroupAccount) { @@ -295,26 +317,29 @@ get("/:userName/_edit")(oneselfOnly { val userName = params("userName") getAccountByUserName(userName).map { x => - html.edit(x, flash.get("info"), flash.get("error")) + val extraMails = getAccountExtraMailAddresses(userName) + html.edit(x, extraMails, flash.get("info"), flash.get("error")) } getOrElse NotFound() }) post("/:userName/_edit", editForm)(oneselfOnly { form => val userName = params("userName") - getAccountByUserName(userName).map { account => - updateAccount( - account.copy( - password = form.password.map(sha1).getOrElse(account.password), - fullName = form.fullName, - mailAddress = form.mailAddress, - description = form.description, - url = form.url + getAccountByUserName(userName).map { + account => + updateAccount( + account.copy( + password = form.password.map(pbkdf2_sha256).getOrElse(account.password), + fullName = form.fullName, + mailAddress = form.mailAddress, + description = form.description, + url = form.url + ) ) - ) - updateImage(userName, form.fileId, form.clearImage) - flash += "info" -> "Account information has been updated." - redirect(s"/${userName}/_edit") + updateImage(userName, form.fileId, form.clearImage) + updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != "")) + flash += "info" -> "Account information has been updated." + redirect(s"/${userName}/_edit") } getOrElse NotFound() }) @@ -544,7 +569,7 @@ if (context.settings.allowAccountRegistration) { createAccount( form.userName, - sha1(form.password), + pbkdf2_sha256(form.password), form.fullName, form.mailAddress, false, @@ -552,6 +577,7 @@ form.url ) updateImage(form.userName, form.fileId, false) + updateAccountExtraMailAddresses(form.userName, form.extraMailAddresses.filter(_ != "")) redirect("/signin") } else NotFound() } @@ -687,7 +713,7 @@ } helper.html.forkrepository( repository, - (groups zip managerPermissions).toMap + (groups zip managerPermissions).sortBy(_._1) ) case _ => redirect(s"/${loginUserName}") } diff --git a/src/main/scala/gitbucket/core/controller/ApiController.scala b/src/main/scala/gitbucket/core/controller/ApiController.scala index 79fd56e..fda5fdc 100644 --- a/src/main/scala/gitbucket/core/controller/ApiController.scala +++ b/src/main/scala/gitbucket/core/controller/ApiController.scala @@ -11,6 +11,8 @@ import gitbucket.core.util.SyntaxSugars._ import gitbucket.core.util._ import gitbucket.core.plugin.PluginRegistry +import gitbucket.core.servlet.Database +import gitbucket.core.model.Profile.profile.blockingApi._ import gitbucket.core.view.helpers.{isRenderable, renderMarkup} import org.eclipse.jgit.api.Git import org.eclipse.jgit.revwalk.RevWalk @@ -122,7 +124,7 @@ /* * https://developer.github.com/v3/repos/branches/#list-branches */ - get("/api/v3/repos/:owner/:repo/branches")(referrersOnly { repository => + get("/api/v3/repos/:owner/:repository/branches")(referrersOnly { repository => JsonFormat( JGitUtil .getBranches( @@ -140,7 +142,7 @@ /** * https://developer.github.com/v3/repos/branches/#get-branch */ - get("/api/v3/repos/:owner/:repo/branches/*")(referrersOnly { repository => + get("/api/v3/repos/:owner/:repository/branches/*")(referrersOnly { repository => //import gitbucket.core.api._ (for { branch <- params.get("splat") if repository.branchList.contains(branch) @@ -161,14 +163,14 @@ /* * https://developer.github.com/v3/repos/contents/#get-contents */ - get("/api/v3/repos/:owner/:repo/contents")(referrersOnly { repository => + get("/api/v3/repos/:owner/:repository/contents")(referrersOnly { repository => getContents(repository, ".", params.getOrElse("ref", repository.repository.defaultBranch)) }) /* * https://developer.github.com/v3/repos/contents/#get-contents */ - get("/api/v3/repos/:owner/:repo/contents/*")(referrersOnly { repository => + get("/api/v3/repos/:owner/:repository/contents/*")(referrersOnly { repository => getContents(repository, multiParams("splat").head, params.getOrElse("ref", repository.repository.defaultBranch)) }) @@ -183,7 +185,7 @@ getFileList(git, revision, dirName).find(f => f.name.equals(fileName)) } - using(Git.open(getRepositoryDir(params("owner"), params("repo")))) { git => + using(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git => val fileList = getFileList(git, refStr, path) if (fileList.isEmpty) { // file or NotFound getFileInfo(git, refStr, path) @@ -242,9 +244,9 @@ /* * https://developer.github.com/v3/git/refs/#get-a-reference */ - get("/api/v3/repos/:owner/:repo/git/refs/*")(referrersOnly { repository => + get("/api/v3/repos/:owner/:repository/git/refs/*")(referrersOnly { repository => val revstr = multiParams("splat").head - using(Git.open(getRepositoryDir(params("owner"), params("repo")))) { git => + using(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git => val ref = git.getRepository().findRef(revstr) if (ref != null) { @@ -269,9 +271,11 @@ /** * https://developer.github.com/v3/repos/collaborators/#list-collaborators */ - get("/api/v3/repos/:owner/:repo/collaborators")(referrersOnly { repository => + get("/api/v3/repos/:owner/:repository/collaborators")(referrersOnly { repository => // TODO Should ApiUser take permission? getCollaboratorUserNames does not return owner group members. - JsonFormat(getCollaboratorUserNames(params("owner"), params("repo")).map(u => ApiUser(getAccountByUserName(u).get))) + JsonFormat( + getCollaboratorUserNames(params("owner"), params("repository")).map(u => ApiUser(getAccountByUserName(u).get)) + ) }) /** @@ -313,7 +317,10 @@ data.auto_init ) Await.result(f, Duration.Inf) - val repository = getRepository(owner, data.name).get + + val repository = Database() withTransaction { session => + getRepository(owner, data.name)(session).get + } JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(owner).get))) } else { ApiError( @@ -360,7 +367,7 @@ /** * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */ - patch("/api/v3/repos/:owner/:repo/branches/*")(ownerOnly { repository => + patch("/api/v3/repos/:owner/:repository/branches/*")(ownerOnly { repository => import gitbucket.core.api._ (for { branch <- params.get("splat") if repository.branchList.contains(branch) @@ -718,7 +725,7 @@ /** * https://developer.github.com/v3/repos/statuses/#create-a-status */ - post("/api/v3/repos/:owner/:repo/statuses/:sha")(writableUsersOnly { repository => + post("/api/v3/repos/:owner/:repository/statuses/:sha")(writableUsersOnly { repository => (for { ref <- params.get("sha") sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref) @@ -747,7 +754,7 @@ * * ref is Ref to list the statuses from. It can be a SHA, a branch name, or a tag name. */ - val listStatusesRoute = get("/api/v3/repos/:owner/:repo/commits/:ref/statuses")(referrersOnly { repository => + val listStatusesRoute = get("/api/v3/repos/:owner/:repository/commits/:ref/statuses")(referrersOnly { repository => (for { ref <- params.get("ref") sha <- JGitUtil.getShaByRef(repository.owner, repository.name, ref) @@ -764,7 +771,7 @@ * * legacy route */ - get("/api/v3/repos/:owner/:repo/statuses/:ref") { + get("/api/v3/repos/:owner/:repository/statuses/:ref") { listStatusesRoute.action() } @@ -773,7 +780,7 @@ * * ref is Ref to list the statuses from. It can be a SHA, a branch name, or a tag name. */ - get("/api/v3/repos/:owner/:repo/commits/:ref/status")(referrersOnly { repository => + get("/api/v3/repos/:owner/:repository/commits/:ref/status")(referrersOnly { repository => (for { ref <- params.get("ref") owner <- getAccountByUserName(repository.owner) @@ -787,7 +794,7 @@ /** * https://developer.github.com/v3/repos/commits/#get-a-single-commit */ - get("/api/v3/repos/:owner/:repo/commits/:sha")(referrersOnly { repository => + get("/api/v3/repos/:owner/:repository/commits/:sha")(referrersOnly { repository => val owner = repository.owner val name = repository.name val sha = params("sha") @@ -804,7 +811,7 @@ ApiCommits( repositoryName = RepositoryName(repository), commitInfo = commitInfo, - diffs = JGitUtil.getDiffs(git, Some(commitInfo.parents.head), commitInfo.id, false, true), + diffs = JGitUtil.getDiffs(git, commitInfo.parents.headOption, commitInfo.id, false, true), author = getAccount(commitInfo.authorName, commitInfo.authorEmailAddress), committer = getAccount(commitInfo.committerName, commitInfo.committerEmailAddress), commentCount = getCommitComment(repository.owner, repository.name, sha).size @@ -839,7 +846,7 @@ /** * non-GitHub compatible API for Jenkins-Plugin */ - get("/api/v3/repos/:owner/:repo/raw/*")(referrersOnly { repository => + get("/api/v3/repos/:owner/:repository/raw/*")(referrersOnly { repository => val (id, path) = repository.splitPath(multiParams("splat").head) using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git => val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id)) diff --git a/src/main/scala/gitbucket/core/controller/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala index a2310b3..94c42f6 100644 --- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala +++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala @@ -1,6 +1,6 @@ package gitbucket.core.controller -import java.io.FileInputStream +import java.io.{File, FileInputStream} import gitbucket.core.api.{ApiError, JsonFormat} import gitbucket.core.model.Account @@ -254,7 +254,7 @@ repository: RepositoryService.RepositoryInfo ): Unit = { JGitUtil.getObjectLoaderFromId(git, objectId) { loader => - contentType = FileUtil.getMimeType(path) + contentType = FileUtil.getSafeMimeType(path) if (loader.isLarge) { response.setContentLength(loader.getSize.toInt) @@ -326,21 +326,21 @@ protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit = if (clearImage) { - getAccountByUserName(userName).flatMap(_.image).map { image => - new java.io.File(getUserUploadDir(userName), image).delete() + getAccountByUserName(userName).flatMap(_.image).foreach { image => + new File(getUserUploadDir(userName), FileUtil.checkFilename(image)).delete() updateAvatarImage(userName, None) } } else { - fileId.map { fileId => + fileId.foreach { fileId => val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get) val uploadDir = getUserUploadDir(userName) if (!uploadDir.exists) { uploadDir.mkdirs() } Thumbnails - .of(new java.io.File(getTemporaryDir(session.getId), fileId)) + .of(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId))) .size(324, 324) - .toFile(new java.io.File(uploadDir, filename)) + .toFile(new File(uploadDir, FileUtil.checkFilename(filename))) updateAvatarImage(userName, Some(filename)) } } @@ -359,13 +359,42 @@ params: Map[String, Seq[String]], messages: Messages ): Option[String] = { - getAccountByMailAddress(value, true) - .filter { x => - if (paramName.isEmpty) true else Some(x.userName) != params.optionValue(paramName) - } - .map { _ => - "Mail address is already registered." - } + val extraMailAddresses = params.filterKeys(k => k.startsWith("extraMailAddresses")) + if (extraMailAddresses.exists { + case (k, v) => + v.contains(value) + }) { + Some("These mail addresses are duplicated.") + } else { + getAccountByMailAddress(value, true) + .collect { + case x if paramName.isEmpty || Some(x.userName) != params.optionValue(paramName) => + "Mail address is already registered." + } + } + } + } + + protected def uniqueExtraMailAddress(paramName: String = ""): Constraint = new Constraint() { + override def validate( + name: String, + value: String, + params: Map[String, Seq[String]], + messages: Messages + ): Option[String] = { + val extraMailAddresses = params.filterKeys(k => k.startsWith("extraMailAddresses")) + if (Some(value) == params.optionValue("mailAddress") || extraMailAddresses.count { + case (k, v) => + v.contains(value) + } > 1) { + Some("These mail addresses are duplicated.") + } else { + getAccountByMailAddress(value, true) + .collect { + case x if paramName.isEmpty || Some(x.userName) != params.optionValue(paramName) => + "Mail address is already registered." + } + } } } diff --git a/src/main/scala/gitbucket/core/controller/DashboardController.scala b/src/main/scala/gitbucket/core/controller/DashboardController.scala index 2c8a982..ce0de3a 100644 --- a/src/main/scala/gitbucket/core/controller/DashboardController.scala +++ b/src/main/scala/gitbucket/core/controller/DashboardController.scala @@ -21,6 +21,16 @@ trait DashboardControllerBase extends ControllerBase { self: IssuesService with PullRequestService with RepositoryService with AccountService with UsersAuthenticator => + get("/dashboard/repos")(usersOnly { + val userName = context.loginAccount.get.userName + + html.repos( + getGroupNames(userName), + getVisibleRepositories(None, withoutPhysicalInfo = true), + getUserRepositories(userName, withoutPhysicalInfo = true) + ) + }) + get("/dashboard/issues")(usersOnly { searchIssues("created_by") }) @@ -83,8 +93,7 @@ }, filter, getGroupNames(userName), - Nil, - getUserRepositories(userName, withoutPhysicalInfo = true) + getVisibleRepositories(None, withoutPhysicalInfo = true) ) } @@ -109,8 +118,7 @@ }, filter, getGroupNames(userName), - Nil, - getUserRepositories(userName, withoutPhysicalInfo = true) + getVisibleRepositories(None, withoutPhysicalInfo = true) ) } diff --git a/src/main/scala/gitbucket/core/controller/FileUploadController.scala b/src/main/scala/gitbucket/core/controller/FileUploadController.scala index 3df5d8e..c751776 100644 --- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala +++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala @@ -1,7 +1,9 @@ package gitbucket.core.controller +import java.io.File + import gitbucket.core.model.Account -import gitbucket.core.service.{AccountService, RepositoryService, ReleaseService} +import gitbucket.core.service.{AccountService, ReleaseService, RepositoryService} import gitbucket.core.servlet.Database import gitbucket.core.util._ import gitbucket.core.util.SyntaxSugars._ @@ -31,7 +33,8 @@ post("/image") { execute( { (file, fileId) => - FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get) + FileUtils + .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get) session += Keys.Session.Upload(fileId) -> file.name }, FileUtil.isImage @@ -41,7 +44,8 @@ post("/tmp") { execute( { (file, fileId) => - FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get) + FileUtils + .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get) session += Keys.Session.Upload(fileId) -> file.name }, _ => true @@ -52,9 +56,9 @@ execute( { (file, fileId) => FileUtils.writeByteArrayToFile( - new java.io.File( + new File( getAttachedDir(params("owner"), params("repository")), - fileId + "." + FileUtil.getExtension(file.getName) + FileUtil.checkFilename(fileId + "." + FileUtil.getExtension(file.getName)) ), file.get ) @@ -129,12 +133,15 @@ val owner = params("owner") val repository = params("repository") val tag = params("tag") - execute({ (file, fileId) => - FileUtils.writeByteArrayToFile( - new java.io.File(getReleaseFilesDir(owner, repository), tag + "/" + fileId), - file.get - ) - }, _ => true) + execute( + { (file, fileId) => + FileUtils.writeByteArrayToFile( + new File(getReleaseFilesDir(owner, repository), FileUtil.checkFilename(tag + "/" + fileId)), + file.get + ) + }, + _ => true + ) } .getOrElse(BadRequest()) } diff --git a/src/main/scala/gitbucket/core/controller/IndexController.scala b/src/main/scala/gitbucket/core/controller/IndexController.scala index 528aebf..d7b3f5a 100644 --- a/src/main/scala/gitbucket/core/controller/IndexController.scala +++ b/src/main/scala/gitbucket/core/controller/IndexController.scala @@ -9,7 +9,7 @@ import gitbucket.core.service._ import gitbucket.core.util.Implicits._ import gitbucket.core.util.SyntaxSugars._ -import gitbucket.core.util.{Keys, LDAPUtil, ReferrerAuthenticator, UsersAuthenticator} +import gitbucket.core.util._ import org.scalatra.Ok import org.scalatra.forms._ @@ -64,8 +64,7 @@ val visibleOwnerSet: Set[String] = Set(account.userName) ++ getGroupsByUserName(account.userName) gitbucket.core.html.index( getRecentActivitiesByOwners(visibleOwnerSet), - Nil, - getUserRepositories(account.userName, withoutPhysicalInfo = true), + getVisibleRepositories(None, withoutPhysicalInfo = true), showBannerToCreatePersonalAccessToken = hasAccountFederation(account.userName) && !hasAccessToken( account.userName ) @@ -75,7 +74,6 @@ gitbucket.core.html.index( getRecentActivities(), getVisibleRepositories(None, withoutPhysicalInfo = true), - Nil, showBannerToCreatePersonalAccessToken = false ) } @@ -208,7 +206,7 @@ } .map { t => Map( - "label" -> s"@${t.userName} ${t.fullName}", + "label" -> s"@${StringUtil.escapeHtml(t.userName)} ${StringUtil.escapeHtml(t.fullName)}", "value" -> t.userName ) } @@ -273,18 +271,7 @@ val repositories = visibleRepositories.filter { repository => repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0 } - context.loginAccount - .map { account => - gitbucket.core.search.html.repositories( - query, - repositories, - Nil, - getUserRepositories(account.userName, withoutPhysicalInfo = true) - ) - } - .getOrElse { - gitbucket.core.search.html.repositories(query, repositories, visibleRepositories, Nil) - } + gitbucket.core.search.html.repositories(query, repositories, visibleRepositories) } } diff --git a/src/main/scala/gitbucket/core/controller/IssuesController.scala b/src/main/scala/gitbucket/core/controller/IssuesController.scala index 8fb441a..90676e6 100644 --- a/src/main/scala/gitbucket/core/controller/IssuesController.scala +++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala @@ -154,15 +154,25 @@ ajaxPost("/:owner/:repository/issues/edit_title/:id", issueTitleEditForm)(readableUsersOnly { (title, repository) => defining(repository.owner, repository.name) { case (owner, name) => - getIssue(owner, name, params("id")).map { issue => - if (isEditableContent(owner, name, issue.openedUserName)) { - // update issue - updateIssue(owner, name, issue.issueId, title, issue.content) - // extract references and create refer comment - createReferComment(owner, name, issue.copy(title = title), title, context.loginAccount.get) - - redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}") - } else Unauthorized() + getIssue(owner, name, params("id")).map { + issue => + if (isEditableContent(owner, name, issue.openedUserName)) { + if (issue.title != title) { + // update issue + updateIssue(owner, name, issue.issueId, title, issue.content) + // extract references and create refer comment + createReferComment(owner, name, issue.copy(title = title), title, context.loginAccount.get) + createComment( + owner, + name, + context.loginAccount.get.userName, + issue.issueId, + issue.title + "\r\n" + title, + "change_title" + ) + } + redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}") + } else Unauthorized() } getOrElse NotFound() } }) @@ -396,7 +406,7 @@ case dir if (dir.exists && dir.isDirectory) => dir.listFiles.find(_.getName.startsWith(params("file") + ".")).map { file => response.setHeader("Content-Disposition", f"""inline; filename=${file.getName}""") - RawData(FileUtil.getMimeType(file.getName), file) + RawData(FileUtil.getSafeMimeType(file.getName), file) } case _ => None }) getOrElse NotFound() diff --git a/src/main/scala/gitbucket/core/controller/PreProcessController.scala b/src/main/scala/gitbucket/core/controller/PreProcessController.scala index 766bbb2..50023c4 100644 --- a/src/main/scala/gitbucket/core/controller/PreProcessController.scala +++ b/src/main/scala/gitbucket/core/controller/PreProcessController.scala @@ -7,14 +7,7 @@ trait PreProcessControllerBase extends ControllerBase { /** - * Provides GitHub compatible URLs for Git client. - * - * - * - * @see https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols + * Provides GitHub compatible URLs (e.g. http://localhost:8080/owner/repo.git) for Git client. */ get("/*/*/info/refs") { val query = Option(request.getQueryString).map("?" + _).getOrElse("") @@ -22,6 +15,14 @@ } /** + * Provides GitHub compatible URLs for GitLFS client. + */ + post("/*/*/info/lfs/objects/batch") { + val dispatcher = request.getRequestDispatcher("/git" + request.getRequestURI) + dispatcher.forward(request, response) + } + + /** * Filter requests from anonymous users. * * If anonymous access is allowed, pass all requests. diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala index 8fea200..52e223c 100644 --- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala +++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala @@ -1,6 +1,6 @@ package gitbucket.core.controller -import gitbucket.core.model.WebHook +import gitbucket.core.model.{CommitComment, CommitComments, IssueComment, WebHook} import gitbucket.core.plugin.PluginRegistry import gitbucket.core.pulls.html import gitbucket.core.service.CommitStatusService @@ -113,33 +113,92 @@ val name = repository.name getPullRequest(owner, name, issueId) map { case (issue, pullreq) => - using(Git.open(getRepositoryDir(owner, name))) { - git => - val (commits, diffs) = - getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo) - html.pullreq( - issue, - pullreq, - (commits.flatten - .map(commit => getCommitComments(owner, name, commit.id, true)) - .flatten - .toList ::: getComments(owner, name, issueId)) - .sortWith((a, b) => a.registeredDate before b.registeredDate), - getIssueLabels(owner, name, issueId), - getAssignableUserNames(owner, name), - getMilestonesWithIssueCount(owner, name), - getPriorities(owner, name), - getLabels(owner, name), - commits, - 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) - ) - } + val (commits, diffs) = + getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo) + + html.conversation( + issue, + pullreq, + commits.flatten, + getPullRequestComments(owner, name, issue.issueId, commits.flatten), + diffs.size, + getIssueLabels(owner, name, issueId), + getAssignableUserNames(owner, name), + getMilestonesWithIssueCount(owner, name), + getPriorities(owner, name), + getLabels(owner, name), + 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) + ) + +// html.pullreq( +// issue, +// pullreq, +// comments, +// getIssueLabels(owner, name, issueId), +// getAssignableUserNames(owner, name), +// getMilestonesWithIssueCount(owner, name), +// getPriorities(owner, name), +// getLabels(owner, name), +// commits, +// 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) +// ) + } + } getOrElse NotFound() + }) + + get("/:owner/:repository/pull/:id/commits")(referrersOnly { repository => + params("id").toIntOpt.flatMap { + issueId => + val owner = repository.owner + val name = repository.name + getPullRequest(owner, name, issueId) map { + case (issue, pullreq) => + val (commits, diffs) = + getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo) + + html.commits( + issue, + pullreq, + commits, + getPullRequestComments(owner, name, issue.issueId, commits.flatten), + diffs.size, + isManageable(repository), + repository + ) + } + } getOrElse NotFound() + }) + + get("/:owner/:repository/pull/:id/files")(referrersOnly { repository => + params("id").toIntOpt.flatMap { + issueId => + val owner = repository.owner + val name = repository.name + getPullRequest(owner, name, issueId) map { + case (issue, pullreq) => + val (commits, diffs) = + getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo) + + html.files( + issue, + pullreq, + diffs, + commits.flatten, + getPullRequestComments(owner, name, issue.issueId, commits.flatten), + isManageable(repository), + repository + ) } } getOrElse NotFound() }) @@ -293,8 +352,17 @@ // close issue by commit message if (pullreq.requestBranch == repository.repository.defaultBranch) { - commits.map { commit => - closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name) + commits.foreach { commit => + closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach { + issueId => + getIssue(repository.owner, repository.name, issueId.toString).foreach { issue => + callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) + PluginRegistry().getIssueHooks + .foreach( + _.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount) + ) + } + } } } @@ -399,15 +467,35 @@ val defaultBranch = getRepository(owner, name).get.repository.defaultBranch if (pullreq.branch == defaultBranch) { commits.flatten.foreach { commit => - closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name) + closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach { + issueId => + getIssue(owner, name, issueId.toString).foreach { issue => + callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) + PluginRegistry().getIssueHooks + .foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount)) + } + } } + val issueContent = issue.title + " " + issue.content.getOrElse("") closeIssuesFromMessage( - issue.title + " " + issue.content.getOrElse(""), + issueContent, loginAccount.userName, owner, name - ) - closeIssuesFromMessage(form.message, loginAccount.userName, owner, name) + ).foreach { issueId => + getIssue(owner, name, issueId.toString).foreach { issue => + callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) + PluginRegistry().getIssueHooks + .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount)) + } + } + closeIssuesFromMessage(form.message, loginAccount.userName, owner, name).foreach { issueId => + getIssue(owner, name, issueId.toString).foreach { issue => + callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) + PluginRegistry().getIssueHooks + .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount)) + } + } } updatePullRequests(owner, name, pullreq.branch) @@ -655,7 +743,7 @@ // insert labels if (manageable) { - form.labelNames.map { value => + form.labelNames.foreach { value => val labels = getLabels(owner, name) value.split(",").foreach { labelName => labels.find(_.labelName == labelName).map { label => @@ -693,6 +781,10 @@ }) ajaxGet("/:owner/:repository/pulls/proposals")(readableUsersOnly { repository => + val thresholdTime = System.currentTimeMillis() - (1000 * 60 * 60) + val mailAddresses = + context.loginAccount.map(x => Seq(x.mailAddress) ++ getAccountExtraMailAddresses(x.userName)).getOrElse(Nil) + val branches = JGitUtil .getBranches( owner = repository.owner, @@ -700,8 +792,14 @@ defaultBranch = repository.repository.defaultBranch, origin = repository.repository.originUserName.isEmpty ) - .filter(x => x.mergeInfo.map(_.ahead).getOrElse(0) > 0 && x.mergeInfo.map(_.behind).getOrElse(0) == 0) - .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime)) + .filter { x => + x.mergeInfo.map(_.ahead).getOrElse(0) > 0 && x.mergeInfo.map(_.behind).getOrElse(0) == 0 && + x.commitTime.getTime > thresholdTime && + mailAddresses.contains(x.committerEmailAddress) + } + .sortBy { br => + (br.mergeInfo.isEmpty, br.commitTime) + } .map(_.name) .reverse diff --git a/src/main/scala/gitbucket/core/controller/ReleasesController.scala b/src/main/scala/gitbucket/core/controller/ReleasesController.scala index 8ffd023..ed44860 100644 --- a/src/main/scala/gitbucket/core/controller/ReleasesController.scala +++ b/src/main/scala/gitbucket/core/controller/ReleasesController.scala @@ -79,8 +79,8 @@ } yield { response.setHeader("Content-Disposition", s"attachment; filename=${asset.label}") RawData( - FileUtil.getMimeType(asset.label), - new File(getReleaseFilesDir(repository.owner, repository.name), tagName + "/" + fileId) + FileUtil.getSafeMimeType(asset.label), + new File(getReleaseFilesDir(repository.owner, repository.name), FileUtil.checkFilename(tagName + "/" + fileId)) ) }).getOrElse(NotFound()) }) @@ -111,7 +111,10 @@ files.foreach { case (fileId, fileName) => val size = - new java.io.File(getReleaseFilesDir(repository.owner, repository.name), tagName + "/" + fileId).length + new File( + getReleaseFilesDir(repository.owner, repository.name), + FileUtil.checkFilename(tagName + "/" + fileId) + ).length createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount) } @@ -153,15 +156,18 @@ files.foreach { case (fileId, fileName) => val size = - new java.io.File(getReleaseFilesDir(repository.owner, repository.name), tagName + "/" + fileId).length + new File( + getReleaseFilesDir(repository.owner, repository.name), + FileUtil.checkFilename(tagName + "/" + fileId) + ).length createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount) } assets.foreach { asset => if (!files.exists { case (fileId, _) => fileId == asset.fileName }) { - val file = new java.io.File( + val file = new File( getReleaseFilesDir(repository.owner, repository.name), - release.tag + "/" + asset.fileName + FileUtil.checkFilename(release.tag + "/" + asset.fileName) ) FileUtils.forceDelete(file) } @@ -175,7 +181,9 @@ post("/:owner/:repository/releases/:tag/delete")(writableUsersOnly { repository => val tagName = params("tag") getRelease(repository.owner, repository.name, tagName).foreach { release => - FileUtils.deleteDirectory(new File(getReleaseFilesDir(repository.owner, repository.name), release.tag)) + FileUtils.deleteDirectory( + new File(getReleaseFilesDir(repository.owner, repository.name), FileUtil.checkFilename(release.tag)) + ) } deleteRelease(repository.owner, repository.name, tagName) redirect(s"/${repository.owner}/${repository.name}/releases") diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala index adfdfc4..0807cd4 100644 --- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala @@ -229,7 +229,7 @@ post("/:owner/:repository/settings/collaborators")(ownerOnly { repository => val collaborators = params("collaborators") removeCollaborators(repository.owner, repository.name) - collaborators.split(",").withFilter(_.nonEmpty).map { collaborator => + collaborators.split(",").withFilter(_.nonEmpty).foreach { collaborator => val userName :: role :: Nil = collaborator.split(":").toList addCollaborator(repository.owner, repository.name, userName, role) } diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index 9a4a713..3a3480b 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -17,6 +17,13 @@ import gitbucket.core.service.WebHookService._ import gitbucket.core.view import gitbucket.core.view.helpers +import org.apache.commons.compress.archivers.{ArchiveEntry, ArchiveOutputStream} +import org.apache.commons.compress.archivers.tar.{TarArchiveEntry, TarArchiveOutputStream} +import org.apache.commons.compress.archivers.zip.{ZipArchiveEntry, ZipArchiveOutputStream} +import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream +import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream +import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream +import org.apache.commons.compress.utils.IOUtils import org.scalatra.forms._ import org.apache.commons.io.FileUtils import org.ec4j.core.model.PropertyType @@ -26,6 +33,8 @@ import org.eclipse.jgit.errors.MissingObjectException import org.eclipse.jgit.lib._ import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack} +import org.eclipse.jgit.treewalk.TreeWalk +import org.eclipse.jgit.treewalk.filter.PathFilter import org.json4s.jackson.Serialization import org.scalatra._ import org.scalatra.i18n.Messages @@ -104,7 +113,8 @@ oldLineNumber: Option[Int], newLineNumber: Option[Int], content: String, - issueId: Option[Int] + issueId: Option[Int], + diff: Option[String] ) val uploadForm = mapping( @@ -139,7 +149,8 @@ "oldLineNumber" -> trim(label("Old line number", optional(number()))), "newLineNumber" -> trim(label("New line number", optional(number()))), "content" -> trim(label("Content", text(required))), - "issueId" -> trim(label("Issue Id", optional(number()))) + "issueId" -> trim(label("Issue Id", optional(number()))), + "diff" -> optional(text()) )(CommentForm.apply) /** @@ -238,6 +249,10 @@ using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git => + def getTags(sha: String): List[String] = { + JGitUtil.getTagsOnCommit(git, sha) + } + JGitUtil.getCommitLog(git, branchName, page, 30, path) match { case Right((logs, hasNext)) => html.commits( @@ -251,7 +266,8 @@ hasNext, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), getStatuses, - getSummary + getSummary, + getTags ) case Left(_) => NotFound() } @@ -571,6 +587,22 @@ form.newLineNumber, form.issueId ) + + for { + fileName <- form.fileName + diff <- form.diff + } { + saveCommitCommentDiff( + repository.owner, + repository.name, + id, + fileName, + form.oldLineNumber, + form.newLineNumber, + diff + ) + } + form.issueId match { case Some(issueId) => recordCommentPullRequestActivity( @@ -605,7 +637,8 @@ newLineNumber, issueId, hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount), - repository = repository + repository = repository, + focus = true ) }) @@ -622,6 +655,22 @@ form.newLineNumber, form.issueId ) + + for { + fileName <- form.fileName + diff <- form.diff + } { + saveCommitCommentDiff( + repository.owner, + repository.name, + id, + fileName, + form.oldLineNumber, + form.newLineNumber, + diff + ) + } + val comment = getCommitComment(repository.owner, repository.name, commentId.toString).get form.issueId match { case Some(issueId) => @@ -675,6 +724,7 @@ enableRefsLink = true, enableAnchor = true, enableLineBreaks = true, + enableTaskList = true, hasWritePermission = true ) ) @@ -782,16 +832,54 @@ }) /** - * Download repository contents as an archive. + * Download repository contents as a zip archive as compatible URL. */ - get("/:owner/:repository/archive/*")(referrersOnly { repository => - multiParams("splat").head match { - case name if name.endsWith(".zip") => - archiveRepository(name, ".zip", repository) - case name if name.endsWith(".tar.gz") => - archiveRepository(name, ".tar.gz", repository) - case _ => BadRequest() - } + get("/:owner/:repository/archive/:branch.zip")(referrersOnly { repository => + val branch = params("branch") + archiveRepository(branch, branch + ".zip", repository, "") + }) + + /** + * Download repository contents as a tar.gz archive as compatible URL. + */ + get("/:owner/:repository/archive/:branch.tar.gz")(referrersOnly { repository => + val branch = params("branch") + archiveRepository(branch, branch + ".tar.gz", repository, "") + }) + + /** + * Download repository contents as a tar.bz2 archive as compatible URL. + */ + get("/:owner/:repository/archive/:branch.tar.bz2")(referrersOnly { repository => + val branch = params("branch") + archiveRepository(branch, branch + ".tar.bz2", repository, "") + }) + + /** + * Download repository contents as a tar.xz archive as compatible URL. + */ + get("/:owner/:repository/archive/:branch.tar.xz")(referrersOnly { repository => + val branch = params("branch") + archiveRepository(branch, branch + ".tar.xz", repository, "") + }) + + /** + * Download all repository contents as an archive. + */ + get("/:owner/:repository/archive/:branch/:name")(referrersOnly { repository => + val branch = params("branch") + val name = params("name") + archiveRepository(branch, name, repository, "") + }) + + /** + * Download repositories subtree contents as an archive. + */ + get("/:owner/:repository/archive/:branch/*/:name")(referrersOnly { repository => + val branch = params("branch") + val name = params("name") + val path = multiParams("splat").head + archiveRepository(branch, name, repository, path) }) get("/:owner/:repository/network/members")(referrersOnly { repository => @@ -866,7 +954,8 @@ } newFiles.foreach { file => - val bytes = FileUtils.readFileToByteArray(new File(getTemporaryDir(session.getId), file.id)) + val bytes = + FileUtils.readFileToByteArray(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(file.id))) builder.add( JGitUtil.createDirCacheEntry(file.name, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes)) ) @@ -984,7 +1073,14 @@ // close issue by commit message if (branch == repository.repository.defaultBranch) { - closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name) + closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name).foreach { + issueId => + getIssue(repository.owner, repository.name, issueId.toString).foreach { issue => + callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) + PluginRegistry().getIssueHooks + .foreach(_.closedByCommitComment(issue, repository, message, loginAccount)) + } + } } // call post commit hook @@ -1078,26 +1174,97 @@ } } - private def archiveRepository(name: String, suffix: String, repository: RepositoryService.RepositoryInfo): Unit = { - val revision = name.stripSuffix(suffix) + private def archiveRepository( + revision: String, + filename: String, + repository: RepositoryService.RepositoryInfo, + path: String + ) = { + def archive(archiveFormat: String, archive: ArchiveOutputStream)( + entryCreator: (String, Long, Int) => ArchiveEntry + ): Unit = { + using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git => + val oid = git.getRepository.resolve(revision) + val revCommit = JGitUtil.getRevCommitFromId(git, oid) + val sha1 = oid.getName() + val repositorySuffix = (if (sha1.startsWith(revision)) sha1 else revision).replace('/', '-') + val pathSuffix = if (path.isEmpty) "" else '-' + path.replace('/', '-') + val baseName = repository.name + "-" + repositorySuffix + pathSuffix - using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git => - val oid = git.getRepository.resolve(revision) - val revCommit = JGitUtil.getRevCommitFromId(git, oid) - val sha1 = oid.getName() - val repositorySuffix = (if (sha1.startsWith(revision)) sha1 else revision).replace('/', '-') - val filename = repository.name + "-" + repositorySuffix + suffix + using(new TreeWalk(git.getRepository)) { treeWalk => + treeWalk.addTree(revCommit.getTree) + treeWalk.setRecursive(true) + if (!path.isEmpty) { + treeWalk.setFilter(PathFilter.create(path)) + } + if (treeWalk != null) { + while (treeWalk.next()) { + val entryPath = + if (path.isEmpty) baseName + "/" + treeWalk.getPathString + else path.split("/").last + treeWalk.getPathString.substring(path.length) + val size = JGitUtil.getFileSize(git, repository, treeWalk) + val mode = treeWalk.getFileMode.getBits + val entry: ArchiveEntry = entryCreator(entryPath, size, mode) + JGitUtil.openFile(git, repository, revCommit.getTree, treeWalk.getPathString) { in => + archive.putArchiveEntry(entry) + IOUtils.copy(in, archive) + archive.closeArchiveEntry() + } + } + } + } + } + } - contentType = "application/octet-stream" - response.setHeader("Content-Disposition", s"attachment; filename=${filename}") - response.setBufferSize(1024 * 1024); + val suffix = + path.split("/").lastOption.collect { case x if x.length > 0 => "-" + x.replace('/', '_') }.getOrElse("") + val zipRe = """(.+)\.zip$""".r + val tarRe = """(.+)\.tar\.(gz|bz2|xz)$""".r - git.archive - .setFormat(suffix.tail) - .setPrefix(repository.name + "-" + repositorySuffix + "/") - .setTree(revCommit) - .setOutputStream(response.getOutputStream) - .call() + filename match { + case zipRe(branch) => + response.setHeader( + "Content-Disposition", + s"attachment; filename=${repository.name}-${branch}${suffix}.zip" + ) + contentType = "application/octet-stream" + response.setBufferSize(1024 * 1024); + using(new ZipArchiveOutputStream(response.getOutputStream)) { zip => + archive(".zip", zip) { (path, size, mode) => + val entry = new ZipArchiveEntry(path) + entry.setSize(size) + entry.setUnixMode(mode) + entry + } + } + () + case tarRe(branch, compressor) => + response.setHeader( + "Content-Disposition", + s"attachment; filename=${repository.name}-${branch}${suffix}.tar.${compressor}" + ) + contentType = "application/octet-stream" + response.setBufferSize(1024 * 1024) + using(compressor match { + case "gz" => new GzipCompressorOutputStream(response.getOutputStream) + case "bz2" => new BZip2CompressorOutputStream(response.getOutputStream) + case "xz" => new XZCompressorOutputStream(response.getOutputStream) + }) { compressorOutputStream => + using(new TarArchiveOutputStream(compressorOutputStream)) { tar => + tar.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_STAR) + tar.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU) + tar.setAddPaxHeadersForNonAsciiNames(true) + archive(".tar.gz", tar) { (path, size, mode) => + val entry = new TarArchiveEntry(path) + entry.setSize(size) + entry.setMode(mode) + entry + } + } + } + () + case _ => + BadRequest() } } diff --git a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala index d2d0649..b7d369e 100644 --- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala @@ -15,6 +15,7 @@ import gitbucket.core.util.SyntaxSugars._ import gitbucket.core.util.{AdminAuthenticator, Mailer} import org.apache.commons.io.IOUtils +import org.apache.commons.mail.EmailException import org.json4s.jackson.Serialization import org.scalatra._ import org.scalatra.forms._ @@ -44,9 +45,11 @@ "gravatar" -> trim(label("Gravatar", boolean())), "notification" -> trim(label("Notification", boolean())), "activityLogLimit" -> trim(label("Limit of activity logs", optional(number()))), - "ssh" -> trim(label("SSH access", boolean())), - "sshHost" -> trim(label("SSH host", optional(text()))), - "sshPort" -> trim(label("SSH port", optional(number()))), + "ssh" -> mapping( + "enabled" -> trim(label("SSH access", boolean())), + "host" -> trim(label("SSH host", optional(text()))), + "port" -> trim(label("SSH port", optional(number()))), + )(Ssh.apply), "useSMTP" -> trim(label("SMTP", boolean())), "smtp" -> optionalIfNotChecked( "useSMTP", @@ -89,13 +92,17 @@ "jwsAlgorithm" -> trim(label("Signature algorithm", optional(text()))) )(OIDC.apply) ), - "skinName" -> trim(label("AdminLTE skin name", text(required))) + "skinName" -> trim(label("AdminLTE skin name", text(required))), + "showMailAddress" -> trim(label("Show mail address", boolean())), + "pluginNetworkInstall" -> new SingleValueType[Boolean] { + override def convert(value: String, messages: Messages): Boolean = context.settings.pluginNetworkInstall + } )(SystemSettings.apply).verifying { settings => Vector( - if (settings.ssh && settings.baseUrl.isEmpty) { + if (settings.ssh.enabled && settings.baseUrl.isEmpty) { Some("baseUrl" -> "Base URL is required if SSH access is enabled.") } else None, - if (settings.ssh && settings.sshHost.isEmpty) { + if (settings.ssh.enabled && settings.ssh.sshHost.isEmpty) { Some("sshHost" -> "SSH host is required if SSH access is enabled.") } else None ).flatten @@ -124,6 +131,7 @@ password: String, fullName: String, mailAddress: String, + extraMailAddresses: List[String], isAdmin: Boolean, description: Option[String], url: Option[String], @@ -135,6 +143,7 @@ password: Option[String], fullName: String, mailAddress: String, + extraMailAddresses: List[String], isAdmin: Boolean, description: Option[String], url: Option[String], @@ -166,6 +175,9 @@ "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()))), + "extraMailAddresses" -> list( + trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress("userName")))) + ), "isAdmin" -> trim(label("User Type", boolean())), "description" -> trim(label("bio", optional(text()))), "url" -> trim(label("URL", optional(text(maxlength(200))))), @@ -177,6 +189,9 @@ "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")))), + "extraMailAddresses" -> list( + trim(label("Additional Mail Address", text(maxlength(100), uniqueExtraMailAddress("userName")))) + ), "isAdmin" -> trim(label("User Type", boolean())), "description" -> trim(label("bio", optional(text()))), "url" -> trim(label("URL", optional(text(maxlength(200))))), @@ -304,86 +319,98 @@ "Test mail has been sent to: " + form.testAddress } catch { - case e: Exception => "[Error] " + e.toString + case e: EmailException => s"[Error] ${e.getCause}" + case e: Exception => "[Error] " + e.toString } }) get("/admin/plugins")(adminOnly { // Installed plugins val enabledPlugins = PluginRegistry().getPlugins() + val gitbucketVersion = GitBucketCoreModule.getVersions.asScala.last.getVersion - val gitbucketVersion = Semver.valueOf(GitBucketCoreModule.getVersions.asScala.last.getVersion) - - // Plugins in the local repository - val repositoryPlugins = PluginRepository - .getPlugins() - .filterNot { meta => - enabledPlugins.exists { plugin => - plugin.pluginId == meta.id && - Semver.valueOf(plugin.pluginVersion).greaterThanOrEqualTo(Semver.valueOf(meta.latestVersion.version)) + // Plugins in the remote repository + val repositoryPlugins = if (context.settings.pluginNetworkInstall) { + PluginRepository + .getPlugins() + .map { meta => + (meta, meta.versions.reverse.find { version => + gitbucketVersion == version.gitbucketVersion && !enabledPlugins.exists { plugin => + plugin.pluginId == meta.id && plugin.pluginVersion == version.version + } + }) } - } - .map { meta => - (meta, meta.versions.reverse.find { version => - gitbucketVersion.satisfies(version.range) - }) - } - .collect { - case (meta, Some(version)) => - new PluginInfoBase( - pluginId = meta.id, - pluginName = meta.name, - pluginVersion = version.version, - description = meta.description - ) - } + .collect { + case (meta, Some(version)) => + new PluginInfoBase( + pluginId = meta.id, + pluginName = meta.name, + pluginVersion = version.version, + gitbucketVersion = Some(version.gitbucketVersion), + description = meta.description + ) + } + } else Nil // Merge - val plugins = enabledPlugins.map((_, true)) ++ repositoryPlugins.map((_, false)) + val plugins = (enabledPlugins.map((_, true)) ++ repositoryPlugins.map((_, false))) + .groupBy(_._1.pluginId) + .map { + case (pluginId, plugins) => + val (plugin, enabled) = plugins.head + (plugin, enabled, if (plugins.length > 1) plugins.last._1.pluginVersion else "") + } + .toList html.plugins(plugins, flash.get("info")) }) post("/admin/plugins/_reload")(adminOnly { + // Update configuration + val pluginNetworkInstall = params.get("pluginNetworkInstall").map(_.toBoolean).getOrElse(false) + saveSystemSettings(context.settings.copy(pluginNetworkInstall = pluginNetworkInstall)) + + // Reload plugins PluginRegistry.reload(request.getServletContext(), loadSystemSettings(), request2Session(request).conn) flash += "info" -> "All plugins were reloaded." redirect("/admin/plugins") }) - post("/admin/plugins/:pluginId/:version/_uninstall")(adminOnly { + post("/admin/plugins/:pluginId/_uninstall")(adminOnly { val pluginId = params("pluginId") - val version = params("version") - PluginRegistry() - .getPlugins() - .collect { case plugin if (plugin.pluginId == pluginId && plugin.pluginVersion == version) => plugin } - .foreach { _ => - PluginRegistry - .uninstall(pluginId, request.getServletContext, loadSystemSettings(), request2Session(request).conn) - flash += "info" -> s"${pluginId} was uninstalled." - } + + if (PluginRegistry().getPlugins().exists(_.pluginId == pluginId)) { + PluginRegistry + .uninstall(pluginId, request.getServletContext, loadSystemSettings(), request2Session(request).conn) + flash += "info" -> s"${pluginId} was uninstalled." + } + redirect("/admin/plugins") }) post("/admin/plugins/:pluginId/:version/_install")(adminOnly { - val pluginId = params("pluginId") - val version = params("version") - /// TODO!!!! - PluginRepository - .getPlugins() - .collect { case meta if meta.id == pluginId => (meta, meta.versions.find(_.version == version)) } - .foreach { - case (meta, version) => - version.foreach { version => - // TODO Install version! - PluginRegistry.install( - new java.io.File(PluginHome, s".repository/${version.file}"), - request.getServletContext, - loadSystemSettings(), - request2Session(request).conn - ) - flash += "info" -> s"${pluginId} was installed." - } - } + if (context.settings.pluginNetworkInstall) { + val pluginId = params("pluginId") + val version = params("version") + + PluginRepository + .getPlugins() + .collect { case meta if meta.id == pluginId => (meta, meta.versions.find(_.version == version)) } + .foreach { + case (meta, version) => + version.foreach { version => + PluginRegistry.install( + pluginId, + new java.net.URL(version.url), + request.getServletContext, + loadSystemSettings(), + request2Session(request).conn + ) + flash += "info" -> s"${pluginId}:${version.version} was installed." + } + } + } + redirect("/admin/plugins") }) @@ -400,13 +427,13 @@ }) get("/admin/users/_newuser")(adminOnly { - html.user(None) + html.user(None, Nil) }) post("/admin/users/_newuser", newUserForm)(adminOnly { form => createAccount( form.userName, - sha1(form.password), + pbkdf2_sha256(form.password), form.fullName, form.mailAddress, form.isAdmin, @@ -414,12 +441,14 @@ form.url ) updateImage(form.userName, form.fileId, false) + updateAccountExtraMailAddresses(form.userName, form.extraMailAddresses.filter(_ != "")) redirect("/admin/users") }) get("/admin/users/:userName/_edituser")(adminOnly { val userName = params("userName") - html.user(getAccountByUserName(userName, true), flash.get("error")) + val extraMails = getAccountExtraMailAddresses(userName) + html.user(getAccountByUserName(userName, true), extraMails, flash.get("error")) }) post("/admin/users/:name/_edituser", editUserForm)(adminOnly { form => @@ -444,7 +473,7 @@ updateAccount( account.copy( - password = form.password.map(sha1).getOrElse(account.password), + password = form.password.map(pbkdf2_sha256).getOrElse(account.password), fullName = form.fullName, mailAddress = form.mailAddress, isAdmin = form.isAdmin, @@ -455,6 +484,7 @@ ) updateImage(userName, form.fileId, form.clearImage) + updateAccountExtraMailAddresses(userName, form.extraMailAddresses.filter(_ != "")) // call hooks if (form.isRemoved) PluginRegistry().getAccountHooks.foreach(_.deleted(userName)) diff --git a/src/main/scala/gitbucket/core/controller/WikiController.scala b/src/main/scala/gitbucket/core/controller/WikiController.scala index 2298971..319f19f 100644 --- a/src/main/scala/gitbucket/core/controller/WikiController.scala +++ b/src/main/scala/gitbucket/core/controller/WikiController.scala @@ -180,7 +180,7 @@ loginAccount, form.message.getOrElse(""), Some(form.id) - ).map { + ).foreach { commitId => updateLastActivityDate(repository.owner, repository.name) recordEditWikiPageActivity( @@ -224,7 +224,7 @@ loginAccount, form.message.getOrElse(""), None - ).map { + ).foreach { commitId => updateLastActivityDate(repository.owner, repository.name) recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName) diff --git a/src/main/scala/gitbucket/core/model/AccountExtraMailAddress.scala b/src/main/scala/gitbucket/core/model/AccountExtraMailAddress.scala new file mode 100644 index 0000000..88cc2fe --- /dev/null +++ b/src/main/scala/gitbucket/core/model/AccountExtraMailAddress.scala @@ -0,0 +1,19 @@ +package gitbucket.core.model + +trait AccountExtraMailAddressComponent { self: Profile => + import profile.api._ + + lazy val AccountExtraMailAddresses = TableQuery[AccountExtraMailAddresses] + + class AccountExtraMailAddresses(tag: Tag) extends Table[AccountExtraMailAddress](tag, "ACCOUNT_EXTRA_MAIL_ADDRESS") { + val userName = column[String]("USER_NAME", O PrimaryKey) + val extraMailAddress = column[String]("EXTRA_MAIL_ADDRESS", O PrimaryKey) + def * = + (userName, extraMailAddress) <> (AccountExtraMailAddress.tupled, AccountExtraMailAddress.unapply) + } +} + +case class AccountExtraMailAddress( + userName: String, + extraMailAddress: String +) diff --git a/src/main/scala/gitbucket/core/model/Comment.scala b/src/main/scala/gitbucket/core/model/Comment.scala index 8f79a52..8e5044c 100644 --- a/src/main/scala/gitbucket/core/model/Comment.scala +++ b/src/main/scala/gitbucket/core/model/Comment.scala @@ -1,6 +1,7 @@ package gitbucket.core.model +import java.util.Date -trait Comment { +sealed trait Comment { val commentedUserName: String val registeredDate: java.util.Date } @@ -87,3 +88,11 @@ updatedDate: java.util.Date, issueId: Option[Int] ) extends Comment + +case class CommitComments( + fileName: String, + commentedUserName: String, + registeredDate: Date, + comments: Seq[CommitComment], + diff: Option[String] +) extends Comment diff --git a/src/main/scala/gitbucket/core/model/Profile.scala b/src/main/scala/gitbucket/core/model/Profile.scala index f35dec9..577c3ee 100644 --- a/src/main/scala/gitbucket/core/model/Profile.scala +++ b/src/main/scala/gitbucket/core/model/Profile.scala @@ -68,5 +68,6 @@ with DeployKeyComponent with ReleaseTagComponent with ReleaseAssetComponent + with AccountExtraMailAddressComponent object Profile extends CoreProfile diff --git a/src/main/scala/gitbucket/core/plugin/IssueHook.scala b/src/main/scala/gitbucket/core/plugin/IssueHook.scala index 12d050a..1b22971 100644 --- a/src/main/scala/gitbucket/core/plugin/IssueHook.scala +++ b/src/main/scala/gitbucket/core/plugin/IssueHook.scala @@ -1,7 +1,7 @@ package gitbucket.core.plugin import gitbucket.core.controller.Context -import gitbucket.core.model.Issue +import gitbucket.core.model.{Account, Issue} import gitbucket.core.service.RepositoryService.RepositoryInfo import gitbucket.core.model.Profile._ import profile.api._ @@ -15,6 +15,19 @@ ): Unit = () def closed(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = () def reopened(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = () + def assigned( + issue: Issue, + repository: RepositoryInfo, + assigner: Option[String], + assigned: Option[String], + oldAssigned: Option[String] + )( + implicit session: Session, + context: Context + ): Unit = () + def closedByCommitComment(issue: Issue, repository: RepositoryInfo, message: String, pusher: Account)( + implicit session: Session + ): Unit = () } diff --git a/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala b/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala index 287a5bc..62acace 100644 --- a/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala +++ b/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala @@ -4,11 +4,11 @@ import java.net.URLClassLoader import java.nio.file.{Files, Paths, StandardWatchEventKinds} import java.util.Base64 -import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.ConcurrentHashMap import javax.servlet.ServletContext +import com.github.zafarkhaja.semver.Version import gitbucket.core.controller.{Context, ControllerBase} import gitbucket.core.model.{Account, Issue} import gitbucket.core.service.ProtectedBranchService.ProtectedBranchReceiveHook @@ -202,7 +202,6 @@ private var watcher: PluginWatchThread = null private var extraWatcher: PluginWatchThread = null - private val initializing = new AtomicBoolean(false) /** * Returns the PluginRegistry singleton instance. @@ -223,30 +222,39 @@ */ def uninstall(pluginId: String, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = synchronized { - instance - .getPlugins() - .collect { case plugin if plugin.pluginId == pluginId => plugin } - .foreach { plugin => -// try { -// plugin.pluginClass.uninstall(instance, context, settings) -// } catch { -// case e: Exception => -// logger.error(s"Error during uninstalling plugin: ${plugin.pluginJar.getName}", e) -// } - shutdown(context, settings) - plugin.pluginJar.delete() - instance = new PluginRegistry() - initialize(context, settings, conn) - } + shutdown(context, settings) + + new File(PluginHome) + .listFiles((_: File, name: String) => { + name.startsWith(s"gitbucket-${pluginId}-plugin") && name.endsWith(".jar") + }) + .foreach(_.delete()) + + instance = new PluginRegistry() + initialize(context, settings, conn) } /** * Install a plugin from a specified jar file. */ - def install(file: File, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit = + def install( + pluginId: String, + url: java.net.URL, + context: ServletContext, + settings: SystemSettings, + conn: java.sql.Connection + ): Unit = synchronized { shutdown(context, settings) - FileUtils.copyFile(file, new File(PluginHome, file.getName)) + + new File(PluginHome) + .listFiles((_: File, name: String) => { + name.startsWith(s"gitbucket-${pluginId}-plugin") && name.endsWith(".jar") + }) + .foreach(_.delete()) + + val in = url.openStream() + FileUtils.copyToFile(in, new File(PluginHome, new File(url.getFile).getName)) instance = new PluginRegistry() initialize(context, settings, conn) } @@ -257,12 +265,27 @@ override def accept(dir: File, name: String): Boolean = name.endsWith(".jar") }) .toSeq - .sortBy(_.getName) + .sortBy(x => Version.valueOf(getPluginVersion(x.getName))) .reverse } lazy val extraPluginDir: Option[String] = Option(System.getProperty("gitbucket.pluginDir")) + def getGitBucketVersion(pluginJarFileName: String): Option[String] = { + val regex = ".+-gitbucket\\_(\\d+\\.\\d+\\.\\d+)-.+".r + pluginJarFileName match { + case regex(x) => Some(x) + case _ => None + } + } + + def getPluginVersion(pluginJarFileName: String): String = { + val regex = ".+-(\\d+\\.\\d+\\.\\d+)\\.jar$".r + pluginJarFileName match { + case regex(x) => x + } + } + /** * Initializes all installed plugins. */ @@ -278,6 +301,7 @@ installedDir.mkdirs() val pluginJars = listPluginJars(pluginDir) + val extraJars = extraPluginDir .map { extraDir => listPluginJars(new File(extraDir)) @@ -288,9 +312,9 @@ val installedJar = new File(installedDir, pluginJar.getName) FileUtils.copyFile(pluginJar, installedJar) - logger.info(s"Initialize ${pluginJar.getName}") - val classLoader = new URLClassLoader(Array(installedJar.toURI.toURL), Thread.currentThread.getContextClassLoader) + val classLoader = + new URLClassLoader(Array(installedJar.toURI.toURL), Thread.currentThread.getContextClassLoader) try { val plugin = classLoader.loadClass("Plugin").getDeclaredConstructor().newInstance().asInstanceOf[Plugin] val pluginId = plugin.pluginId @@ -304,7 +328,12 @@ // Migration val solidbase = new Solidbase() solidbase - .migrate(conn, classLoader, DatabaseConfig.liquiDriver, new Module(plugin.pluginId, plugin.versions: _*)) + .migrate( + conn, + classLoader, + DatabaseConfig.liquiDriver, + new Module(plugin.pluginId, plugin.versions: _*) + ) conn.commit() // Check database version @@ -323,6 +352,7 @@ pluginId = plugin.pluginId, pluginName = plugin.pluginName, pluginVersion = plugin.versions.last.getVersion, + gitbucketVersion = getGitBucketVersion(installedJar.getName), description = plugin.description, pluginClass = plugin, pluginJar = pluginJar, @@ -384,6 +414,7 @@ val pluginId: String, val pluginName: String, val pluginVersion: String, + val gitbucketVersion: Option[String], val description: String ) @@ -391,11 +422,12 @@ override val pluginId: String, override val pluginName: String, override val pluginVersion: String, + override val gitbucketVersion: Option[String], override val description: String, pluginClass: Plugin, pluginJar: File, classLoader: URLClassLoader -) extends PluginInfoBase(pluginId, pluginName, pluginVersion, description) +) extends PluginInfoBase(pluginId, pluginName, pluginVersion, gitbucketVersion, description) class PluginWatchThread(context: ServletContext, dir: String) extends Thread with SystemSettingsService { import gitbucket.core.model.Profile.profile.blockingApi._ diff --git a/src/main/scala/gitbucket/core/plugin/PluginRepository.scala b/src/main/scala/gitbucket/core/plugin/PluginRepository.scala index e3d9d1c..22208ea 100644 --- a/src/main/scala/gitbucket/core/plugin/PluginRepository.scala +++ b/src/main/scala/gitbucket/core/plugin/PluginRepository.scala @@ -1,8 +1,7 @@ package gitbucket.core.plugin import org.json4s._ -import gitbucket.core.util.Directory._ -import org.apache.commons.io.FileUtils +import org.apache.commons.io.IOUtils object PluginRepository { implicit val formats = DefaultFormats @@ -11,13 +10,10 @@ org.json4s.jackson.JsonMethods.parse(json).extract[Seq[PluginMetadata]] } - lazy val LocalRepositoryDir = new java.io.File(PluginHome, ".repository") - lazy val LocalRepositoryIndexFile = new java.io.File(LocalRepositoryDir, "plugins.json") - def getPlugins(): Seq[PluginMetadata] = { - if (LocalRepositoryIndexFile.exists) { - parsePluginJson(FileUtils.readFileToString(LocalRepositoryIndexFile, "UTF-8")) - } else Nil + val url = new java.net.URL("https://plugins.gitbucket-community.org/releases/plugins.json") + val str = IOUtils.toString(url, "UTF-8") + parsePluginJson(str) } } @@ -36,7 +32,5 @@ case class VersionDef( version: String, url: String, - range: String -) { - lazy val file = url.substring(url.lastIndexOf("/") + 1) -} + gitbucketVersion: String +) diff --git a/src/main/scala/gitbucket/core/service/AccessTokenService.scala b/src/main/scala/gitbucket/core/service/AccessTokenService.scala index 102240d..8976ce2 100644 --- a/src/main/scala/gitbucket/core/service/AccessTokenService.scala +++ b/src/main/scala/gitbucket/core/service/AccessTokenService.scala @@ -5,13 +5,13 @@ import gitbucket.core.model.{AccessToken, Account} import gitbucket.core.util.StringUtil -import scala.util.Random +import java.security.SecureRandom trait AccessTokenService { def makeAccessTokenString: String = { val bytes = new Array[Byte](20) - Random.nextBytes(bytes) + AccessTokenService.secureRandom.nextBytes(bytes) bytes.map("%02x".format(_)).mkString } @@ -55,4 +55,6 @@ } -object AccessTokenService extends AccessTokenService +object AccessTokenService extends AccessTokenService { + private val secureRandom = new SecureRandom() +} diff --git a/src/main/scala/gitbucket/core/service/AccountService.scala b/src/main/scala/gitbucket/core/service/AccountService.scala index 65c7ae0..ea851b1 100644 --- a/src/main/scala/gitbucket/core/service/AccountService.scala +++ b/src/main/scala/gitbucket/core/service/AccountService.scala @@ -1,11 +1,11 @@ package gitbucket.core.service import org.slf4j.LoggerFactory -import gitbucket.core.model.{GroupMember, Account} +import gitbucket.core.model.{Account, AccountExtraMailAddress, GroupMember} import gitbucket.core.model.Profile._ import gitbucket.core.model.Profile.profile.blockingApi._ import gitbucket.core.model.Profile.dateColumnType -import gitbucket.core.util.{StringUtil, LDAPUtil} +import gitbucket.core.util.{LDAPUtil, StringUtil} import StringUtil._ import gitbucket.core.service.SystemSettingsService.SystemSettings @@ -33,7 +33,16 @@ * Authenticate by internal database. */ private def defaultAuthentication(userName: String, password: String)(implicit s: Session) = { + val pbkdf2re = """^\$pbkdf2-sha256\$(\d+)\$([0-9a-zA-Z+/=]+)\$([0-9a-zA-Z+/=]+)$""".r getAccountByUserName(userName).collect { + case account if !account.isGroupAccount => + account.password match { + case pbkdf2re(iter, salt, hash) if (pbkdf2_sha256(iter.toInt, salt, password) == hash) => Some(account) + case p if p == sha1(password) => + updateAccount(account.copy(password = pbkdf2_sha256(password))) + Some(account) + case _ => None + } case account if (!account.isGroupAccount && account.password == sha1(password)) => Some(account) } getOrElse None } @@ -121,9 +130,16 @@ def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false)( implicit s: Session ): Option[Account] = - Accounts filter ( - t => (t.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) && (t.removed === false.bind, !includeRemoved) - ) firstOption + (Accounts joinLeft AccountExtraMailAddresses on { case (a, e) => a.userName === e.userName }) + .filter { + case (a, x) => + ((a.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) || + (x.map { e => + e.extraMailAddress.toLowerCase === mailAddress.toLowerCase.bind + } + .getOrElse(false.bind))) && (a.removed === false.bind, !includeRemoved) + } + .map { case (a, e) => a } firstOption def getAllUsers(includeRemoved: Boolean = true, includeGroups: Boolean = true)(implicit s: Session): List[Account] = { Accounts filter { t => @@ -199,6 +215,15 @@ def updateAvatarImage(userName: String, image: Option[String])(implicit s: Session): Unit = Accounts.filter(_.userName === userName.bind).map(_.image.?).update(image) + def getAccountExtraMailAddresses(userName: String)(implicit s: Session): List[String] = { + AccountExtraMailAddresses.filter(_.userName === userName.bind).map(_.extraMailAddress) list + } + + def updateAccountExtraMailAddresses(userName: String, mails: List[String])(implicit s: Session): Unit = { + AccountExtraMailAddresses.filter(_.userName === userName.bind).delete + mails.map(AccountExtraMailAddresses insert AccountExtraMailAddress(userName, _)) + } + def updateLastLoginDate(userName: String)(implicit s: Session): Unit = Accounts.filter(_.userName === userName.bind).map(_.lastLoginDate).update(currentDate) diff --git a/src/main/scala/gitbucket/core/service/CommitsService.scala b/src/main/scala/gitbucket/core/service/CommitsService.scala index c3142c7..8f81b76 100644 --- a/src/main/scala/gitbucket/core/service/CommitsService.scala +++ b/src/main/scala/gitbucket/core/service/CommitsService.scala @@ -1,9 +1,14 @@ package gitbucket.core.service +import java.io.File + import gitbucket.core.model.CommitComment import gitbucket.core.model.Profile._ import gitbucket.core.model.Profile.profile.blockingApi._ import gitbucket.core.model.Profile.dateColumnType +import gitbucket.core.util.Directory._ +import gitbucket.core.util.{FileUtil, StringUtil} +import org.apache.commons.io.FileUtils trait CommitsService { @@ -68,4 +73,48 @@ def deleteCommitComment(commentId: Int)(implicit s: Session) = CommitComments filter (_.byPrimaryKey(commentId)) delete + + def saveCommitCommentDiff( + owner: String, + repository: String, + commitId: String, + fileName: String, + oldLine: Option[Int], + newLine: Option[Int], + diffJson: String + ): Unit = { + val dir = new File(getDiffDir(owner, repository), FileUtil.checkFilename(commitId)) + if (!dir.exists) { + dir.mkdirs() + } + val file = diffFile(dir, fileName, oldLine, newLine) + FileUtils.write(file, diffJson, "UTF-8") + } + + def loadCommitCommentDiff( + owner: String, + repository: String, + commitId: String, + fileName: String, + oldLine: Option[Int], + newLine: Option[Int] + ): Option[String] = { + val dir = new File(getDiffDir(owner, repository), FileUtil.checkFilename(commitId)) + val file = diffFile(dir, fileName, oldLine, newLine) + if (file.exists) { + Option(FileUtils.readFileToString(file, "UTF-8")) + } else None + } + + private def diffFile(dir: java.io.File, fileName: String, oldLine: Option[Int], newLine: Option[Int]): File = { + new File( + dir, + StringUtil.sha1( + fileName + + "_oldLine:" + oldLine.map(_.toString).getOrElse("") + + "_newLine:" + newLine.map(_.toString).getOrElse("") + ) + ) + } + } diff --git a/src/main/scala/gitbucket/core/service/IssuesService.scala b/src/main/scala/gitbucket/core/service/IssuesService.scala index 8f665c6..05255c4 100644 --- a/src/main/scala/gitbucket/core/service/IssuesService.scala +++ b/src/main/scala/gitbucket/core/service/IssuesService.scala @@ -6,20 +6,21 @@ import gitbucket.core.util.SyntaxSugars._ import gitbucket.core.controller.Context import gitbucket.core.model.{ + Account, + CommitState, Issue, - PullRequest, IssueComment, IssueLabel, Label, - Account, + PullRequest, Repository, - CommitState, Role } import gitbucket.core.model.Profile._ import gitbucket.core.model.Profile.profile._ import gitbucket.core.model.Profile.profile.blockingApi._ import gitbucket.core.model.Profile.dateColumnType +import gitbucket.core.plugin.PluginRegistry trait IssuesService { self: AccountService with RepositoryService with LabelsService with PrioritiesService with MilestonesService => @@ -511,20 +512,24 @@ assignedUserName: Option[String], insertComment: Boolean = false )(implicit context: Context, s: Session): Int = { + val oldAssigned = getIssue(owner, repository, s"${issueId}").get.assignedUserName + val assigned = assignedUserName + val assigner = context.loginAccount.map(_.userName) if (insertComment) { - val oldAssigned = getIssue(owner, repository, s"${issueId}").get.assignedUserName.getOrElse("Not assigned") - val assigned = assignedUserName.getOrElse("Not assigned") IssueComments insert IssueComment( userName = owner, repositoryName = repository, issueId = issueId, action = "assign", - commentedUserName = context.loginAccount.map(_.userName).getOrElse("Unknown user"), - content = s"${oldAssigned}:${assigned}", + commentedUserName = assigner.getOrElse("Unknown user"), + content = s"""${oldAssigned.getOrElse("Not assigned")}:${assigned.getOrElse("Not assigned")}""", registeredDate = currentDate, updatedDate = currentDate ) } + for (issue <- getIssue(owner, repository, issueId.toString); repo <- getRepository(owner, repository)) { + PluginRegistry().getIssueHooks.foreach(_.assigned(issue, repo, assigner, assigned, oldAssigned)) + } Issues .filter(_.byPrimaryKey(owner, repository, issueId)) .map(t => (t.assignedUserName ?, t.updatedDate)) @@ -700,11 +705,12 @@ def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String)( implicit s: Session - ): Unit = { - extractCloseId(message).foreach { issueId => - for (issue <- getIssue(owner, repository, issueId) if !issue.closed) { + ): Seq[Int] = { + extractCloseId(message).flatMap { issueId => + for (issue <- getIssue(owner, repository, issueId) if !issue.closed) yield { createComment(owner, repository, userName, issue.issueId, "Close", "close") updateClosed(owner, repository, issue.issueId, true) + issue.issueId } } } diff --git a/src/main/scala/gitbucket/core/service/MergeService.scala b/src/main/scala/gitbucket/core/service/MergeService.scala index 0c907ce..3eab6b3 100644 --- a/src/main/scala/gitbucket/core/service/MergeService.scala +++ b/src/main/scala/gitbucket/core/service/MergeService.scala @@ -196,7 +196,7 @@ refUpdate.setNewObjectId(newObjectId) refUpdate.setForceUpdate(force) refUpdate.setRefLogIdent(committer) - refLogMessage.map(refUpdate.setRefLogMessage(_, true)) + refLogMessage.foreach(refUpdate.setRefLogMessage(_, true)) refUpdate.update() } } diff --git a/src/main/scala/gitbucket/core/service/PullRequestService.scala b/src/main/scala/gitbucket/core/service/PullRequestService.scala index ddcb345..c6cde8e 100644 --- a/src/main/scala/gitbucket/core/service/PullRequestService.scala +++ b/src/main/scala/gitbucket/core/service/PullRequestService.scala @@ -1,6 +1,6 @@ package gitbucket.core.service -import gitbucket.core.model.{Issue, PullRequest, CommitStatus, CommitState, CommitComment} +import gitbucket.core.model.{CommitComments => _, Session => _, _} import gitbucket.core.model.Profile._ import gitbucket.core.model.Profile.profile.blockingApi._ import difflib.{Delta, DiffUtils} @@ -12,6 +12,7 @@ import gitbucket.core.view import gitbucket.core.view.helpers import org.eclipse.jgit.api.Git + import scala.collection.JavaConverters._ trait PullRequestService { self: IssuesService with CommitsService => @@ -115,6 +116,24 @@ .map { case (t1, t2) => t1 } .list + def getPullRequestsByBranch(userName: String, repositoryName: String, branch: String, closed: Option[Boolean])( + implicit s: Session + ): List[PullRequest] = + PullRequests + .join(Issues) + .on { (t1, t2) => + t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) + } + .filter { + case (t1, t2) => + (t1.requestUserName === userName.bind) && + (t1.requestRepositoryName === repositoryName.bind) && + (t1.branch === branch.bind) && + (t2.closed === closed.get.bind, closed.isDefined) + } + .map { case (t1, t2) => t1 } + .list + /** * for repository viewer. * 1. find pull request from `branch` to other branch on same repository @@ -314,11 +333,57 @@ helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime) } + // TODO Isolate to an another method? val diffs = JGitUtil.getDiffs(newGit, Some(oldId.getName), newId.getName, true, false) (commits, diffs) } + def getPullRequestComments(userName: String, repositoryName: String, issueId: Int, commits: Seq[CommitInfo])( + implicit s: Session + ): Seq[Comment] = { + (commits + .map(commit => getCommitComments(userName, repositoryName, commit.id, true)) + .flatten ++ getComments(userName, repositoryName, issueId)) + .groupBy { + case x: IssueComment => (Some(x.commentId), None, None, None) + case x: CommitComment if x.fileName.isEmpty => (Some(x.commentId), None, None, None) + case x: CommitComment => (None, x.fileName, x.oldLine, x.newLine) + case x => throw new MatchError(x) + } + .toSeq + .map { + // Normal comment + case ((Some(_), _, _, _), comments) => + comments.head + // Comment on a specific line of a commit + case ((None, Some(fileName), oldLine, newLine), comments) => + gitbucket.core.model.CommitComments( + fileName = fileName, + commentedUserName = comments.head.commentedUserName, + registeredDate = comments.head.registeredDate, + comments = comments.map(_.asInstanceOf[CommitComment]), + diff = loadCommitCommentDiff( + userName, + repositoryName, + comments.head.asInstanceOf[CommitComment].commitId, + fileName, + oldLine, + newLine + ) + ) + } + .sortWith(_.registeredDate before _.registeredDate) + } + + def markMergeAndClosePullRequest(userName: String, owner: String, repository: String, pull: PullRequest)( + implicit s: Session + ): Unit = { + createComment(owner, repository, userName, pull.issueId, "Merged by user", "merge") + createComment(owner, repository, userName, pull.issueId, "Close", "close") + updateClosed(owner, repository, pull.issueId, true) + } + } object PullRequestService { diff --git a/src/main/scala/gitbucket/core/service/RepositoryService.scala b/src/main/scala/gitbucket/core/service/RepositoryService.scala index f4ab4be..8b15a68 100644 --- a/src/main/scala/gitbucket/core/service/RepositoryService.scala +++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala @@ -67,7 +67,7 @@ getAccountByUserName(newUserName).foreach { account => (Repositories filter { t => t.byRepository(oldUserName, oldRepositoryName) - } firstOption).map { repository => + } firstOption).foreach { repository => Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName) val webHooks = RepositoryWebHooks.filter(_.byRepository(oldUserName, oldRepositoryName)).list @@ -338,7 +338,7 @@ repository.originUserName.getOrElse(repository.userName), repository.originRepositoryName.getOrElse(repository.repositoryName) ), - getRepositoryManagers(repository.userName) + getRepositoryManagers(repository.userName, repository.repositoryName) ) } } @@ -407,7 +407,7 @@ if (withoutPhysicalInfo) { Nil } else { - getRepositoryManagers(repository.userName) + getRepositoryManagers(repository.userName, repository.repositoryName) } ) } @@ -485,18 +485,22 @@ if (withoutPhysicalInfo) { Nil } else { - getRepositoryManagers(repository.userName) + getRepositoryManagers(repository.userName, repository.repositoryName) } ) } } - private def getRepositoryManagers(userName: String)(implicit s: Session): Seq[String] = - if (getAccountByUserName(userName).exists(_.isGroupAccount)) { - getGroupMembers(userName).collect { case x if (x.isManager) => x.userName } - } else { - Seq(userName) - } + /** + * TODO It seems to be able to improve performance. For example, RequestCache can be used for getAccountByUserName call. + */ + private def getRepositoryManagers(userName: String, repositoryName: String)(implicit s: Session): Seq[String] = { + (if (getAccountByUserName(userName).exists(_.isGroupAccount)) { + getGroupMembers(userName).collect { case x if (x.isManager) => x.userName } + } else { + Seq(userName) + }) ++ getCollaboratorUserNames(userName, repositoryName, Seq(Role.ADMIN)) + } /** * Updates the last activity date of the repository. @@ -769,7 +773,7 @@ def httpUrl(owner: String, name: String)(implicit context: Context): String = s"${context.baseUrl}/git/${owner}/${name}.git" def sshUrl(owner: String, name: String)(implicit context: Context): Option[String] = - if (context.settings.ssh) { + if (context.settings.ssh.enabled) { context.settings.sshAddress.map { x => s"ssh://${x.genericUser}@${x.host}:${x.port}/${owner}/${name}.git" } diff --git a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala index 4141822..e424762 100644 --- a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala +++ b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala @@ -23,9 +23,9 @@ props.setProperty(Gravatar, settings.gravatar.toString) props.setProperty(Notification, settings.notification.toString) settings.activityLogLimit.foreach(x => props.setProperty(ActivityLogLimit, x.toString)) - props.setProperty(Ssh, settings.ssh.toString) - settings.sshHost.foreach(x => props.setProperty(SshHost, x.trim)) - settings.sshPort.foreach(x => props.setProperty(SshPort, x.toString)) + props.setProperty(SshEnabled, settings.ssh.enabled.toString) + settings.ssh.sshHost.foreach(x => props.setProperty(SshHost, x.trim)) + settings.ssh.sshPort.foreach(x => props.setProperty(SshPort, x.toString)) props.setProperty(UseSMTP, settings.useSMTP.toString) if (settings.useSMTP) { settings.smtp.foreach { smtp => @@ -41,7 +41,7 @@ } props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString) if (settings.ldapAuthentication) { - settings.ldap.map { ldap => + settings.ldap.foreach { ldap => props.setProperty(LdapHost, ldap.host) ldap.port.foreach(x => props.setProperty(LdapPort, x.toString)) ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x)) @@ -58,16 +58,19 @@ } props.setProperty(OidcAuthentication, settings.oidcAuthentication.toString) if (settings.oidcAuthentication) { - settings.oidc.map { oidc => + settings.oidc.foreach { oidc => props.setProperty(OidcIssuer, oidc.issuer.getValue) props.setProperty(OidcClientId, oidc.clientID.getValue) props.setProperty(OidcClientSecret, oidc.clientSecret.getValue) - oidc.jwsAlgorithm.map { x => + oidc.jwsAlgorithm.foreach { x => props.setProperty(OidcJwsAlgorithm, x.getName) } } } props.setProperty(SkinName, settings.skinName.toString) + props.setProperty(ShowMailAddress, settings.showMailAddress.toString) + props.setProperty(PluginNetworkInstall, settings.pluginNetworkInstall.toString) + using(new java.io.FileOutputStream(GitBucketConf)) { out => props.store(out, null) } @@ -90,9 +93,11 @@ getValue(props, Gravatar, false), getValue(props, Notification, false), getOptionValue[Int](props, ActivityLogLimit, None), - getValue(props, Ssh, false), - getOptionValue[String](props, SshHost, None).map(_.trim), - getOptionValue(props, SshPort, Some(DefaultSshPort)), + Ssh( + getValue(props, SshEnabled, false), + getOptionValue[String](props, SshHost, None).map(_.trim), + getOptionValue(props, SshPort, Some(DefaultSshPort)) + ), getValue(props, UseSMTP, getValue(props, Notification, false)), // handle migration scenario from only notification to useSMTP if (getValue(props, UseSMTP, getValue(props, Notification, false))) { Some( @@ -144,7 +149,9 @@ } else { None }, - getValue(props, SkinName, "skin-blue") + getValue(props, SkinName, "skin-blue"), + getValue(props, ShowMailAddress, false), + getValue(props, PluginNetworkInstall, false) ) } } @@ -165,16 +172,16 @@ gravatar: Boolean, notification: Boolean, activityLogLimit: Option[Int], - ssh: Boolean, - sshHost: Option[String], - sshPort: Option[Int], + ssh: Ssh, useSMTP: Boolean, smtp: Option[Smtp], ldapAuthentication: Boolean, ldap: Option[Ldap], oidcAuthentication: Boolean, oidc: Option[OIDC], - skinName: String + skinName: String, + showMailAddress: Boolean, + pluginNetworkInstall: Boolean ) { def baseUrl(request: HttpServletRequest): String = @@ -193,12 +200,18 @@ .fold(base)(_ + base.dropWhile(_ != ':')) } - def sshAddress: Option[SshAddress] = sshHost.collect { - case host if ssh => - SshAddress(host, sshPort.getOrElse(DefaultSshPort), "git") + def sshAddress: Option[SshAddress] = ssh.sshHost.collect { + case host if ssh.enabled => + SshAddress(host, ssh.sshPort.getOrElse(DefaultSshPort), "git") } } + case class Ssh( + enabled: Boolean, + sshHost: Option[String], + sshPort: Option[Int] + ) + case class Ldap( host: String, port: Option[Int], @@ -252,7 +265,7 @@ private val Gravatar = "gravatar" private val Notification = "notification" private val ActivityLogLimit = "activity_log_limit" - private val Ssh = "ssh" + private val SshEnabled = "ssh" private val SshHost = "ssh.host" private val SshPort = "ssh.port" private val UseSMTP = "useSMTP" @@ -283,6 +296,8 @@ private val OidcClientSecret = "oidc.client_secret" private val OidcJwsAlgorithm = "oidc.jws_algorithm" private val SkinName = "skinName" + private val ShowMailAddress = "showMailAddress" + private val PluginNetworkInstall = "plugin.networkInstall" private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = { getSystemProperty(key).getOrElse(getEnvironmentVariable(key).getOrElse { diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala index 0a8d956..722bf5d 100644 --- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala @@ -296,13 +296,34 @@ createIssueComment(owner, repository, commit) // close issues if (refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE) { - closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository) + getAccountByUserName(pusher).foreach { pusherAccount => + closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository).foreach { issueId => + getIssue(owner, repository, issueId.toString).foreach { issue => + callIssuesWebHook("closed", repositoryInfo, issue, baseUrl, pusherAccount) + PluginRegistry().getIssueHooks + .foreach(_.closedByCommitComment(issue, repositoryInfo, commit.fullMessage, pusherAccount)) + } + } + } } } Some(commit) } else None } + // set PR as merged + val pulls = getPullRequestsByBranch(owner, repository, branchName, Some(false)) + pulls.foreach { pull => + if (commits.find { c => + c.id == pull.commitIdTo + }.isDefined) { + markMergeAndClosePullRequest(pusher, owner, repository, pull) + getAccountByUserName(pusher).foreach { pusherAccount => + callPullRequestWebHook("closed", repositoryInfo, pull.issueId, baseUrl, pusherAccount) + } + } + } + // record activity if (refName(1) == "heads") { command.getType match { @@ -326,7 +347,7 @@ case ReceiveCommand.Type.CREATE | ReceiveCommand.Type.UPDATE | ReceiveCommand.Type.UPDATE_NONFASTFORWARD => updatePullRequests(owner, repository, branchName) - getAccountByUserName(pusher).map { pusherAccount => + getAccountByUserName(pusher).foreach { pusherAccount => callPullRequestWebHookByRequestBranch( "synchronize", repositoryInfo, @@ -418,7 +439,7 @@ } } - commitIds.map { + commitIds.foreach { case (oldCommitId, newCommitId) => val commits = using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git => JGitUtil.getCommitLog(git, oldCommitId, newCommitId).flatMap { commit => diff --git a/src/main/scala/gitbucket/core/servlet/InitializeListener.scala b/src/main/scala/gitbucket/core/servlet/InitializeListener.scala index 326608b..74c043c 100644 --- a/src/main/scala/gitbucket/core/servlet/InitializeListener.scala +++ b/src/main/scala/gitbucket/core/servlet/InitializeListener.scala @@ -5,7 +5,7 @@ import akka.event.Logging import com.typesafe.config.ConfigFactory import gitbucket.core.GitBucketCoreModule -import gitbucket.core.plugin.{PluginRegistry, PluginRepository} +import gitbucket.core.plugin.PluginRegistry import gitbucket.core.service.{ActivityService, SystemSettingsService} import gitbucket.core.util.DatabaseConfig import gitbucket.core.util.Directory._ @@ -20,7 +20,6 @@ import org.slf4j.LoggerFactory import akka.actor.{Actor, ActorSystem, Props} import com.typesafe.akka.extension.quartz.QuartzSchedulerExtension -import com.github.zafarkhaja.semver.{Version => Semver} import scala.collection.JavaConverters._ @@ -136,40 +135,30 @@ } private def extractBundledPlugins(gitbucketVersion: String): Unit = { - logger.info("Extract bundled plugins") + logger.info("Extract bundled plugins...") val cl = Thread.currentThread.getContextClassLoader try { - using(cl.getResourceAsStream("plugins/plugins.json")) { pluginsFile => + using(cl.getResourceAsStream("bundle-plugins.txt")) { pluginsFile => if (pluginsFile != null) { - val pluginsJson = IOUtils.toString(pluginsFile, "UTF-8") + val plugins = IOUtils.readLines(pluginsFile, "UTF-8") + val gitbucketVersion = GitBucketCoreModule.getVersions.asScala.last.getVersion - FileUtils.forceMkdir(PluginRepository.LocalRepositoryDir) - FileUtils.write(PluginRepository.LocalRepositoryIndexFile, pluginsJson, "UTF-8") + plugins.asScala.foreach { plugin => + plugin.trim.split(":") match { + case Array(pluginId, pluginVersion) => + val fileName = s"gitbucket-${pluginId}-plugin-gitbucket_${gitbucketVersion}-${pluginVersion}.jar" + val in = cl.getResourceAsStream("plugins/" + fileName) + if (in != null) { + val file = new File(PluginHome, fileName) + logger.info(s"Extract to ${file.getAbsolutePath}") - val plugins = PluginRepository.parsePluginJson(pluginsJson) - plugins.foreach { plugin => - plugin.versions - .sortBy { x => - Semver.valueOf(x.version) - } - .reverse - .zipWithIndex - .foreach { - case (version, i) => - val file = new File(PluginRepository.LocalRepositoryDir, version.file) - if (!file.exists) { - logger.info(s"Copy ${plugin} to ${file.getAbsolutePath}") - FileUtils.forceMkdirParent(file) - using(cl.getResourceAsStream("plugins/" + version.file), new FileOutputStream(file)) { - case (in, out) => IOUtils.copy(in, out) - } - - if (plugin.default && i == 0) { - logger.info(s"Enable ${file.getName} in default") - FileUtils.copyFile(file, new File(PluginHome, version.file)) - } + FileUtils.forceMkdirParent(file) + using(in, new FileOutputStream(file)) { + case (in, out) => IOUtils.copy(in, out) } - } + } + case _ => () + } } } } diff --git a/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala b/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala index 016d2ea..3e891af 100644 --- a/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala +++ b/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala @@ -26,7 +26,7 @@ try { val bytes = IOUtils.toByteArray(in) resp.setContentLength(bytes.length) - resp.setContentType(FileUtil.getContentType(path, bytes)) + resp.setContentType(FileUtil.getMimeType(path, bytes)) resp.setHeader("Cache-Control", "max-age=3600") resp.getOutputStream.write(bytes) } finally { diff --git a/src/main/scala/gitbucket/core/util/Authenticator.scala b/src/main/scala/gitbucket/core/util/Authenticator.scala index c555ec4..7dd8fd5 100644 --- a/src/main/scala/gitbucket/core/util/Authenticator.scala +++ b/src/main/scala/gitbucket/core/util/Authenticator.scala @@ -15,14 +15,10 @@ protected def oneselfOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) } private def authenticate(action: => Any) = { - { - defining(request.paths) { paths => - context.loginAccount match { - case Some(x) if (x.isAdmin) => action - case Some(x) if (paths(0) == x.userName) => action - case _ => Unauthorized() - } - } + context.loginAccount match { + case Some(x) if (x.isAdmin) => action + case Some(x) if (request.paths(0) == x.userName) => action + case _ => Unauthorized() } } } @@ -35,24 +31,22 @@ protected def ownerOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) } private def authenticate(action: (RepositoryInfo) => Any) = { - { - defining(request.paths) { paths => - getRepository(paths(0), paths(1)).map { repository => - context.loginAccount match { - case Some(x) if (x.isAdmin) => action(repository) - case Some(x) if (repository.owner == x.userName) => action(repository) - // TODO Repository management is allowed for only group managers? - case Some(x) if (getGroupMembers(repository.owner).exists { m => - m.userName == x.userName && m.isManager == true - }) => - action(repository) - case Some(x) if (getCollaboratorUserNames(paths(0), paths(1), Seq(Role.ADMIN)).contains(x.userName)) => - action(repository) - case _ => Unauthorized() - } - } getOrElse NotFound() + val userName = params("owner") + val repoName = params("repository") + getRepository(userName, repoName).map { repository => + context.loginAccount match { + case Some(x) if (x.isAdmin) => action(repository) + case Some(x) if (repository.owner == x.userName) => action(repository) + // TODO Repository management is allowed for only group managers? + case Some(x) if (getGroupMembers(repository.owner).exists { m => + m.userName == x.userName && m.isManager == true + }) => + action(repository) + case Some(x) if (getCollaboratorUserNames(userName, repoName, Seq(Role.ADMIN)).contains(x.userName)) => + action(repository) + case _ => Unauthorized() } - } + } getOrElse NotFound() } } @@ -64,11 +58,9 @@ protected def usersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) } private def authenticate(action: => Any) = { - { - context.loginAccount match { - case Some(x) => action - case None => Unauthorized() - } + context.loginAccount match { + case Some(x) => action + case None => Unauthorized() } } } @@ -81,11 +73,9 @@ protected def adminOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) } private def authenticate(action: => Any) = { - { - context.loginAccount match { - case Some(x) if (x.isAdmin) => action - case _ => Unauthorized() - } + context.loginAccount match { + case Some(x) if (x.isAdmin) => action + case _ => Unauthorized() } } } @@ -98,17 +88,15 @@ protected def referrersOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) } private def authenticate(action: (RepositoryInfo) => Any) = { - { - defining(request.paths) { paths => - getRepository(paths(0), paths(1)).map { repository => - if (isReadable(repository.repository, context.loginAccount)) { - action(repository) - } else { - Unauthorized() - } - } getOrElse NotFound() + val userName = params("owner") + val repoName = params("repository") + getRepository(userName, repoName).map { repository => + if (isReadable(repository.repository, context.loginAccount)) { + action(repository) + } else { + Unauthorized() } - } + } getOrElse NotFound() } } @@ -122,20 +110,18 @@ } private def authenticate(action: (RepositoryInfo) => Any) = { - { - defining(request.paths) { paths => - getRepository(paths(0), paths(1)).map { repository => - context.loginAccount match { - case Some(x) if (x.isAdmin) => action(repository) - case Some(x) if (!repository.repository.isPrivate) => action(repository) - case Some(x) if (paths(0) == x.userName) => action(repository) - case Some(x) if (getGroupMembers(repository.owner).exists(_.userName == x.userName)) => action(repository) - case Some(x) if (getCollaboratorUserNames(paths(0), paths(1)).contains(x.userName)) => action(repository) - case _ => Unauthorized() - } - } getOrElse NotFound() + val userName = params("owner") + val repoName = params("repository") + getRepository(userName, repoName).map { repository => + context.loginAccount match { + case Some(x) if (x.isAdmin) => action(repository) + case Some(x) if (!repository.repository.isPrivate) => action(repository) + case Some(x) if (userName == x.userName) => action(repository) + case Some(x) if (getGroupMembers(repository.owner).exists(_.userName == x.userName)) => action(repository) + case Some(x) if (getCollaboratorUserNames(userName, repoName).contains(x.userName)) => action(repository) + case _ => Unauthorized() } - } + } getOrElse NotFound() } } @@ -149,22 +135,20 @@ } private def authenticate(action: (RepositoryInfo) => Any) = { - { - defining(request.paths) { paths => - getRepository(paths(0), paths(1)).map { repository => - context.loginAccount match { - case Some(x) if (x.isAdmin) => action(repository) - case Some(x) if (paths(0) == x.userName) => action(repository) - case Some(x) if (getGroupMembers(repository.owner).exists(_.userName == x.userName)) => action(repository) - case Some(x) - if (getCollaboratorUserNames(paths(0), paths(1), Seq(Role.ADMIN, Role.DEVELOPER)) - .contains(x.userName)) => - action(repository) - case _ => Unauthorized() - } - } getOrElse NotFound() + val userName = params("owner") + val repoName = params("repository") + getRepository(userName, repoName).map { repository => + context.loginAccount match { + case Some(x) if (x.isAdmin) => action(repository) + case Some(x) if (userName == x.userName) => action(repository) + case Some(x) if (getGroupMembers(repository.owner).exists(_.userName == x.userName)) => action(repository) + case Some(x) + if (getCollaboratorUserNames(userName, repoName, Seq(Role.ADMIN, Role.DEVELOPER)) + .contains(x.userName)) => + action(repository) + case _ => Unauthorized() } - } + } getOrElse NotFound() } } @@ -176,16 +160,12 @@ protected def managersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) } private def authenticate(action: => Any) = { - { - defining(request.paths) { paths => - context.loginAccount match { - case Some(x) if (getGroupMembers(paths(0)).exists { member => - member.userName == x.userName && member.isManager - }) => - action - case _ => Unauthorized() - } - } + context.loginAccount match { + case Some(x) if (getGroupMembers(request.paths(0)).exists { member => + member.userName == x.userName && member.isManager + }) => + action + case _ => Unauthorized() } } } diff --git a/src/main/scala/gitbucket/core/util/Directory.scala b/src/main/scala/gitbucket/core/util/Directory.scala index 6e8a0b8..416b7a5 100644 --- a/src/main/scala/gitbucket/core/util/Directory.scala +++ b/src/main/scala/gitbucket/core/util/Directory.scala @@ -68,6 +68,12 @@ new File(getRepositoryFilesDir(owner, repository), "lfs") /** + * Directory for files which store diff fragment + */ + def getDiffDir(owner: String, repository: String): File = + new File(getRepositoryFilesDir(owner, repository), "diff") + + /** * Directory for uploaded files by the specified user. */ def getUserUploadDir(userName: String): File = diff --git a/src/main/scala/gitbucket/core/util/FileUtil.scala b/src/main/scala/gitbucket/core/util/FileUtil.scala index d399f77..ab42edd 100644 --- a/src/main/scala/gitbucket/core/util/FileUtil.scala +++ b/src/main/scala/gitbucket/core/util/FileUtil.scala @@ -16,7 +16,7 @@ } } - def getContentType(name: String, bytes: Array[Byte]): String = { + def getMimeType(name: String, bytes: Array[Byte]): String = { defining(getMimeType(name)) { mimeType => if (mimeType == "application/octet-stream" && isText(bytes)) { "text/plain" @@ -26,6 +26,10 @@ } } + def getSafeMimeType(name: String): String = { + getMimeType(name).replace("text/html", "text/plain") + } + def isImage(name: String): Boolean = getMimeType(name).startsWith("image/") def isLarge(size: Long): Boolean = (size > 1024 * 1000) @@ -52,7 +56,7 @@ } def getLfsFilePath(owner: String, repository: String, oid: String): String = - Directory.getLfsDir(owner, repository) + "/" + oid + Directory.getLfsDir(owner, repository) + "/" + checkFilename(oid) def readableSize(size: Long): String = FileUtils.byteCountToDisplaySize(size) @@ -76,6 +80,16 @@ file } + /** + * Create an instance of java.io.File safely. + */ + def checkFilename(name: String): String = { + if (name.contains("..")) { + throw new IllegalArgumentException(s"Invalid file name: ${name}") + } + name + } + lazy val MaxFileSize = if (System.getProperty("gitbucket.maxFileSize") != null) System.getProperty("gitbucket.maxFileSize").toLong diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala index bb33431..0381fdb 100644 --- a/src/main/scala/gitbucket/core/util/JGitUtil.scala +++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala @@ -1,6 +1,6 @@ package gitbucket.core.util -import java.io.ByteArrayOutputStream +import java.io.{ByteArrayOutputStream, File, FileInputStream, InputStream} import gitbucket.core.service.RepositoryService import org.eclipse.jgit.api.Git @@ -390,7 +390,7 @@ lazy val newParentsMap = newCommit.getParents.map(_ -> newCommit).toMap useTreeWalk(newCommit) { walk => while (walk.next) { - rest.remove(walk.getNameString -> walk.getObjectId(0)).map { + rest.remove(walk.getNameString -> walk.getObjectId(0)).foreach { case (tuple, _) => if (newParentsMap.isEmpty) { nextResult +:= tupleAdd(tuple, newCommit) @@ -400,7 +400,7 @@ } } } - rest.values.map { + rest.values.foreach { case (tuple, parentsMap) => val restParentsMap = parentsMap - newCommit if (restParentsMap.isEmpty) { @@ -761,7 +761,27 @@ } /** - * Returns the list of tags of the specified commit. + * Returns the list of tags which pointed on the specified commit. + */ + def getTagsOnCommit(git: Git, commitId: String): List[String] = { + git.getRepository.getAllRefsByPeeledObjectId.asScala + .get(git.getRepository.resolve(commitId + "^0")) + .map { + _.asScala + .collect { + case x if x.getName.startsWith(Constants.R_TAGS) => + x.getName.substring(Constants.R_TAGS.length) + } + .toList + .sorted + } + .getOrElse { + List.empty + } + } + + /** + * Returns the list of tags which contains the specified commit. */ def getTagsOfCommit(git: Git, commitId: String): List[String] = using(new RevWalk(git.getRepository)) { revWalk => @@ -1200,4 +1220,61 @@ Option(git.getRepository.resolve(revstr)).map(ObjectId.toString(_)) } } + + def getFileSize(git: Git, repository: RepositoryService.RepositoryInfo, treeWalk: TreeWalk): Long = { + val attrs = treeWalk.getAttributes + val loader = git.getRepository.open(treeWalk.getObjectId(0)) + if (attrs.containsKey("filter") && attrs.get("filter").getValue == "lfs") { + val lfsAttrs = getLfsAttributes(loader) + lfsAttrs.get("size").map(_.toLong).get + } else { + loader.getSize + } + } + + def getFileSize(git: Git, repository: RepositoryService.RepositoryInfo, tree: RevTree, path: String): Long = { + using(TreeWalk.forPath(git.getRepository, path, tree)) { treeWalk => + getFileSize(git, repository, treeWalk) + } + } + + def openFile[T](git: Git, repository: RepositoryService.RepositoryInfo, treeWalk: TreeWalk)( + f: InputStream => T + ): T = { + val attrs = treeWalk.getAttributes + val loader = git.getRepository.open(treeWalk.getObjectId(0)) + if (attrs.containsKey("filter") && attrs.get("filter").getValue == "lfs") { + val lfsAttrs = getLfsAttributes(loader) + if (lfsAttrs.nonEmpty) { + val oid = lfsAttrs("oid").split(":")(1) + + val file = new File(FileUtil.getLfsFilePath(repository.owner, repository.name, oid)) + using(new FileInputStream(FileUtil.getLfsFilePath(repository.owner, repository.name, oid))) { in => + f(in) + } + } else { + throw new NoSuchElementException("LFS attribute is empty.") + } + } else { + using(loader.openStream()) { in => + f(in) + } + } + } + + def openFile[T](git: Git, repository: RepositoryService.RepositoryInfo, tree: RevTree, path: String)( + f: InputStream => T + ): T = { + using(TreeWalk.forPath(git.getRepository, path, tree)) { treeWalk => + openFile(git, repository, treeWalk)(f) + } + } + + private def getLfsAttributes(loader: ObjectLoader): Map[String, String] = { + val bytes = loader.getCachedBytes + val text = new String(bytes, "UTF-8") + + JGitUtil.getLfsObjects(text) + } + } diff --git a/src/main/scala/gitbucket/core/util/StringUtil.scala b/src/main/scala/gitbucket/core/util/StringUtil.scala index f61c898..b470eeb 100644 --- a/src/main/scala/gitbucket/core/util/StringUtil.scala +++ b/src/main/scala/gitbucket/core/util/StringUtil.scala @@ -1,10 +1,13 @@ package gitbucket.core.util import java.net.{URLDecoder, URLEncoder} -import java.util.Base64 +import java.security.SecureRandom +import java.util.{Base64, UUID} import org.mozilla.universalchardet.UniversalDetector import SyntaxSugars._ +import javax.crypto.SecretKeyFactory +import javax.crypto.spec.PBEKeySpec import org.apache.commons.io.input.BOMInputStream import org.apache.commons.io.IOUtils @@ -13,9 +16,33 @@ object StringUtil { private lazy val BlowfishKey = { - // last 4 numbers in current timestamp - val time = System.currentTimeMillis.toString - time.substring(time.length - 4) + UUID.randomUUID().toString.substring(0, 16) + } + + def base64Encode(value: Array[Byte]): String = { + Base64.getEncoder.encodeToString(value) + } + + def base64Decode(value: String): Array[Byte] = { + Base64.getDecoder.decode(value) + } + + def pbkdf2_sha256(iter: Int, salt: String, value: String): String = { + val keyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256") + val ks = new PBEKeySpec(value.toCharArray, base64Decode(salt), iter, 256) + val s = keyFactory.generateSecret(ks) + base64Encode(s.getEncoded) + } + + def pbkdf2_sha256(value: String) = { + val keyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256") + val secureRandom = new SecureRandom + val salt: Array[Byte] = new Array(32) + secureRandom.nextBytes(salt) + val iter = 100000 + val ks = new PBEKeySpec(value.toCharArray, salt, iter, 256) + val s = keyFactory.generateSecret(ks) + s"""$$pbkdf2-sha256$$${iter}$$${base64Encode(salt)}$$${base64Encode(s.getEncoded)}""" } def sha1(value: String): String = diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala index c5f1a40..4e757c7 100644 --- a/src/main/scala/gitbucket/core/view/helpers.scala +++ b/src/main/scala/gitbucket/core/view/helpers.scala @@ -3,6 +3,7 @@ import java.text.SimpleDateFormat import java.util.{Date, Locale, TimeZone} +import com.nimbusds.jose.util.JSONObjectUtils import gitbucket.core.controller.Context import gitbucket.core.model.CommitState import gitbucket.core.plugin.{PluginRegistry, RenderRequest} @@ -249,12 +250,12 @@ * Generates the url to the repository. */ def url(repository: RepositoryService.RepositoryInfo)(implicit context: Context): String = - s"${context.path}/${repository.owner}/${repository.name}" + s"${context.path}/${encodeRefName(repository.owner)}/${encodeRefName(repository.name)}" /** * Generates the url to the account page. */ - def url(userName: String)(implicit context: Context): String = s"${context.path}/${userName}" + def url(userName: String)(implicit context: Context): String = s"${context.path}/${encodeRefName(userName)}" /** * Returns the url to the root of assets. @@ -272,7 +273,7 @@ * If user does not exist or disabled, this method returns user name as text without link. */ def user(userName: String, mailAddress: String = "", styleClass: String = "")(implicit context: Context): Html = - userWithContent(userName, mailAddress, styleClass)(Html(userName)) + userWithContent(userName, mailAddress, styleClass)(Html(StringUtil.escapeHtml(userName))) /** * Generates the avatar link to the account page. @@ -315,44 +316,6 @@ */ def isPast(date: Date): Boolean = System.currentTimeMillis > date.getTime - /** - * Returns file type for AceEditor. - */ - def editorType(fileName: String): String = { - fileName.toLowerCase match { - case x if (x.endsWith(".bat")) => "batchfile" - case x if (x.endsWith(".java")) => "java" - case x if (x.endsWith(".scala")) => "scala" - case x if (x.endsWith(".js")) => "javascript" - case x if (x.endsWith(".css")) => "css" - case x if (x.endsWith(".md")) => "markdown" - case x if (x.endsWith(".html")) => "html" - case x if (x.endsWith(".xml")) => "xml" - case x if (x.endsWith(".c")) => "c_cpp" - case x if (x.endsWith(".cpp")) => "c_cpp" - case x if (x.endsWith(".coffee")) => "coffee" - case x if (x.endsWith(".ejs")) => "ejs" - case x if (x.endsWith(".hs")) => "haskell" - case x if (x.endsWith(".json")) => "json" - case x if (x.endsWith(".jsp")) => "jsp" - case x if (x.endsWith(".jsx")) => "jsx" - case x if (x.endsWith(".cl")) => "lisp" - case x if (x.endsWith(".clojure")) => "lisp" - case x if (x.endsWith(".lua")) => "lua" - case x if (x.endsWith(".php")) => "php" - case x if (x.endsWith(".py")) => "python" - case x if (x.endsWith(".rdoc")) => "rdoc" - case x if (x.endsWith(".rhtml")) => "rhtml" - case x if (x.endsWith(".ruby")) => "ruby" - case x if (x.endsWith(".sh")) => "sh" - case x if (x.endsWith(".sql")) => "sql" - case x if (x.endsWith(".tcl")) => "tcl" - case x if (x.endsWith(".vbs")) => "vbscript" - case x if (x.endsWith(".yml")) => "yaml" - case _ => "plain_text" - } - } - def pre(value: Html): Html = Html(s"
${value.body.trim.split("\n").map(_.trim).mkString("\n")}
") /** @@ -462,4 +425,44 @@ */ def readableSize(size: Option[Long]): String = FileUtil.readableSize(size.getOrElse(0)) + /** + * Make HTML fragment of the partial diff for a comment on a line of diff. + * + * @param jsonString JSON string which is stored in COMMIT_COMMENT table. + * @return HTML fragment of diff + */ + def diff(jsonString: String): Html = { + import org.json4s._ + import org.json4s.jackson.JsonMethods._ + implicit val formats = DefaultFormats + + val diff = parse(jsonString).extract[Seq[CommentDiffLine]] + + val sb = new StringBuilder() + sb.append("") + diff.foreach { line => + sb.append("") + sb.append(s"""") + sb.append(s"""") + + sb.append(s"""") + sb.append("") + } + sb.append("
""") + line.oldLine.foreach { oldLine => + sb.append(oldLine) + } + sb.append("""") + line.newLine.foreach { newLine => + sb.append(newLine) + } + sb.append("""") + sb.append(StringUtil.escapeHtml(line.text)) + sb.append("
") + + Html(sb.toString()) + } + + case class CommentDiffLine(newLine: Option[String], oldLine: Option[String], `type`: String, text: String) + } diff --git a/src/main/twirl/gitbucket/core/account/activity.scala.html b/src/main/twirl/gitbucket/core/account/activity.scala.html index e3b1307..f0d2cdc 100644 --- a/src/main/twirl/gitbucket/core/account/activity.scala.html +++ b/src/main/twirl/gitbucket/core/account/activity.scala.html @@ -1,8 +1,9 @@ @(account: gitbucket.core.model.Account, groupNames: List[String], - activities: List[gitbucket.core.model.Activity])(implicit context: gitbucket.core.controller.Context) + activities: List[gitbucket.core.model.Activity], + extraMailAddresses: List[String])(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers -@gitbucket.core.account.html.main(account, groupNames, "activity"){ +@gitbucket.core.account.html.main(account, groupNames, "activity", extraMailAddresses){
activities
diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html index 398c173..25c3dc0 100644 --- a/src/main/twirl/gitbucket/core/account/edit.scala.html +++ b/src/main/twirl/gitbucket/core/account/edit.scala.html @@ -1,4 +1,4 @@ -@(account: gitbucket.core.model.Account, info: Option[Any], error: Option[Any])(implicit context: gitbucket.core.controller.Context) +@(account: gitbucket.core.model.Account, extraMailAddresses: List[String], info: Option[Any], error: Option[Any])(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.util.LDAPUtil @import gitbucket.core.view.helpers @gitbucket.core.html.main("Edit your profile"){ @@ -31,6 +31,13 @@ +
+ Additional Mail Address: + @extraMailAddresses.zipWithIndex.map { case (mail, idx) => + + + } +
@@ -62,6 +69,8 @@ } } diff --git a/src/main/twirl/gitbucket/core/account/repositories.scala.html b/src/main/twirl/gitbucket/core/account/repositories.scala.html index b4c7acf..1d074f9 100644 --- a/src/main/twirl/gitbucket/core/account/repositories.scala.html +++ b/src/main/twirl/gitbucket/core/account/repositories.scala.html @@ -1,8 +1,9 @@ @(account: gitbucket.core.model.Account, groupNames: List[String], repositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo], + extraMailAddresses: List[String], isGroupManager: Boolean)(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers -@gitbucket.core.account.html.main(account, groupNames, "repositories", isGroupManager){ +@gitbucket.core.account.html.main(account, groupNames, "repositories", extraMailAddresses, isGroupManager){ @if(repositories.isEmpty){ No repositories } else { diff --git a/src/main/twirl/gitbucket/core/admin/plugins.scala.html b/src/main/twirl/gitbucket/core/admin/plugins.scala.html index db8f498..f95ad25 100644 --- a/src/main/twirl/gitbucket/core/admin/plugins.scala.html +++ b/src/main/twirl/gitbucket/core/admin/plugins.scala.html @@ -1,30 +1,36 @@ -@(plugins: List[(gitbucket.core.plugin.PluginInfoBase, Boolean)], info: Option[Any])(implicit context: gitbucket.core.controller.Context) +@(plugins: List[(gitbucket.core.plugin.PluginInfoBase, Boolean, String)], info: Option[Any])(implicit context: gitbucket.core.controller.Context) @gitbucket.core.html.main("Plugins"){ @gitbucket.core.admin.html.menu("plugins") { @gitbucket.core.helper.html.information(info)
+ +

Plugins

@if(plugins.size > 0) { - @plugins.map { case (plugin, enabled) => + @plugins.map { case (plugin, enabled, updatableVersion) =>
- @if(enabled){ -
- -
- } else { -
- -
- } +
+ @if(enabled){ + @if(updatableVersion.nonEmpty){ + + } + + } else { + + } +
@plugin.pluginName
@@ -54,14 +60,19 @@ } diff --git a/src/main/twirl/gitbucket/core/admin/settings_system.scala.html b/src/main/twirl/gitbucket/core/admin/settings_system.scala.html index 7d787fa..1c30de4 100644 --- a/src/main/twirl/gitbucket/core/admin/settings_system.scala.html +++ b/src/main/twirl/gitbucket/core/admin/settings_system.scala.html @@ -9,6 +9,10 @@ Value + GITBUCKET_VERSION + @gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion + + GITBUCKET_HOME @gitbucket.core.util.Directory.GitBucketHome @@ -132,6 +136,21 @@
+ + +
+ +
+ + +
+
@@ -163,7 +182,7 @@
@@ -172,15 +191,15 @@
- - + +
- - + +
@@ -310,7 +329,7 @@ } }); - $('#ssh').change(function(){ + $('#sshEnabled').change(function(){ $('.ssh input').prop('disabled', !$(this).prop('checked')); }).change(); diff --git a/src/main/twirl/gitbucket/core/admin/user.scala.html b/src/main/twirl/gitbucket/core/admin/user.scala.html index 7603415..ae791bb 100644 --- a/src/main/twirl/gitbucket/core/admin/user.scala.html +++ b/src/main/twirl/gitbucket/core/admin/user.scala.html @@ -1,4 +1,4 @@ -@(account: Option[gitbucket.core.model.Account], error: Option[Any] = None)(implicit context: gitbucket.core.controller.Context) +@(account: Option[gitbucket.core.model.Account], extraMailAddresses: List[String], error: Option[Any] = None)(implicit context: gitbucket.core.controller.Context) @gitbucket.core.html.main(if(account.isEmpty) "New user" else "Update user"){ @gitbucket.core.admin.html.menu("users"){ @gitbucket.core.helper.html.error(error) @@ -50,6 +50,13 @@
+
+ Additional Mail Address: + @extraMailAddresses.zipWithIndex.map { case (mail, idx) => + + + } +