mirror of
https://github.com/librecaptcha/lc-core.git
synced 2025-04-20 02:27:30 -04:00
rename filters to providers
This commit is contained in:
parent
cf71757b5f
commit
c047691424
@ -30,7 +30,7 @@ class Captcha(throttle: Int) {
|
|||||||
val imagePstmt: PreparedStatement = con.prepareStatement("SELECT image FROM challenge c, mapId m WHERE c.token=m.token AND m.uuid = ?")
|
val imagePstmt: PreparedStatement = con.prepareStatement("SELECT image FROM challenge c, mapId m WHERE c.token=m.token AND m.uuid = ?")
|
||||||
val updatePstmt: PreparedStatement = con.prepareStatement("UPDATE challenge SET solved = True WHERE token = ?")
|
val updatePstmt: PreparedStatement = con.prepareStatement("UPDATE challenge SET solved = True WHERE token = ?")
|
||||||
|
|
||||||
val filters = Map("FilterChallenge" -> new FilterChallenge,
|
val providers = Map("FilterChallenge" -> new FilterChallenge,
|
||||||
"FontFunCaptcha" -> new FontFunCaptcha,
|
"FontFunCaptcha" -> new FontFunCaptcha,
|
||||||
"GifCaptcha" -> new GifCaptcha,
|
"GifCaptcha" -> new GifCaptcha,
|
||||||
"ShadowTextCaptcha" -> new ShadowTextCaptcha,
|
"ShadowTextCaptcha" -> new ShadowTextCaptcha,
|
||||||
@ -38,9 +38,9 @@ class Captcha(throttle: Int) {
|
|||||||
|
|
||||||
def getProvider(): String = {
|
def getProvider(): String = {
|
||||||
val random = new scala.util.Random
|
val random = new scala.util.Random
|
||||||
val keys = filters.keys
|
val keys = providers.keys
|
||||||
val providerMap = keys.toVector(random.nextInt(keys.size))
|
val providerIndex = keys.toVector(random.nextInt(keys.size))
|
||||||
providerMap
|
providerIndex
|
||||||
}
|
}
|
||||||
|
|
||||||
def getCaptcha(id: Id): Array[Byte] = {
|
def getCaptcha(id: Id): Array[Byte] = {
|
||||||
@ -61,7 +61,7 @@ class Captcha(throttle: Int) {
|
|||||||
def generateChallenge(param: Parameters): String = {
|
def generateChallenge(param: Parameters): String = {
|
||||||
//TODO: eval params to choose a provider
|
//TODO: eval params to choose a provider
|
||||||
val providerMap = getProvider()
|
val providerMap = getProvider()
|
||||||
val provider = filters(providerMap)
|
val provider = providers(providerMap)
|
||||||
val challenge = provider.returnChallenge()
|
val challenge = provider.returnChallenge()
|
||||||
val blob = new ByteArrayInputStream(challenge.content)
|
val blob = new ByteArrayInputStream(challenge.content)
|
||||||
val token = scala.util.Random.nextInt(10000).toString
|
val token = scala.util.Random.nextInt(10000).toString
|
||||||
@ -118,7 +118,7 @@ class Captcha(throttle: Int) {
|
|||||||
rs.next()
|
rs.next()
|
||||||
val secret = rs.getString("secret")
|
val secret = rs.getString("secret")
|
||||||
val provider = rs.getString("provider")
|
val provider = rs.getString("provider")
|
||||||
filters(provider).checkAnswer(secret, answer.answer)
|
providers(provider).checkAnswer(secret, answer.answer)
|
||||||
}
|
}
|
||||||
|
|
||||||
def display(): Unit = {
|
def display(): Unit = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user