MyFavMirrors/lc-core
1
0
Fork 0
mirror of https://github.com/librecaptcha/lc-core.git synced 2025-01-27 13:03:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Changed all end points to POST

Browse Source 
Removed serialization of objects to db
Added Map to track providers
This commit is contained in:
Rahul Rudragoudar 2019-02-23 22:11:31 +05:30
parent e52b87d72e
commit 079fa0cd3d
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/lc/FilterChallenge.scala
View File

@ -6,7 +6,7 @@ import java.awt.image.BufferedImage
import java.awt.Font import java.awt.Font
import java.awt.Color import java.awt.Color
class FilterChallenge extends ChallengeProvider with Serializable{ class FilterChallenge extends ChallengeProvider{
val id = "filter" val id = "filter"
def returnChallenge(): (Image, String) = { def returnChallenge(): (Image, String) = {
val filterTypes = List(new FilterType1, new FilterType2) val filterTypes = List(new FilterType1, new FilterType2)

26
src/main/scala/lc/Main.scala
View File

@ -25,11 +25,13 @@ trait ChallengeProvider {
class Captcha { class Captcha {
val con: Connection = DriverManager.getConnection("jdbc:h2:./captcha", "sa", "") val con: Connection = DriverManager.getConnection("jdbc:h2:./captcha", "sa", "")
val stmt: Statement = con.createStatement() val stmt: Statement = con.createStatement()
stmt.execute("CREATE TABLE IF NOT EXISTS challenge(token varchar, id varchar, secret varchar, provider other, image blob)") stmt.execute("CREATE TABLE IF NOT EXISTS challenge(token varchar, id varchar, secret varchar, provider varchar, image blob)")
val insertPstmt: PreparedStatement = con.prepareStatement("INSERT INTO challenge(token, id, secret, provider, image) VALUES (?, ?, ?, ?, ?)") val insertPstmt: PreparedStatement = con.prepareStatement("INSERT INTO challenge(token, id, secret, provider, image) VALUES (?, ?, ?, ?, ?)")
val selectPstmt: PreparedStatement = con.prepareStatement("SELECT secret, provider FROM challenge WHERE token = ?") val selectPstmt: PreparedStatement = con.prepareStatement("SELECT secret, provider FROM challenge WHERE token = ?")
val imagePstmt: PreparedStatement = con.prepareStatement("SELECT image FROM challenge WHERE token = ?") val imagePstmt: PreparedStatement = con.prepareStatement("SELECT image FROM challenge WHERE token = ?")
val filters = Map("FilterChallenge" -> new FilterChallenge)
def getCaptcha(id: Id): Array[Byte] = { def getCaptcha(id: Id): Array[Byte] = {
imagePstmt.setString(1, id.id) imagePstmt.setString(1, id.id)
val rs: ResultSet = imagePstmt.executeQuery() val rs: ResultSet = imagePstmt.executeQuery()
@ -53,7 +55,8 @@ class Captcha {
def getChallenge(param: Parameters): Id = { def getChallenge(param: Parameters): Id = {
//TODO: eval params to choose a provider //TODO: eval params to choose a provider
val provider = new FilterChallenge val providerMap = "FilterChallenge"
val provider = filters(providerMap)
val (image, secret) = provider.returnChallenge() val (image, secret) = provider.returnChallenge()
val blob = convertImage(image) val blob = convertImage(image)
val token = scala.util.Random.nextInt(10000).toString val token = scala.util.Random.nextInt(10000).toString
@ -61,14 +64,15 @@ class Captcha {
insertPstmt.setString(1, token) insertPstmt.setString(1, token)
insertPstmt.setString(2, provider.id) insertPstmt.setString(2, provider.id)
insertPstmt.setString(3, secret) insertPstmt.setString(3, secret)
insertPstmt.setObject(4, provider) insertPstmt.setString(4, providerMap)
insertPstmt.setBlob(5, blob) insertPstmt.setBlob(5, blob)
insertPstmt.executeUpdate() insertPstmt.executeUpdate()
id id
} }
val task = new Runnable { val task = new Runnable {
val provider = new FilterChallenge val providerMap = "FilterChallenge"
val provider = filters(providerMap)
def run(): Unit = { def run(): Unit = {
val (image, secret) = provider.returnChallenge() val (image, secret) = provider.returnChallenge()
val blob = convertImage(image) val blob = convertImage(image)
@ -77,7 +81,7 @@ class Captcha {
insertPstmt.setString(1, token) insertPstmt.setString(1, token)
insertPstmt.setString(2, provider.id) insertPstmt.setString(2, provider.id)
insertPstmt.setString(3, secret) insertPstmt.setString(3, secret)
insertPstmt.setObject(4, provider) insertPstmt.setString(4, providerMap)
insertPstmt.setBlob(5, blob) insertPstmt.setBlob(5, blob)
insertPstmt.executeUpdate() insertPstmt.executeUpdate()
} }
@ -93,8 +97,8 @@ class Captcha {
val rs: ResultSet = selectPstmt.executeQuery() val rs: ResultSet = selectPstmt.executeQuery()
rs.next() rs.next()
val secret = rs.getString("secret") val secret = rs.getString("secret")
val provider = rs.getObject("provider").asInstanceOf[ChallengeProvider] val provider = rs.getString("provider")
provider.checkAnswer(secret, answer.answer) filters(provider).checkAnswer(secret, answer.answer)
} }
def display(): Unit = { def display(): Unit = {
@ -134,7 +138,7 @@ class Server(port: Int){
resp.getHeaders().add("Content-Type","application/json") resp.getHeaders().add("Content-Type","application/json")
resp.send(200, write(id)) resp.send(200, write(id))
0 0
}) },"POST")
host.addContext("/v1/media",(req, resp) => { host.addContext("/v1/media",(req, resp) => {
val body = req.getJson() val body = req.getJson()
@ -144,7 +148,7 @@ class Server(port: Int){
resp.getHeaders().add("Content-Type","image/png") resp.getHeaders().add("Content-Type","image/png")
resp.send(200, image) resp.send(200, image)
0 0
}) },"POST")
host.addContext("/v1/answer",(req, resp) => { host.addContext("/v1/answer",(req, resp) => {
val body = req.getJson() val body = req.getJson()
@ -155,7 +159,7 @@ class Server(port: Int){
val responseContent = if(result) """{"result":"True"}""" else """{"result":"False"}""" val responseContent = if(result) """{"result":"True"}""" else """{"result":"False"}"""
resp.send(200,responseContent) resp.send(200,responseContent)
0 0
}) },"POST")
def start(): Unit = { def start(): Unit = {
server.start() server.start()
@ -168,7 +172,7 @@ object LCFramework{
val captcha = new Captcha() val captcha = new Captcha()
val server = new Server(8888) val server = new Server(8888)
server.start() server.start()
captcha.beginThread(2) //captcha.beginThread(2)
} }
} }