KTOR-7470 receiveMultipart throw UnsupportedMediaTypeException #4339
Conversation
stokado
changed the title
|
@marychatte, could you check? |
stokado
force-pushed
the
issue/KTOR-7470
branch
from
cc81b68 to
5735df8
Compare
| contentLength, | ||
| call.formFieldLimit | ||
| ) | ||
| } catch (_: IOException) { |
There was a problem hiding this comment.
Why do we need try-catch here? It's a constructor method
There was a problem hiding this comment.
We do not have an access to UnsupportedMediaTypeException in CIO module
I had to catch an exception on the server and rethrow it here, it is the latest server code before CIO module
This should answer this question
There was a problem hiding this comment.
Thanks. Can we add a check that the exception message contains "Content-Type " because another IOException also thrown
There was a problem hiding this comment.
I've added this check, but maybe there could be a way to add UnsupportedMediaTypeException to CIO module or create separate Exception for the Unsupported Media errors in CIO?
Not sure if it is a common practice to define catch logic based on exception's message
There was a problem hiding this comment.
Unfortunately, adding UnsupportedMediaTypeException to CIO module is a breaking change so can we please create a new Exception in CIO module UnsupportedMediaTypeExceptionCIO and catch it in DefaultTransformJvm?
| private val contentType: ContentType? | ||
| ) : ContentTransformationException( | ||
| contentType?.let { "Content type $it is not supported" } | ||
| ?: "Content-Type header is required for multipart processing" |
There was a problem hiding this comment.
Content-Type header may be required not only for multipart requests, we can remove this part
| @@ -33,16 +35,21 @@ internal actual suspend fun PipelineContext<Any, PipelineCall>.defaultPlatformTr | |||
| @OptIn(InternalAPI::class) | |||
| internal actual fun PipelineContext<*, PipelineCall>.multiPartData(rc: ByteReadChannel): MultiPartData { | |||
| val contentType = call.request.header(HttpHeaders.ContentType) | |||
| ?: throw IllegalStateException("Content-Type header is required for multipart processing") | |||
| ?: throw UnsupportedMediaTypeException(null) | |||
There was a problem hiding this comment.
There is also one more place, where exception is thrown - CIO:
1)
2)
Can we please fix it too?
|
Сan we please create a new Exception in CIO module |
Of course, I will update the PR this week. I was not able to do it earlier :) |
marychatte
force-pushed
the
issue/KTOR-7470
branch
from
5324ecd to
814cea1
Compare
| @@ -697,7 +697,7 @@ final class io.ktor.server.plugins/PayloadTooLargeException : io.ktor.server.plu | |||
| } | |||
|
|
|||
| final class io.ktor.server.plugins/UnsupportedMediaTypeException : io.ktor.server.plugins/ContentTransformationException, kotlinx.coroutines/CopyableThrowable<io.ktor.server.plugins/UnsupportedMediaTypeException> { // io.ktor.server.plugins/UnsupportedMediaTypeException|null[0] | |||
| constructor <init>(io.ktor.http/ContentType) // io.ktor.server.plugins/UnsupportedMediaTypeException.<init>|<init>(io.ktor.http.ContentType){}[0] | |||
| constructor <init>(io.ktor.http/ContentType?) // io.ktor.server.plugins/UnsupportedMediaTypeException.<init>|<init>(io.ktor.http.ContentType?){}[0] | |||
There was a problem hiding this comment.
Unfortunately, this change is not binary compatible. Could you add a constructor with an old signature?
There was a problem hiding this comment.
I've added constructor with an old signature
How can I run an apiDump task now?
There was a problem hiding this comment.
I could not run apiDump task on my Windows PC because ios subtasks are failing
There was a problem hiding this comment.
We discussed it with @osipxd and it's binary compatible, I reverted the last commit and will merge the PR
marychatte
force-pushed
the
issue/KTOR-7470
branch
from
00f2704 to
1dfb333
Compare
Subsystem
Server, related modules
Motivation
Return 415 Unsupported Media-Type if client passed the wrong Content-Type header or didn't pass any value at all. KTOR-7470
Solution
Given no Content-Type header, throw UnsupportedMediaTypeException with corresponding message.
Given bad Content-Type header, rethrow UnsupportedMediaTypeException.