MyFavMirrors/lc-core
1
0
Fork 0
mirror of https://github.com/librecaptcha/lc-core.git synced 2025-04-21 19:14:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

correctly parse parameter values from config

Browse Source 
Signed-off-by: hrj <harshad.rj@gmail.com>
This commit is contained in:
hrj 2021-04-13 14:01:25 +05:30
parent 1ff4a30da7
commit 96b5808628
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/scala/lc/core/config.scala
View File

@ -44,25 +44,9 @@ object Config {
case JField("config", JObject(config)) => ("config", JString(config.toString)) case JField("config", JObject(config)) => ("config", JString(config.toString))
} }
val captchaConfig: List[CaptchaConfig] = captchaConfigTransform.extract[List[CaptchaConfig]] val captchaConfig: List[CaptchaConfig] = captchaConfigTransform.extract[List[CaptchaConfig]]
val allowedLevels: Set[String] = getAllValues(configJson, ParametersEnum.ALLOWEDLEVELS.toString) val allowedLevels: Set[String] = captchaConfig.flatMap(_.allowedLevels).toSet
val allowedMedia: Set[String] = getAllValues(configJson, ParametersEnum.ALLOWEDMEDIA.toString) val allowedMedia: Set[String] = captchaConfig.flatMap(_.allowedMedia).toSet
val allowedInputType: Set[String] = getAllValues(configJson, ParametersEnum.ALLOWEDINPUTTYPE.toString) val allowedInputType: Set[String] = captchaConfig.flatMap(_.allowedInputType).toSet
private def getAllValues(config: JValue, param: String): Set[String] = {
val configValues = (config \\ param)
val result = for {
JObject(child) <- configValues
JField(param) <- child
} yield (param)
var valueSet = Set[String]()
for (valueList <- result) {
for (value <- valueList._2.children) {
valueSet += value.values.toString
}
}
valueSet
}
private def getDefaultConfig(): String = { private def getDefaultConfig(): String = {
val defaultConfigMap = val defaultConfigMap =