Merge commit '5317ac5e031a29438657952fb882532af296135b' (tag 1.12) into add-features-to-ldapauth

2025-11-09 15:05:50 +01:00 · 2014-03-31 12:33:58 +09:00
parent 9175cf5c71 5317ac5e03
commit 00af52815d
46 changed files with 188 additions and 159 deletions
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -132,7 +132,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  get("/:userName/_edit")(oneselfOnly {
    val userName = params("userName")
    getAccountByUserName(userName).map { x =>
-      account.html.edit(x, loadSystemSettings(), flash.get("info"))
+      account.html.edit(x, flash.get("info"))
    } getOrElse NotFound
  })

@@ -176,7 +176,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  get("/:userName/_ssh")(oneselfOnly {
    val userName = params("userName")
    getAccountByUserName(userName).map { x =>
-      account.html.ssh(x, loadSystemSettings(), getPublicKeys(x.userName))
+      account.html.ssh(x, getPublicKeys(x.userName))
    } getOrElse NotFound
  })

@@ -194,7 +194,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  })

  get("/register"){
-    if(loadSystemSettings().allowAccountRegistration){
+    if(context.settings.allowAccountRegistration){
      if(context.loginAccount.isDefined){
        redirect("/")
      } else {
@@ -204,7 +204,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  }

  post("/register", newForm){ form =>
-    if(loadSystemSettings().allowAccountRegistration){
+    if(context.settings.allowAccountRegistration){
      createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.url)
      updateImage(form.userName, form.fileId, false)
      redirect("/signin")
--- a/src/main/scala/app/ControllerBase.scala
+++ b/src/main/scala/app/ControllerBase.scala
@@ -36,18 +36,16 @@ abstract class ControllerBase extends ScalatraFilter

    if(path.startsWith("/console/")){
      val account = httpRequest.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+      val baseUrl = this.baseUrl(httpRequest)
      if(account == null){
        // Redirect to login form
-        // TODO Should use the configured base url.
-        httpResponse.sendRedirect(context + "/signin?" + StringUtil.urlEncode(path))
+        httpResponse.sendRedirect(baseUrl + "/signin?redirect=" + StringUtil.urlEncode(path))
      } else if(account.isAdmin){
        // H2 Console (administrators only)
-        // TODO Should use the configured base url.
        chain.doFilter(request, response)
      } else {
        // Redirect to dashboard
-        // TODO Should use the configured base url.
-        httpResponse.sendRedirect(context + "/")
+        httpResponse.sendRedirect(baseUrl + "/")
      }
    } else if(path.startsWith("/git/")){
      // Git repository
@@ -68,7 +66,7 @@ abstract class ControllerBase extends ScalatraFilter
  implicit def context: Context = {
    contextCache.get match {
      case null => {
-        val context = Context(loadSystemSettings().baseUrl.getOrElse(servletContext.getContextPath), LoginAccount, request)
+        val context = Context(loadSystemSettings(), LoginAccount, request)
        contextCache.set(context)
        context
      }
@@ -138,10 +136,10 @@ abstract class ControllerBase extends ScalatraFilter

 /**
 * Context object for the current request.
- *
- * @param path the context path
 */
-case class Context(path: String, loginAccount: Option[Account], request: HttpServletRequest){
+case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){
+
+  lazy val path = settings.baseUrl.getOrElse(request.getServletContext.getContextPath)

  lazy val currentPath = request.getRequestURI.substring(request.getContextPath.length)

--- a/src/main/scala/app/IndexController.scala
+++ b/src/main/scala/app/IndexController.scala
@@ -22,7 +22,6 @@ trait IndexControllerBase extends ControllerBase {

    html.index(getRecentActivities(),
      getVisibleRepositories(loginAccount, baseUrl),
-      loadSystemSettings(),
      loginAccount.map{ account => getUserRepositories(account.userName, baseUrl) }.getOrElse(Nil)
    )
  }
@@ -32,11 +31,11 @@ trait IndexControllerBase extends ControllerBase {
    if(redirect.isDefined && redirect.get.startsWith("/")){
      flash += Keys.Flash.Redirect -> redirect.get
    }
-    html.signin(loadSystemSettings())
+    html.signin()
  }

  post("/signin", form){ form =>
-    authenticate(loadSystemSettings(), form.userName, form.password) match {
+    authenticate(context.settings, form.userName, form.password) match {
      case Some(account) => signin(account)
      case None          => redirect("/signin")
    }
--- a/src/main/scala/app/RepositoryViewerController.scala
+++ b/src/main/scala/app/RepositoryViewerController.scala
@@ -65,7 +65,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          repo.html.commits(if(path.isEmpty) Nil else path.split("/").toList, branchName, repository,
            logs.splitWith{ (commit1, commit2) =>
              view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
-            }, page, hasNext, loadSystemSettings())
+            }, page, hasNext)
        case Left(_) => NotFound
      }
    }
@@ -118,7 +118,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            JGitUtil.ContentInfo(viewer, None)
          }

-          repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit), loadSystemSettings())
+          repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit))
        }
      } getOrElse NotFound
    }
