arcanis/ffxivbis
1
0
Fork 0
mirror of https://github.com/arcan1s/ffxivbis.git synced 2025-11-04 07:03:41 +00:00
Code Issues Projects Releases Wiki Activity

fix auth generation and blocked https->http requests

Browse Source
This commit is contained in:
Evgenii Alekseev
2022-01-21 03:06:51 +03:00
parent ec2cfaea38
commit 8496d105c0
7 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/reference.conf
View File

@ -50,6 +50,7 @@ me.arcanis.ffxivbis {
#hostname = "127.0.0.1:8000" #hostname = "127.0.0.1:8000"
# enable head requests for GET requests # enable head requests for GET requests
enable-head-requests = yes enable-head-requests = yes
schemes = ["http"]
authorization-cache { authorization-cache {
# maximum amount of cached logins # maximum amount of cached logins

5
src/main/scala/me/arcanis/ffxivbis/http/Swagger.scala
View File

@ -14,6 +14,7 @@ import com.typesafe.config.Config
import io.swagger.v3.oas.models.security.SecurityScheme import io.swagger.v3.oas.models.security.SecurityScheme
import scala.io.Source import scala.io.Source
import scala.jdk.CollectionConverters._
class Swagger(config: Config) extends SwaggerHttpService { class Swagger(config: Config) extends SwaggerHttpService {
@ -38,12 +39,14 @@ class Swagger(config: Config) extends SwaggerHttpService {
if (config.hasPath("me.arcanis.ffxivbis.web.hostname")) config.getString("me.arcanis.ffxivbis.web.hostname") if (config.hasPath("me.arcanis.ffxivbis.web.hostname")) config.getString("me.arcanis.ffxivbis.web.hostname")
else s"${config.getString("me.arcanis.ffxivbis.web.host")}:${config.getInt("me.arcanis.ffxivbis.web.port")}" else s"${config.getString("me.arcanis.ffxivbis.web.host")}:${config.getInt("me.arcanis.ffxivbis.web.port")}"
override val schemes: List[String] = config.getStringList("me.arcanis.ffxivbis.web.schemes").asScala.toList
private val basicAuth = new SecurityScheme() private val basicAuth = new SecurityScheme()
.description("basic http auth") .description("basic http auth")
.`type`(SecurityScheme.Type.HTTP) .`type`(SecurityScheme.Type.HTTP)
.in(SecurityScheme.In.HEADER) .in(SecurityScheme.In.HEADER)
.scheme("basic") .scheme("basic")
override val securitySchemes: Map[String, SecurityScheme] = Map("auth" -> basicAuth) override val securitySchemes: Map[String, SecurityScheme] = Map("basic" -> basicAuth)
override val unwantedDefinitions: Seq[String] = override val unwantedDefinitions: Seq[String] =
Seq("Function1", "Function1RequestContextFutureRouteResult") Seq("Function1", "Function1RequestContextFutureRouteResult")

6
src/main/scala/me/arcanis/ffxivbis/http/api/v1/BiSEndpoint.scala
View File

@ -79,7 +79,7 @@ class BiSEndpoint(
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("post"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("post"))),
tags = Array("best in slot"), tags = Array("best in slot"),
) )
def createBiS: Route = def createBiS: Route =
@ -140,7 +140,7 @@ class BiSEndpoint(
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("get"))),
tags = Array("best in slot"), tags = Array("best in slot"),
) )
def getBiS: Route = def getBiS: Route =
@ -197,7 +197,7 @@ class BiSEndpoint(
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("post"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("post"))),
tags = Array("best in slot"), tags = Array("best in slot"),
) )
def modifyBiS: Route = def modifyBiS: Route =

6
src/main/scala/me/arcanis/ffxivbis/http/api/v1/LootEndpoint.scala
View File

@ -81,7 +81,7 @@ class LootEndpoint(override val storage: ActorRef[Message], override val auth: A
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("get"))),
tags = Array("loot"), tags = Array("loot"),
) )
def getLoot: Route = def getLoot: Route =
@ -137,7 +137,7 @@ class LootEndpoint(override val storage: ActorRef[Message], override val auth: A
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("post"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("post"))),
tags = Array("loot"), tags = Array("loot"),
) )
def modifyLoot: Route = def modifyLoot: Route =
@ -202,7 +202,7 @@ class LootEndpoint(override val storage: ActorRef[Message], override val auth: A
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("get"))),
tags = Array("loot"), tags = Array("loot"),
) )
def suggestLoot: Route = def suggestLoot: Route =

4
src/main/scala/me/arcanis/ffxivbis/http/api/v1/PartyEndpoint.scala
View File

@ -73,7 +73,7 @@ class PartyEndpoint(
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("get"))),
tags = Array("party"), tags = Array("party"),
) )
def getPartyDescription: Route = def getPartyDescription: Route =
@ -126,7 +126,7 @@ class PartyEndpoint(
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("post"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("post"))),
tags = Array("party"), tags = Array("party"),
) )
def modifyPartyDescription: Route = def modifyPartyDescription: Route =

6
src/main/scala/me/arcanis/ffxivbis/http/api/v1/PlayerEndpoint.scala
View File

@ -85,7 +85,7 @@ class PlayerEndpoint(
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("get"))),
tags = Array("party"), tags = Array("party"),
) )
def getParty: Route = def getParty: Route =
@ -146,7 +146,7 @@ class PlayerEndpoint(
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("get"))),
tags = Array("party"), tags = Array("party"),
) )
def getPartyStats: Route = def getPartyStats: Route =
@ -202,7 +202,7 @@ class PlayerEndpoint(
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("post"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("post"))),
tags = Array("party"), tags = Array("party"),
) )
def modifyParty: Route = def modifyParty: Route =

8
src/main/scala/me/arcanis/ffxivbis/http/api/v1/UserEndpoint.scala
View File

@ -126,7 +126,7 @@ class UserEndpoint(override val storage: ActorRef[Message], override val auth: A
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("admin"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("admin"))),
tags = Array("users"), tags = Array("users"),
) )
def createUser: Route = def createUser: Route =
@ -172,7 +172,7 @@ class UserEndpoint(override val storage: ActorRef[Message], override val auth: A
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("admin"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("admin"))),
tags = Array("users"), tags = Array("users"),
) )
def deleteUser: Route = def deleteUser: Route =
@ -223,7 +223,7 @@ class UserEndpoint(override val storage: ActorRef[Message], override val auth: A
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("get"))),
tags = Array("users"), tags = Array("users"),
) )
def getUsers: Route = def getUsers: Route =
@ -270,7 +270,7 @@ class UserEndpoint(override val storage: ActorRef[Message], override val auth: A
content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel]))) content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
), ),
), ),
security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("admin"))), security = Array(new SecurityRequirement(name = "basic", scopes = Array("admin"))),
tags = Array("users"), tags = Array("users"),
) )
def getUsersCurrent: Route = def getUsersCurrent: Route =