Windy/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2025-01-07 03:07:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: address deprecations

Browse Source
This commit is contained in:
Gauthier Roebroeck 2024-12-13 10:36:33 +08:00
parent a7ae8c75b3
commit 225f58f81c
8 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/configuration/KomgaSettingsProvider.kt
View File

@ -39,7 +39,7 @@ class KomgaSettingsProvider(
rememberMeKey = getRandomRememberMeKey()
}
private fun getRandomRememberMeKey() = RandomStringUtils.randomAlphanumeric(32)
private fun getRandomRememberMeKey() = RandomStringUtils.secure().nextAlphanumeric(32)
var rememberMeDuration: Duration =
(serverSettingsDao.getSettingByKey(Settings.REMEMBER_ME_DURATION.name, Int::class.java) ?: 365).days

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/JooqConfiguration.kt → komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/KomgaJooqConfiguration.kt
View File

@ -18,7 +18,7 @@ import javax.sql.DataSource
// taken from https://github.com/spring-projects/spring-boot/blob/v3.1.4/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfiguration.java
// as advised in https://docs.spring.io/spring-boot/docs/3.1.4/reference/htmlsingle/#howto.data-access.configure-jooq-with-multiple-datasources
@Configuration
class JooqConfiguration {
class KomgaJooqConfiguration {
@Bean("dslContext")
@Primary
fun mainDslContext(

13
komga/src/main/kotlin/org/gotson/komga/infrastructure/kobo/KoboProxy.kt
View File

@ -7,11 +7,12 @@ import org.gotson.komga.infrastructure.configuration.KomgaSettingsProvider
import org.gotson.komga.infrastructure.kobo.KoboHeaders.X_KOBO_SYNCTOKEN
import org.gotson.komga.infrastructure.web.getCurrentRequest
import org.gotson.komga.language.contains
import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings
import org.springframework.http.HttpHeaders
import org.springframework.http.HttpMethod
import org.springframework.http.HttpStatusCode
import org.springframework.http.ResponseEntity
import org.springframework.http.client.ReactorNettyClientRequestFactory
import org.springframework.stereotype.Component
import org.springframework.util.LinkedMultiValueMap
import org.springframework.web.client.RestClient
@ -32,11 +33,11 @@ class KoboProxy(
RestClient.builder()
.baseUrl("https://storeapi.kobo.com")
.requestFactory(
ReactorNettyClientRequestFactory().apply {
setConnectTimeout(1.minutes.toJavaDuration())
setReadTimeout(1.minutes.toJavaDuration())
setExchangeTimeout(1.minutes.toJavaDuration())
},
ClientHttpRequestFactoryBuilder.reactor().build(
ClientHttpRequestFactorySettings.defaults()
.withReadTimeout(1.minutes.toJavaDuration())
.withConnectTimeout(1.minutes.toJavaDuration()),
),
)
.build()

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/security/oauth2/KomgaOAuth2UserServiceConfiguration.kt
View File

@ -73,7 +73,7 @@ class KomgaOAuth2UserServiceConfiguration(
private fun tryCreateNewUser(email: String) =
if (komgaProperties.oauth2AccountCreation) {
logger.info { "Creating new user from OAuth2 login: $email" }
userLifecycle.createUser(KomgaUser(email, RandomStringUtils.randomAlphanumeric(12), roleAdmin = false))
userLifecycle.createUser(KomgaUser(email, RandomStringUtils.secure().nextAlphanumeric(12), roleAdmin = false))
} else {
throw OAuth2AuthenticationException("ERR_1025")
}

6
komga/src/main/kotlin/org/gotson/komga/interfaces/api/kobo/KoboController.kt
View File

@ -228,8 +228,8 @@ class KoboController(
* Return dummy data to keep the device happy.
*/
return AuthDto(
accessToken = RandomStringUtils.randomAlphanumeric(24),
refreshToken = RandomStringUtils.randomAlphanumeric(24),
accessToken = RandomStringUtils.secure().nextAlphanumeric(24),
refreshToken = RandomStringUtils.secure().nextAlphanumeric(24),
trackingId = UUID.randomUUID().toString(),
userKey = body.get("UserKey")?.asText() ?: "",
)
@ -688,7 +688,7 @@ class KoboController(
if (!thumbnailBookRepository.existsById(thumbnailId) && koboProxy.isEnabled()) {
ResponseEntity
.status(HttpStatus.TEMPORARY_REDIRECT)
.location(UriComponentsBuilder.fromHttpUrl(koboProxy.imageHostUrl).buildAndExpand(thumbnailId, width, height).toUri())
.location(UriComponentsBuilder.fromUriString(koboProxy.imageHostUrl).buildAndExpand(thumbnailId, width, height).toUri())
.build()
} else {
val poster = bookLifecycle.getThumbnailBytesByThumbnailId(thumbnailId) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/v2/Opds2Controller.kt
View File

@ -416,7 +416,7 @@ class Opds2Controller(
@PathVariable(name = "id", required = false) libraryId: String?,
@Parameter(hidden = true) page: Pageable,
): FeedDto {
val (library, authorizedLibraryIds) = checkLibraryAccess(libraryId, principal)
val (library, _) = checkLibraryAccess(libraryId, principal)
val entries =
seriesDtoRepository.findAll(

2
komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/InitialUserController.kt
View File

@ -50,6 +50,6 @@ class InitialUsersProdConfiguration {
@Bean
fun initialUsers(): List<KomgaUser> =
listOf(
KomgaUser("admin@example.org", RandomStringUtils.randomAlphanumeric(12), roleAdmin = true),
KomgaUser("admin@example.org", RandomStringUtils.secure().nextAlphanumeric(12), roleAdmin = true),
)
}

2
komga/src/main/resources/application.yml
View File

@ -76,7 +76,7 @@ management:
roles: ADMIN
show-details: when_authorized
shutdown:
enabled: true
access: unrestricted
info:
java:
enabled: true