GitBucket
- @defining(AutoUpdate.getCurrentVersion){ version =>
- @version.majorVersion.@version.minorVersion
- }
+ GitBucket
- @defining(AutoUpdate.getCurrentVersion){ version =>
- @version.majorVersion.@version.minorVersion
- }
+
+
+ * [
+ * {
+ * "label" -> "value1",
+ * "value" -> "value1"
+ * },
+ * {
+ * "label" -> "value2",
+ * "value" -> "value2"
+ * },
+ * ]
+ *
+ *
+ * Each element can be accessed as `option` in `template()` or `replace()` method.
+ */
+ def values(repository: RepositoryInfo): Seq[String] = Nil
+
+ /**
+ * If this suggestion provider has static proposal list, override this method to return it.
+ *
+ * If your proposals have label and value, use this method instead of `values()`.
+ * The first element of tuple is used as a value, and the second element is used as a label.
+ *
+ * The returned sequence is rendered as follows:
+ *
+ * [
+ * {
+ * "label" -> "label1",
+ * "value" -> "value1"
+ * },
+ * {
+ * "label" -> "label2",
+ * "value" -> "value2"
+ * },
+ * ]
+ *
+ *
+ * Each element can be accessed as `option` in `template()` or `replace()` method.
+ */
+ def options(repository: RepositoryInfo): Seq[(String, String)] = values(repository).map { value => (value, value) }
+
+ /**
+ * JavaScript fragment to generate a label of completion proposal. The default is: `option.label`.
+ */
+ def template(implicit context: Context): String = "option.label"
+
+ /**
+ * JavaScript fragment to generate a replaced value of completion proposal. The default is: `option.value`
+ */
+ def replace(implicit context: Context): String = "option.value"
+
+ /**
+ * If this suggestion provider needs some additional process to assemble the proposal list (e.g. It need to use Ajax
+ * to get a proposal list from the server), then override this method and return any JavaScript code.
+ */
def additionalScript(implicit context: Context): String = ""
}
@@ -20,8 +97,6 @@ class UserNameSuggestionProvider extends SuggestionProvider {
override val id: String = "user"
override val prefix: String = "@"
override val context: Seq[String] = Seq("issues")
- override def values(repository: RepositoryInfo): Seq[String] = Nil
- override def template(implicit context: Context): String = "'@' + value"
override def additionalScript(implicit context: Context): String =
s"""$$.get('${context.path}/_user/proposals', { query: '', user: true, group: false }, function (data) { user = data.options; });"""
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala b/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala
index 5cbb77c86..65d0aaa6a 100644
--- a/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala
+++ b/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala
@@ -1,11 +1,10 @@
package gitbucket.core.service
-import gitbucket.core.model.{ProtectedBranch, ProtectedBranchContext, CommitState}
+import gitbucket.core.model.{Session => _, _}
import gitbucket.core.plugin.ReceiveHook
import gitbucket.core.model.Profile._
import gitbucket.core.model.Profile.profile.blockingApi._
-
-import org.eclipse.jgit.transport.{ReceivePack, ReceiveCommand}
+import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
trait ProtectedBranchService {
@@ -46,12 +45,17 @@ trait ProtectedBranchService {
object ProtectedBranchService {
- class ProtectedBranchReceiveHook extends ReceiveHook with ProtectedBranchService {
+ class ProtectedBranchReceiveHook extends ReceiveHook with ProtectedBranchService with RepositoryService with AccountService {
override def preReceive(owner: String, repository: String, receivePack: ReceivePack, command: ReceiveCommand, pusher: String)
(implicit session: Session): Option[String] = {
val branch = command.getRefName.stripPrefix("refs/heads/")
if(branch != command.getRefName){
- getProtectedBranchInfo(owner, repository, branch).getStopReason(receivePack.isAllowNonFastForwards, command, pusher)
+ val repositoryInfo = getRepository(owner, repository)
+ if(command.getType == ReceiveCommand.Type.DELETE && repositoryInfo.exists(_.repository.defaultBranch == branch)){
+ Some(s"refusing to delete the branch: ${command.getRefName}.")
+ } else {
+ getProtectedBranchInfo(owner, repository, branch).getStopReason(receivePack.isAllowNonFastForwards, command, pusher)
+ }
} else {
None
}
@@ -74,10 +78,19 @@ object ProtectedBranchService {
* Include administrators
* Enforce required status checks for repository administrators.
*/
- includeAdministrators: Boolean) extends AccountService with CommitStatusService {
+ includeAdministrators: Boolean) extends AccountService with RepositoryService with CommitStatusService {
def isAdministrator(pusher: String)(implicit session: Session): Boolean =
- pusher == owner || getGroupMembers(owner).exists(gm => gm.userName == pusher && gm.isManager)
+ pusher == owner || getGroupMembers(owner).exists(gm => gm.userName == pusher && gm.isManager) ||
+ getCollaborators(owner, repository).exists { case (collaborator, isGroup) =>
+ if(collaborator.role == Role.ADMIN.name){
+ if(isGroup){
+ getGroupMembers(collaborator.collaboratorName).exists(gm => gm.userName == pusher)
+ } else {
+ collaborator.collaboratorName == pusher
+ }
+ } else false
+ }
/**
* Can't be force pushed
diff --git a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
index c73ed3591..bb50df4e2 100644
--- a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
+++ b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
@@ -140,17 +140,16 @@ object SystemSettingsService {
ldapAuthentication: Boolean,
ldap: Option[Ldap],
skinName: String){
- def baseUrl(request: HttpServletRequest): String = baseUrl.fold(request.baseUrl)(_.stripSuffix("/"))
- def sshAddress:Option[SshAddress] =
- for {
- host <- sshHost if ssh
- }
- yield SshAddress(
- host,
- sshPort.getOrElse(DefaultSshPort),
- "git"
- )
+ def baseUrl(request: HttpServletRequest): String = baseUrl.fold {
+ val url = request.getRequestURL.toString
+ val len = url.length - (request.getRequestURI.length - request.getContextPath.length)
+ url.substring(0, len).stripSuffix("/")
+ } (_.stripSuffix("/"))
+
+ def sshAddress:Option[SshAddress] = sshHost.collect { case host if ssh =>
+ SshAddress(host, sshPort.getOrElse(DefaultSshPort), "git")
+ }
}
case class Ldap(
diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
index 6d14d2c06..2fa3859b2 100644
--- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
@@ -156,9 +156,13 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
logger.debug("repository:" + owner + "/" + repository)
+ val settings = loadSystemSettings()
+ val baseUrl = settings.baseUrl(request)
+ val sshUrl = settings.sshAddress.map { x => s"${x.genericUser}@${x.host}:${x.port}" }
+
if(!repository.endsWith(".wiki")){
defining(request) { implicit r =>
- val hook = new CommitLogHook(owner, repository, pusher, baseUrl)
+ val hook = new CommitLogHook(owner, repository, pusher, baseUrl, sshUrl)
receivePack.setPreReceiveHook(hook)
receivePack.setPostReceiveHook(hook)
}
@@ -166,7 +170,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
if(repository.endsWith(".wiki")){
defining(request) { implicit r =>
- receivePack.setPostReceiveHook(new WikiCommitHook(owner, repository.stripSuffix(".wiki"), pusher, baseUrl))
+ receivePack.setPostReceiveHook(new WikiCommitHook(owner, repository.stripSuffix(".wiki"), pusher, baseUrl, sshUrl))
}
}
}
@@ -178,7 +182,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
import scala.collection.JavaConverters._
-class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)
+class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String, sshUrl: Option[String])
extends PostReceiveHook with PreReceiveHook
with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService
with WebHookPullRequestService with CommitsService {
@@ -219,7 +223,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
val pushedIds = scala.collection.mutable.Set[String]()
commands.asScala.foreach { command =>
logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
- implicit val apiContext = api.JsonFormat.Context(baseUrl)
+ implicit val apiContext = api.JsonFormat.Context(baseUrl, sshUrl)
val refName = command.getRefName.split("/")
val branchName = refName.drop(2).mkString("/")
val commits = if (refName(1) == "tags") {
@@ -320,7 +324,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
}
-class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl: String)
+class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl: String, sshUrl: Option[String])
extends PostReceiveHook with WebHookService with AccountService with RepositoryService {
private val logger = LoggerFactory.getLogger(classOf[WikiCommitHook])
@@ -329,7 +333,7 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
Database() withTransaction { implicit session =>
try {
commands.asScala.headOption.foreach { command =>
- implicit val apiContext = api.JsonFormat.Context(baseUrl)
+ implicit val apiContext = api.JsonFormat.Context(baseUrl, sshUrl)
val refName = command.getRefName.split("/")
val commitIds = if (refName(1) == "tags") {
None
@@ -347,7 +351,6 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
diffs._1.collect { case diff if diff.newPath.toLowerCase.endsWith(".md") =>
val action = if(diff.changeType == ChangeType.ADD) "created" else "edited"
val fileName = diff.newPath
- //println(action + " - " + fileName + " - " + commit.id)
(action, fileName, commit.id)
}
}
diff --git a/src/main/scala/gitbucket/core/ssh/GitCommand.scala b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
index 9d7345dee..3be9f8746 100644
--- a/src/main/scala/gitbucket/core/ssh/GitCommand.scala
+++ b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
@@ -154,7 +154,7 @@ class DefaultGitUploadPack(owner: String, repoName: String) extends DefaultGitCo
}
}
-class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String) extends DefaultGitCommand(owner, repoName)
+class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String, sshUrl: Option[String]) extends DefaultGitCommand(owner, repoName)
with RepositoryService with AccountService with DeployKeyService {
override protected def runTask(authType: AuthType): Unit = {
@@ -169,7 +169,7 @@ class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String) ex
val repository = git.getRepository
val receive = new ReceivePack(repository)
if (!repoName.endsWith(".wiki")) {
- val hook = new CommitLogHook(owner, repoName, userName(authType), baseUrl)
+ val hook = new CommitLogHook(owner, repoName, userName(authType), baseUrl, sshUrl)
receive.setPreReceiveHook(hook)
receive.setPostReceiveHook(hook)
}
@@ -216,7 +216,7 @@ class PluginGitReceivePack(repoName: String, routing: GitRepositoryRouting) exte
}
-class GitCommandFactory(baseUrl: String) extends CommandFactory {
+class GitCommandFactory(baseUrl: String, sshUrl: Option[String]) extends CommandFactory {
private val logger = LoggerFactory.getLogger(classOf[GitCommandFactory])
override def createCommand(command: String): Command = {
@@ -227,7 +227,7 @@ class GitCommandFactory(baseUrl: String) extends CommandFactory {
case SimpleCommandRegex ("upload" , repoName) if(pluginRepository(repoName)) => new PluginGitUploadPack (repoName, routing(repoName))
case SimpleCommandRegex ("receive", repoName) if(pluginRepository(repoName)) => new PluginGitReceivePack(repoName, routing(repoName))
case DefaultCommandRegex("upload" , owner, repoName) => new DefaultGitUploadPack (owner, repoName)
- case DefaultCommandRegex("receive", owner, repoName) => new DefaultGitReceivePack(owner, repoName, baseUrl)
+ case DefaultCommandRegex("receive", owner, repoName) => new DefaultGitReceivePack(owner, repoName, baseUrl, sshUrl)
case _ => new UnknownCommand(command)
}
}
diff --git a/src/main/scala/gitbucket/core/ssh/SshServerListener.scala b/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
index 6ff1d0e40..857db45cb 100644
--- a/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
+++ b/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
@@ -22,7 +22,7 @@ object SshServer {
provider.setOverwriteAllowed(false)
server.setKeyPairProvider(provider)
server.setPublickeyAuthenticator(new PublicKeyAuthenticator(sshAddress.genericUser))
- server.setCommandFactory(new GitCommandFactory(baseUrl))
+ server.setCommandFactory(new GitCommandFactory(baseUrl, Some(s"${sshAddress.genericUser}@${sshAddress.host}:${sshAddress.port}")))
server.setShellFactory(new NoShell(sshAddress))
}
diff --git a/src/main/scala/gitbucket/core/util/FileUtil.scala b/src/main/scala/gitbucket/core/util/FileUtil.scala
index e31dd6bb3..6b082d164 100644
--- a/src/main/scala/gitbucket/core/util/FileUtil.scala
+++ b/src/main/scala/gitbucket/core/util/FileUtil.scala
@@ -28,8 +28,6 @@ object FileUtil {
def isImage(name: String): Boolean = getMimeType(name).startsWith("image/")
- def isUploadableType(name: String): Boolean = mimeTypeWhiteList contains getMimeType(name)
-
def isLarge(size: Long): Boolean = (size > 1024 * 1000)
def isText(content: Array[Byte]): Boolean = !content.contains(0)
@@ -53,16 +51,6 @@ object FileUtil {
}
}
- val mimeTypeWhiteList: Array[String] = Array(
- "application/pdf",
- "application/vnd.openxmlformats-officedocument.presentationml.presentation",
- "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
- "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
- "image/gif",
- "image/jpeg",
- "image/png",
- "text/plain")
-
def getLfsFilePath(owner: String, repository: String, oid: String): String =
Directory.getLfsDir(owner, repository) + "/" + oid
diff --git a/src/main/scala/gitbucket/core/util/Implicits.scala b/src/main/scala/gitbucket/core/util/Implicits.scala
index 77767a3bc..393dbbf88 100644
--- a/src/main/scala/gitbucket/core/util/Implicits.scala
+++ b/src/main/scala/gitbucket/core/util/Implicits.scala
@@ -22,7 +22,8 @@ object Implicits {
// Convert to slick session.
implicit def request2Session(implicit request: HttpServletRequest): JdbcBackend#Session = Database.getSession(request)
- implicit def context2ApiJsonFormatContext(implicit context: Context): JsonFormat.Context = JsonFormat.Context(context.baseUrl)
+ implicit def context2ApiJsonFormatContext(implicit context: Context): JsonFormat.Context =
+ JsonFormat.Context(context.baseUrl, context.settings.sshAddress.map { x => s"${x.genericUser}@${x.host}:${x.port}" })
implicit class RichSeq[A](private val seq: Seq[A]) extends AnyVal {
@@ -77,11 +78,6 @@ object Implicits {
def gitRepositoryPath: String = request.getRequestURI.replaceFirst("^" + quote(request.getContextPath) + "/git/", "/")
- def baseUrl:String = {
- val url = request.getRequestURL.toString
- val len = url.length - (request.getRequestURI.length - request.getContextPath.length)
- url.substring(0, len).stripSuffix("/")
- }
}
implicit class RichSession(private val session: HttpSession) extends AnyVal {
diff --git a/src/main/twirl/gitbucket/core/helper/attached.scala.html b/src/main/twirl/gitbucket/core/helper/attached.scala.html
index b8ac1330c..c68c2bf23 100644
--- a/src/main/twirl/gitbucket/core/helper/attached.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/attached.scala.html
@@ -11,7 +11,9 @@
$(function(){
@gitbucket.core.plugin.PluginRegistry().getSuggestionProviders.map { provider =>
@if(provider.context.contains(completionContext)){
- var @provider.id = @Html(helpers.json(provider.values(repository)));
+ var @provider.id = @Html(helpers.json(provider.options(repository).map { case (value, label) =>
+ Map("value" -> value, "label" -> label)
+ }));
@Html(provider.additionalScript)
}
}
@@ -23,14 +25,14 @@ $(function(){
match: /\B@{provider.prefix}([\-+\w]*)$/,
search: function (term, callback) {
callback($.map(@{provider.id}, function (proposal) {
- return proposal.indexOf(term) === 0 ? proposal : null;
+ return proposal.value.indexOf(term) === 0 ? proposal : null;
}));
},
- template: function (value) {
+ template: function (option) {
return @{Html(provider.template)};
},
- replace: function (value) {
- return '@{provider.prefix}' + value + '@{provider.suffix}';
+ replace: function (option) {
+ return '@{provider.prefix}' + @{Html(provider.replace)} + '@{provider.suffix}';
},
index: 1
},
@@ -65,8 +67,6 @@ $(function(){
url: '@context.path/upload/file/@repository.owner/@repository.name',
maxFilesize: 10,
clickable: @clickable,
- acceptedFiles: @Html(FileUtil.mimeTypeWhiteList.mkString("'", ",", "'")),
- dictInvalidFileType: 'Unfortunately, we don\'t support that file type. Try again with a PNG, GIF, JPG, DOCX, PPTX, XLSX, TXT, or PDF.',
previewTemplate: "