@@ -136,7 +136,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          repo.html.commit(id, new JGitUtil.CommitInfo(revCommit),
            JGitUtil.getBranchesOfCommit(git, revCommit.getName),
            JGitUtil.getTagsOfCommit(git, revCommit.getName),
-            repository, diffs, oldCommitId, loadSystemSettings())
+            repository, diffs, oldCommitId)
        }
      }
    }
@@ -152,8 +152,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        val revCommit = git.log.add(git.getRepository.resolve(branchName)).setMaxCount(1).call.iterator.next
        (branchName, revCommit.getCommitterIdent.getWhen)
      }
-      repo.html.branches(branchInfo, hasWritePermission(repository.owner, repository.name, context.loginAccount),
-        repository, loadSystemSettings())
+      repo.html.branches(branchInfo, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
    }
  })

@@ -176,14 +175,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   * Displays tags.
   */
  get("/:owner/:repository/tags")(referrersOnly {
-    repo.html.tags(_, loadSystemSettings())
+    repo.html.tags(_)
  })

  /**
   * Download repository contents as an archive.
   */
-  get("/:owner/:repository/archive/:name")(referrersOnly { repository =>
-    val name = params("name")
+  get("/:owner/:repository/archive/*")(referrersOnly { repository =>
+    val name = multiParams("splat").head

    if(name.endsWith(".zip")){
      val revision = name.replaceFirst("\\.zip$", "")
@@ -194,7 +193,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      workDir.mkdirs

      val zipFile = new File(workDir, repository.name + "-" +
-        (if(revision.length == 40) revision.substring(0, 10) else revision) + ".zip")
+        (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + ".zip")

      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
@@ -209,7 +208,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            while(walk.next){
              val name = walk.getPathString
              val mode = walk.getFileMode(0)
-              if(mode == FileMode.REGULAR_FILE){
+              if(mode == FileMode.REGULAR_FILE || mode == FileMode.EXECUTABLE_FILE){
                walk.getObjectId(objectId, 0)
                val entry = new ZipEntry(name)
                val loader = reader.open(objectId)
@@ -285,7 +284,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            repo.html.files(revision, repository,
              if(path == ".") Nil else path.split("/").toList, // current path
              new JGitUtil.CommitInfo(revCommit), // latest commit
-              files, readme, loadSystemSettings())
+              files, readme)
          }
        } getOrElse NotFound
      }
--- a/src/main/scala/app/SystemSettingsController.scala
+++ b/src/main/scala/app/SystemSettingsController.scala
@@ -7,10 +7,10 @@ import jp.sf.amateras.scalatra.forms._
 import ssh.SshServer

 class SystemSettingsController extends SystemSettingsControllerBase
-  with SystemSettingsService with AccountService with AdminAuthenticator
+  with AccountService with AdminAuthenticator

 trait SystemSettingsControllerBase extends ControllerBase {
-  self: SystemSettingsService with AccountService with AdminAuthenticator =>
+  self: AccountService with AdminAuthenticator =>

  private val form = mapping(
    "baseUrl"                  -> trim(label("Base URL", optional(text()))),
@@ -50,7 +50,7 @@ trait SystemSettingsControllerBase extends ControllerBase {


  get("/admin/system")(adminOnly {
-    admin.html.system(loadSystemSettings(), flash.get("info"))
+    admin.html.system(flash.get("info"))
  })

  post("/admin/system", form)(adminOnly { form =>
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -36,7 +36,7 @@ trait WikiControllerBase extends ControllerBase {
  
  get("/:owner/:repository/wiki")(referrersOnly { repository =>
    getWikiPage(repository.owner, repository.name, "Home").map { page =>
-      wiki.html.page("Home", page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount), loadSystemSettings())
+      wiki.html.page("Home", page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
  })
  
@@ -44,7 +44,7 @@ trait WikiControllerBase extends ControllerBase {
    val pageName = StringUtil.urlDecode(params("page"))

    getWikiPage(repository.owner, repository.name, pageName).map { page =>
-      wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount), loadSystemSettings())
+      wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
  })
  
@@ -53,7 +53,7 @@ trait WikiControllerBase extends ControllerBase {

    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
      JGitUtil.getCommitLog(git, "master", path = pageName + ".md") match {
-        case Right((logs, hasNext)) => wiki.html.history(Some(pageName), logs, repository, loadSystemSettings())
+        case Right((logs, hasNext)) => wiki.html.history(Some(pageName), logs, repository)
        case Left(_) => NotFound
      }
    }
@@ -65,7 +65,7 @@ trait WikiControllerBase extends ControllerBase {

    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
      wiki.html.compare(Some(pageName), from, to, JGitUtil.getDiffs(git, from, to, true).filter(_.newPath == pageName + ".md"), repository,
-        hasWritePermission(repository.owner, repository.name, context.loginAccount), loadSystemSettings(), flash.get("info"))
+        hasWritePermission(repository.owner, repository.name, context.loginAccount), flash.get("info"))
    }
  })
  
@@ -74,7 +74,7 @@ trait WikiControllerBase extends ControllerBase {

    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
      wiki.html.compare(None, from, to, JGitUtil.getDiffs(git, from, to, true), repository,
-        hasWritePermission(repository.owner, repository.name, context.loginAccount), loadSystemSettings(), flash.get("info"))
+        hasWritePermission(repository.owner, repository.name, context.loginAccount), flash.get("info"))
    }
  })

@@ -103,7 +103,7 @@ trait WikiControllerBase extends ControllerBase {

  get("/:owner/:repository/wiki/:page/_edit")(collaboratorsOnly { repository =>
    val pageName = StringUtil.urlDecode(params("page"))
-    wiki.html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName), repository, loadSystemSettings())
+    wiki.html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName), repository)
  })
  
  post("/:owner/:repository/wiki/_edit", editForm)(collaboratorsOnly { (form, repository) =>
@@ -118,7 +118,7 @@ trait WikiControllerBase extends ControllerBase {
  })
  
  get("/:owner/:repository/wiki/_new")(collaboratorsOnly {
-    wiki.html.edit("", None, _, loadSystemSettings())
+    wiki.html.edit("", None, _)
  })
  
  post("/:owner/:repository/wiki/_new", newForm)(collaboratorsOnly { (form, repository) =>
@@ -146,13 +146,13 @@ trait WikiControllerBase extends ControllerBase {
  
  get("/:owner/:repository/wiki/_pages")(referrersOnly { repository =>
    wiki.html.pages(getWikiPageList(repository.owner, repository.name), repository,
-      hasWritePermission(repository.owner, repository.name, context.loginAccount), loadSystemSettings())
+      hasWritePermission(repository.owner, repository.name, context.loginAccount))
  })
  
  get("/:owner/:repository/wiki/_history")(referrersOnly { repository =>
    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
      JGitUtil.getCommitLog(git, "master") match {
-        case Right((logs, hasNext)) => wiki.html.history(None, logs, repository, loadSystemSettings())
+        case Right((logs, hasNext)) => wiki.html.history(None, logs, repository)
        case Left(_) => NotFound
      }
    }
--- a/src/main/scala/service/RepositorySearchService.scala
+++ b/src/main/scala/service/RepositorySearchService.scala
@@ -63,7 +63,8 @@ RepositorySearchService { self: IssuesService =>
    val list = new ListBuffer[(String, String)]

    while (treeWalk.next()) {
-      if(treeWalk.getFileMode(0) == FileMode.REGULAR_FILE){
+      val mode = treeWalk.getFileMode(0)
+      if(mode == FileMode.REGULAR_FILE || mode == FileMode.EXECUTABLE_FILE){
        JGitUtil.getContentFromId(git, treeWalk.getObjectId(0), false).foreach { bytes =>
          if(FileUtil.isText(bytes)){
            val text      = StringUtil.convertFromByteArray(bytes)
--- a/src/main/scala/service/RepositoryService.scala
+++ b/src/main/scala/service/RepositoryService.scala
@@ -294,7 +294,7 @@ object RepositoryService {

    lazy val host = """^https?://(.+?)(:\d+)?/""".r.findFirstMatchIn(httpUrl).get.group(1)

-    def sshUrl(port: Int) = s"ssh://${host}:${port}/${owner}/${name}.git"
+    def sshUrl(port: Int, userName: String) = s"ssh://${userName}@${host}:${port}/${owner}/${name}.git"

    /**
     * Creates instance with issue count and pull request count.
--- a/src/main/scala/service/RequestCache.scala
+++ b/src/main/scala/service/RequestCache.scala
@@ -1,7 +1,6 @@
 package service

 import model._
-import service.SystemSettingsService.SystemSettings

 /**
 * This service is used for a view helper mainly.
@@ -9,28 +8,23 @@ import service.SystemSettingsService.SystemSettings
 * It may be called many times in one request, so each method stores
 * its result into the cache which available during a request.
 */
-trait RequestCache {
-
-  def getSystemSettings()(implicit context: app.Context): SystemSettings =
-    context.cache("system_settings"){
-      new SystemSettingsService {}.loadSystemSettings()
-    }
+trait RequestCache extends SystemSettingsService with AccountService with IssuesService {

  def getIssue(userName: String, repositoryName: String, issueId: String)(implicit context: app.Context): Option[Issue] = {
    context.cache(s"issue.${userName}/${repositoryName}#${issueId}"){
-      new IssuesService {}.getIssue(userName, repositoryName, issueId)
+      super.getIssue(userName, repositoryName, issueId)
    }
  }

  def getAccountByUserName(userName: String)(implicit context: app.Context): Option[Account] = {
    context.cache(s"account.${userName}"){
-      new AccountService {}.getAccountByUserName(userName)
+      super.getAccountByUserName(userName)
    }
  }

  def getAccountByMailAddress(mailAddress: String)(implicit context: app.Context): Option[Account] = {
    context.cache(s"account.${mailAddress}"){
-      new AccountService {}.getAccountByMailAddress(mailAddress)
+      super.getAccountByMailAddress(mailAddress)
    }
  }
 }
--- a/src/main/scala/service/WikiService.scala
+++ b/src/main/scala/service/WikiService.scala
@@ -43,8 +43,8 @@ object WikiService {

  def httpUrl(repository: RepositoryInfo) = repository.httpUrl.replaceFirst("\\.git\\Z", ".wiki.git")

-  def sshUrl(repository: RepositoryInfo, settings: SystemSettingsService.SystemSettings) =
-    repository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort)).replaceFirst("\\.git\\Z", ".wiki.git")
+  def sshUrl(repository: RepositoryInfo, settings: SystemSettingsService.SystemSettings, userName: String) =
+    repository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), userName).replaceFirst("\\.git\\Z", ".wiki.git")
 }

 trait WikiService {
--- a/src/main/scala/servlet/AutoUpdateListener.scala
+++ b/src/main/scala/servlet/AutoUpdateListener.scala
@@ -98,7 +98,7 @@ object AutoUpdate {
   */
  def getCurrentVersion(): Version = {
    if(versionFile.exists){
-      FileUtils.readFileToString(versionFile, "UTF-8").split("\\.") match {
+      FileUtils.readFileToString(versionFile, "UTF-8").trim.split("\\.") match {
        case Array(majorVersion, minorVersion) => {
          versions.find { v => 
            v.majorVersion == majorVersion.toInt && v.minorVersion == minorVersion.toInt
--- a/src/main/scala/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/servlet/GitRepositoryServlet.scala
@@ -99,12 +99,16 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
      using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
        commands.asScala.foreach { command =>
          logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
-          val commits = command.getType match {
-            case ReceiveCommand.Type.DELETE => Nil
-            case _ => JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
-          }
          val refName = command.getRefName.split("/")
          val branchName = refName.drop(2).mkString("/")
+          val commits = if (refName(1) == "tags") {
+            Nil
+          } else {
+            command.getType match {
+              case ReceiveCommand.Type.DELETE => Nil
+              case _ => JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
+            }
+          }

          // Extract new commit and apply issue comment
          val newCommits = if(commits.size > 1000){
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -76,11 +76,7 @@ object JGitUtil {
        rev.getFullMessage,
        rev.getParents().map(_.name).toList)

-    val summary = defining(fullMessage.trim.indexOf("\n")){ i =>
-      defining(if(i >= 0) fullMessage.trim.substring(0, i).trim else fullMessage){ firstLine =>
-        if(firstLine.length > shortMessage.length) shortMessage else firstLine
-      }
-    }
+    val summary = getSummaryMessage(fullMessage, shortMessage)

    val description = defining(fullMessage.trim.indexOf("\n")){ i =>
      if(i >= 0){
@@ -165,7 +161,7 @@ object JGitUtil {
      }
    }
  }
-  
+
  /**
   * Returns the file list of the specified path.
   * 
@@ -220,16 +216,18 @@ object JGitUtil {

    val commits = getLatestCommitFromPaths(git, list.toList.map(_._3), revision)
    list.map { case (objectId, fileMode, path, name, linkUrl) =>
-      FileInfo(
-        objectId,
-        fileMode == FileMode.TREE || fileMode == FileMode.GITLINK,
-        name,
-        commits(path).getCommitterIdent.getWhen,
-        commits(path).getShortMessage,
-        commits(path).getName,
-        commits(path).getCommitterIdent.getName,
-        commits(path).getCommitterIdent.getEmailAddress,
-        linkUrl)
+      defining(commits(path)){ commit =>
+        FileInfo(
+          objectId,
+          fileMode == FileMode.TREE || fileMode == FileMode.GITLINK,
+          name,
+          commit.getCommitterIdent.getWhen,
+          getSummaryMessage(commit.getFullMessage, commit.getShortMessage),
+          commit.getName,
+          commit.getCommitterIdent.getName,
+          commit.getCommitterIdent.getEmailAddress,
+          linkUrl)
+      }
    }.sortWith { (file1, file2) =>
      (file1.isDirectory, file2.isDirectory) match {
        case (true , false) => true
@@ -238,7 +236,18 @@ object JGitUtil {
      }
    }.toList
  }
-  
+
+  /**
+   * Returns the first line of the commit message.
+   */
+  private def getSummaryMessage(fullMessage: String, shortMessage: String): String = {
+    defining(fullMessage.trim.indexOf("\n")){ i =>
+      defining(if(i >= 0) fullMessage.trim.substring(0, i).trim else fullMessage){ firstLine =>
+        if(firstLine.length > shortMessage.length) shortMessage else firstLine
+      }
+    }
+  }
+
  /**
   * Returns the commit list of the specified branch.
   * 
--- a/src/main/scala/view/AvatarImageProvider.scala
+++ b/src/main/scala/view/AvatarImageProvider.scala
@@ -16,7 +16,7 @@ trait AvatarImageProvider { self: RequestCache =>
    val src = if(mailAddress.isEmpty){
      // by user name
      getAccountByUserName(userName).map { account =>
-        if(account.image.isEmpty && getSystemSettings().gravatar){
+        if(account.image.isEmpty && context.settings.gravatar){
          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
        } else {
          s"""${context.path}/${account.userName}/_avatar"""
@@ -27,13 +27,13 @@ trait AvatarImageProvider { self: RequestCache =>
    } else {
      // by mail address
      getAccountByMailAddress(mailAddress).map { account =>
-        if(account.image.isEmpty && getSystemSettings().gravatar){
+        if(account.image.isEmpty && context.settings.gravatar){
          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
        } else {
          s"""${context.path}/${account.userName}/_avatar"""
        }
      } getOrElse {
-        if(getSystemSettings().gravatar){
+        if(context.settings.gravatar){
          s"""https://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}"""
        } else {
          s"""${context.path}/_unknown/_avatar"""