Merge branch 'master' of https://github.com/takezoe/gitbucket.git

src/main/scala/app/AccountController.scala

@@ -70,7 +70,7 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
     val userName = params("userName")
     getAccountByUserName(userName).map { account =>
       updateAccount(account.copy(
-        password    = form.password.map(encrypt).getOrElse(account.password),
+        password    = form.password.map(sha1).getOrElse(account.password),
         mailAddress = form.mailAddress,
         url         = form.url))
 
@@ -93,7 +93,7 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
 
   post("/register", newForm){ form =>
     if(loadSystemSettings().allowAccountRegistration){
-      createAccount(form.userName, encrypt(form.password), form.mailAddress, false, form.url)
+      createAccount(form.userName, sha1(form.password), form.mailAddress, false, form.url)
       updateImage(form.userName, form.fileId, false)
       redirect("/signin")
     } else NotFound

src/main/scala/app/ControllerBase.scala

@@ -95,7 +95,23 @@ abstract class ControllerBase extends ScalatraFilter
 /**
  * Context object for the current request.
  */
-case class Context(path: String, loginAccount: Option[Account], currentUrl: String, request: HttpServletRequest)
+case class Context(path: String, loginAccount: Option[Account], currentUrl: String, request: HttpServletRequest){
+
+  /**
+   * Get object from cache.
+   *
+   * If object has not been cached with the specified key then retrieves by given action.
+   * Cached object are available during a request.
+   */
+  def cache[A](key: String)(action: => A): A = {
+    Option(request.getAttribute("cache." + key).asInstanceOf[A]).getOrElse {
+      val newObject = action
+      request.setAttribute("cache." + key, newObject)
+      newObject
+    }
+  }
+
+}
 
 /**
  * Base trait for controllers which manages account information.

src/main/scala/app/RepositoryViewerController.scala

@@ -213,11 +213,17 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     if(repository.commitCount == 0){
       repo.html.guide(repository)
     } else {
-      val revision = if(revstr.isEmpty) repository.repository.defaultBranch else revstr
-
       JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
-        // get latest commit
-        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
+        // get specified commit
+        val (revCommit, revision) = try {
+          val revision = if(revstr.isEmpty) repository.repository.defaultBranch else revstr
+          (JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision)), revision)
+        } catch {
+          case e: NullPointerException => {
+            val revision = repository.branchList.head
+            (JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision)), revision)
+          }
+        }
         // get files
         val files = JGitUtil.getFileList(git, revision, path)
         // process README.md
@@ -225,20 +231,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
           new String(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get, "UTF-8")
         }
 
-        repo.html.files(
-          // current branch
-          revision,
-          // repository
-          repository,
-          // current path
-          if(path == ".") Nil else path.split("/").toList,
-          // latest commit
-          new JGitUtil.CommitInfo(revCommit),
-          // file list
-          files,
-          // readme
-          readme
-        )
+        repo.html.files(revision, repository,
+          if(path == ".") Nil else path.split("/").toList, // current path
+          new JGitUtil.CommitInfo(revCommit), // latest commit
+          files, readme)
       }
     }
   }

src/main/scala/app/SignInController.scala

@@ -25,7 +25,7 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
 
   post("/signin", form){ form =>
     val account = getAccountByUserName(form.userName)
-    if(account.isEmpty || account.get.password != encrypt(form.password)){
+    if(account.isEmpty || account.get.password != sha1(form.password)){
       redirect("/signin")
     } else {
       session.setAttribute("LOGIN_ACCOUNT", account.get)

src/main/scala/app/UserManagementController.scala

@@ -47,7 +47,7 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
   })
   
   post("/admin/users/_new", newForm)(adminOnly { form =>
-    createAccount(form.userName, encrypt(form.password), form.mailAddress, form.isAdmin, form.url)
+    createAccount(form.userName, sha1(form.password), form.mailAddress, form.isAdmin, form.url)
     updateImage(form.userName, form.fileId, false)
     redirect("/admin/users")
   })
@@ -61,7 +61,7 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
     val userName = params("userName")
     getAccountByUserName(userName).map { account =>
       updateAccount(getAccountByUserName(userName).get.copy(
-        password     = form.password.map(encrypt).getOrElse(account.password),
+        password     = form.password.map(sha1).getOrElse(account.password),
         mailAddress  = form.mailAddress,
         isAdmin      = form.isAdmin,
         url          = form.url))