deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

load totp secret in user object

Browse source
This commit is contained in:
Niklas Fiekas 2018-05-06 11:36:33 +02:00
parent bb2bfe8a23
commit 313a3f143b
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/user/src/main/TotpSecret.scala
View file

@ -1,10 +1,12 @@
package lila.user
import org.apache.commons.codec.binary.Base32
import reactivemongo.bson._
import java.security.SecureRandom
import javax.crypto.Mac
import javax.crypto.spec.SecretKeySpec
import scala.math.{ pow, BigInt }
import org.apache.commons.codec.binary.Base32
case class TotpSecret(secret: Array[Byte]) extends AnyVal {
override def toString = "TotpSecret(****************)"
@ -47,4 +49,9 @@ object TotpSecret {
new SecureRandom().nextBytes(secret)
apply(secret)
}
private[user] val totpSecretBSONHandler = new BSONHandler[BSONBinary, TotpSecret] {
def read(bin: BSONBinary): TotpSecret = TotpSecret(bin.byteArray)
def write(s: TotpSecret): BSONBinary = BSONBinary(s.secret, Subtype.GenericBinarySubtype)
}
}

10
modules/user/src/main/User.scala
View file

@ -28,7 +28,8 @@ case class User(
lang: Option[String],
plan: Plan,
reportban: Boolean = false,
rankban: Boolean = false
rankban: Boolean = false,
totpSecret: Option[TotpSecret] = None
) extends Ordered[User] {
override def equals(other: Any) = other match {
@ -236,6 +237,7 @@ object User {
private implicit def profileHandler = Profile.profileBSONHandler
private implicit def perfsHandler = Perfs.perfsBSONHandler
private implicit def planHandler = Plan.planBSONHandler
private implicit def totpSecretHandler = TotpSecret.totpSecretBSONHandler
def reads(r: BSON.Reader): User = User(
id = r str id,
@ -258,7 +260,8 @@ object User {
title = r strO title,
plan = r.getO[Plan](plan) | Plan.empty,
reportban = r boolD reportban,
rankban = r boolD rankban
rankban = r boolD rankban,
totpSecret = r.getO[TotpSecret](totpSecret)
)
def writes(w: BSON.Writer, o: User) = BSONDocument(
@ -282,7 +285,8 @@ object User {
title -> o.title,
plan -> o.plan.nonEmpty,
reportban -> w.boolO(o.reportban),
rankban -> w.boolO(o.rankban)
rankban -> w.boolO(o.rankban),
totpSecret -> o.totpSecret
)
}
}