Skip to content
Snippets Groups Projects
Unverified Commit 3e93ddde authored by Frederik Ar. Mikkelsen's avatar Frederik Ar. Mikkelsen Committed by GitHub
Browse files

Merge pull request #208 from Devoxin/dev

Return 401/Unauthorized on failed WebSocket Auth
parents b3cb671d d6b5256b
No related branches found
No related tags found
No related merge requests found
......@@ -4,6 +4,7 @@ import lavalink.server.config.ServerConfig
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.http.HttpStatus
import org.springframework.http.server.ServerHttpRequest
import org.springframework.http.server.ServerHttpResponse
import org.springframework.stereotype.Controller
......@@ -26,8 +27,6 @@ constructor(private val serverConfig: ServerConfig, private val socketServer: So
*/
override fun beforeHandshake(request: ServerHttpRequest, response: ServerHttpResponse, wsHandler: WebSocketHandler,
attributes: Map<String, Any>): Boolean {
response.headers.add("Lavalink-Major-Version", "3")
val password = request.headers.getFirst("Authorization")
val matches = password == serverConfig.password
......@@ -35,6 +34,7 @@ constructor(private val serverConfig: ServerConfig, private val socketServer: So
log.info("Incoming connection from " + request.remoteAddress)
} else {
log.error("Authentication failed from " + request.remoteAddress)
response.setStatusCode(HttpStatus.UNAUTHORIZED)
}
val resumeKey = request.headers.getFirst("Resume-Key")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment