@@ -111,12 +111,17 @@ object Props { lazy val productionMode: Boolean = mode == RunModes.Production || mode == RunModes.Pilot || mode == RunModes.Staging -/** + /** * Is the system in production mode (apply full optimizations) */ lazy val devMode: Boolean = mode == RunModes.Development /** + * Is the system running in test mode + */ + lazy val testMode: Boolean = mode == RunModes.Test + + /** * The resource path segment corresponding to the current mode. */ lazy val modeName = mode match { lift-util/src/main/scala/net/liftweb/util/Props.scala @@ -135,6 +135,11 @@ trait SecurityHelpers { self: StringHelpers with IoHelpers => new String((new Base64) encode (MessageDigest.getInstance("SHA")).digest(in.getBytes("UTF-8"))) } + /** create a SHA hash from a String */ + def hashHex(in: String) : String = { + Helpers.hexEncode(MessageDigest.getInstance("SHA").digest(in.getBytes("UTF-8"))) + } + /** create a SHA-256 hash from a Byte array */ def hash256(in : Array[Byte]) : Array[Byte] = { (MessageDigest.getInstance("SHA-256")).digest(in) lift-util/src/main/scala/net/liftweb/util/SecurityHelpers.scala @@ -22,7 +22,8 @@ import _root_.scala.xml.{NodeSeq, Elem, Text, UnprefixedAttribute, Null, MetaDat Group, Node, HasKeyValue} import _root_.scala.collection.immutable.{ListMap, TreeMap} import _root_.net.liftweb.util.{Helpers, ThreadGlobal, LoanWrapper, Box, Empty, Full, Failure, - Log, JSONParser, NamedPartialFunction, NamedPF, AttrHelper} + Log, JSONParser, NamedPartialFunction, NamedPF, + AttrHelper, Props} import Helpers._ import js._ import _root_.java.io.InputStream @@ -1519,10 +1520,20 @@ object S extends HasParams { buildJsonFunc(Empty, Full(onError), f) private[http] object _formGroup extends RequestVar[Box[Int]](Empty) - - def formFuncName: String = _formGroup.is match { - case Full(x) => Helpers.nextFuncName(x.toLong * 10000L) - case _ => Helpers.nextFuncName + private object formItemNumber extends RequestVar[Int](0) + + def formFuncName: String = if (Props.testMode) { + val bump: Long = ((_formGroup.is openOr 0) + 1000L) * 10000L + val num: Int = formItemNumber.is + formItemNumber.set(num + 1) + import java.text._ + val prefix: String = new DecimalFormat("00000000000000000").format(bump + num) + "f"+prefix+"_"+Helpers.hashHex((new Exception).getStackTrace.toList.take(10).map(_.toString).mkString(",")) + } else { + _formGroup.is match { + case Full(x) => Helpers.nextFuncName(x.toLong * 10000L) + case _ => Helpers.nextFuncName + } } def formGroup[T](group: Int)(f: => T): T = { lift/src/main/scala/net/liftweb/http/S.scala 8a78cd691f27b27417c959633a63bef42c4d7248 David Pollak feeder.of.the.bears@gmail.com http://github.com/dpp/liftweb/commit/d488d23b463319eb29542eb6cea7a8a3608e2b6c d488d23b463319eb29542eb6cea7a8a3608e2b6c 2009-07-03T09:52:40-07:00 2009-07-03T09:52:40-07:00 Stable identifiers for form fields in Test mode 41f5d540d65db8d295879337f7751e78d4af7020 David Pollak feeder.of.the.bears@gmail.com