fix: Configure CORS correctly

This commit is contained in:
oSumAtrIX 2024-07-11 03:50:48 +02:00
parent a7666ba29d
commit 2ed4cf3b40
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
3 changed files with 14 additions and 21 deletions

View File

@ -10,5 +10,8 @@ contributors-repositories = [
"revanced-manager",
]
api-version = 1
cors = { host = "*.revanced.app", sub-domains = [] }
endpoint = "https://api.revanced.app"
cors-allowed-hosts = [
"revanced.app",
"*.revanced.app"
]
endpoint = "https://api.revanced.app"

View File

@ -13,10 +13,12 @@ fun Application.configureHTTP() {
val configurationRepository = get<ConfigurationRepository>()
install(CORS) {
allowHost(
host = configurationRepository.cors.host,
subDomains = configurationRepository.cors.subDomains,
)
configurationRepository.corsAllowedHosts.forEach { host ->
allowHost(
host = host,
schemes = listOf("http", "https")
)
}
}
install(RateLimit) {

View File

@ -19,7 +19,7 @@ import java.io.File
* @property integrations The source of the integrations.
* @property contributorsRepositoryNames The names of the repositories to get contributors from.
* @property apiVersion The version to use for the API.
* @property cors The CORS configuration.
* @property corsAllowedHosts The hosts allowed to make requests to the API.
* @property endpoint The endpoint of the API.
*/
@Serializable
@ -31,7 +31,8 @@ internal class ConfigurationRepository(
val contributorsRepositoryNames: Set<String>,
@SerialName("api-version")
val apiVersion: Int = 1,
val cors: Cors,
@SerialName("cors-allowed-hosts")
val corsAllowedHosts: Set<String>,
val endpoint: String,
) {
/**
@ -61,19 +62,6 @@ internal class ConfigurationRepository(
@SerialName("public-key-file")
val publicKeyFile: File,
)
/**
* The CORS configuration.
*
* @property host The host of the API to configure CORS.
* @property subDomains The subdomains to allow for CORS.
*/
@Serializable
internal class Cors(
val host: String,
@SerialName("sub-domains")
val subDomains: List<String>,
)
}
private object RegexSerializer : KSerializer<Regex> {