Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 21:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #340)Add public key validation

Browse Source
This commit is contained in:
Tomofumi Tanaka
2014-04-07 22:56:13 +09:00
parent 3a2ecf6896
commit 06978a4fc4
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/app/AccountController.scala
View File

@@ -5,6 +5,7 @@ import util._
import util.StringUtil._ import util.StringUtil._
import util.Directory._ import util.Directory._
import util.ControlUtil._ import util.ControlUtil._
import ssh.SshUtil
import jp.sf.amateras.scalatra.forms._ import jp.sf.amateras.scalatra.forms._
import org.apache.commons.io.FileUtils import org.apache.commons.io.FileUtils
import org.scalatra.i18n.Messages import org.scalatra.i18n.Messages
@@ -49,7 +50,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
val sshKeyForm = mapping( val sshKeyForm = mapping(
"title" -> trim(label("Title", text(required, maxlength(100)))), "title" -> trim(label("Title", text(required, maxlength(100)))),
"publicKey" -> trim(label("Key" , text(required))) "publicKey" -> trim(label("Key" , text(required, validPublicKey)))
)(SshKeyForm.apply) )(SshKeyForm.apply)
case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String) case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String)
@@ -435,4 +436,11 @@ trait AccountControllerBase extends AccountManagementControllerBase {
}) None else Some("Must select one manager at least.") }) None else Some("Must select one manager at least.")
} }
} }
private def validPublicKey: Constraint = new Constraint(){
override def validate(name: String, value: String, messages: Messages): Option[String] = SshUtil.str2PublicKey(value) match {
case Some(_) => None
case None => Some("Key is invalid.")
}
}
} }