Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2025-12-22 08:23:04 +01:00
Code Issues Projects Releases Wiki Activity

fix(api): epub resources could not be retrieved if komga is running with a servlet context path

Browse source
This commit is contained in:
Gauthier Roebroeck 2023-11-30 09:17:17 +08:00
parent 74210f86c3
commit 0d94ae2c44
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt
View file

@ -78,7 +78,6 @@ import org.springframework.http.MediaType
import org.springframework.http.ResponseEntity
import org.springframework.security.access.prepost.PreAuthorize
import org.springframework.security.core.annotation.AuthenticationPrincipal
import org.springframework.util.AntPathMatcher
import org.springframework.util.MimeTypeUtils
import org.springframework.web.bind.annotation.DeleteMapping
import org.springframework.web.bind.annotation.GetMapping
@ -96,9 +95,7 @@ import org.springframework.web.context.request.ServletWebRequest
import org.springframework.web.context.request.WebRequest
import org.springframework.web.multipart.MultipartFile
import org.springframework.web.server.ResponseStatusException
import org.springframework.web.servlet.HandlerMapping
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody
import org.springframework.web.util.UriUtils
import java.io.FileNotFoundException
import java.io.OutputStream
import java.nio.charset.StandardCharsets.UTF_8
@ -667,15 +664,16 @@ class BookController(
} ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
@GetMapping(
value = ["api/v1/books/{bookId}/resource/**"],
value = ["api/v1/books/{bookId}/resource/{*resource}"],
produces = ["*/*"],
)
fun getBookResource(
request: HttpServletRequest,
@AuthenticationPrincipal principal: KomgaPrincipal?,
@PathVariable bookId: String,
@PathVariable resource: String,
): ResponseEntity<ByteArray> {
val resourceName = AntPathMatcher().extractPathWithinPattern(request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE) as String, request.requestURI).let { UriUtils.decode(it, UTF_8) }
val resourceName = resource.removePrefix("/")
val isFont = FONT_EXTENSIONS.contains(FilenameUtils.getExtension(resourceName).lowercase())
if (!isFont && principal == null) throw ResponseStatusException(HttpStatus.UNAUTHORIZED)

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/PageHashController.kt
View file

@ -87,7 +87,7 @@ class PageHashController(
pageHashLifecycle.getPage(pageHash, resize)?.let {
ResponseEntity.ok()
.contentType(getMediaTypeOrDefault(it.mediaType))
.body(it.bytes)
.body(it.bytes)
} ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
@PutMapping

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TransientBooksController.kt
View file

@ -71,7 +71,7 @@ class TransientBooksController(
ResponseEntity.ok()
.contentType(getMediaTypeOrDefault(pageContent.mediaType))
.body(pageContent.bytes)
.body(pageContent.bytes)
} catch (ex: IndexOutOfBoundsException) {
throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Page number does not exist")
} catch (ex: MediaNotReadyException) {