Skip to content

CsrfWebFilter null save content-type check#11205

Merged
rwinch merged 1 commit into
spring-projects:mainfrom
ZhivkoDelchev:gh-11204-fix-npe-on-no-content
Jun 6, 2022
Merged

CsrfWebFilter null save content-type check#11205
rwinch merged 1 commit into
spring-projects:mainfrom
ZhivkoDelchev:gh-11204-fix-npe-on-no-content

Conversation

@ZhivkoDelchev

Copy link
Copy Markdown
Contributor

When MultipartFormData is enabled currently the CsrfWebFilter compares
the content-type header against MULTIPART_FORM_DATA MediaType which
leads to NullPointerExecption when there is no content-type header.
This change reverse the check to compare the MULTIPART_FORM_DATA
MediaType against the content-type which contains null check and avoids
the exception.

Closes gh-11204

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label May 12, 2022
@rwinch rwinch added in: web An issue in web modules (web, webmvc) and removed status: waiting-for-triage An issue we've not yet triaged labels May 17, 2022
@rwinch rwinch self-assigned this May 17, 2022
@rwinch rwinch added the type: bug A general bug label May 17, 2022
@rwinch rwinch changed the title Reverse content type check CsrfWebFilter null save content-type check May 17, 2022
@rwinch rwinch added this to the 6.0.0-M6 milestone Jun 2, 2022
When MultipartFormData is enabled currently the CsrfWebFilter compares
the content-type header against MULTIPART_FORM_DATA MediaType which
leads to NullPointerExecption when there is no content-type header.
This commit reverse the check to compare the MULTIPART_FORM_DATA
MediaType against the content-type which contains null check and avoids
the exception.

closes spring-projectsgh-11204
@ZhivkoDelchev ZhivkoDelchev force-pushed the gh-11204-fix-npe-on-no-content branch from 55ce995 to c4e286e Compare June 5, 2022 13:00
@ZhivkoDelchev

Copy link
Copy Markdown
Contributor Author

Formatting issue fixed.

@rwinch rwinch merged commit 1483a57 into spring-projects:main Jun 6, 2022
rwinch pushed a commit that referenced this pull request Jun 6, 2022
When MultipartFormData is enabled currently the CsrfWebFilter compares
the content-type header against MULTIPART_FORM_DATA MediaType which
leads to NullPointerExecption when there is no content-type header.
This commit reverse the check to compare the MULTIPART_FORM_DATA
MediaType against the content-type which contains null check and avoids
the exception.

closes gh-11204
Closes gh-11205
rwinch pushed a commit that referenced this pull request Jun 6, 2022
When MultipartFormData is enabled currently the CsrfWebFilter compares
the content-type header against MULTIPART_FORM_DATA MediaType which
leads to NullPointerExecption when there is no content-type header.
This commit reverse the check to compare the MULTIPART_FORM_DATA
MediaType against the content-type which contains null check and avoids
the exception.

closes gh-11204
Closes gh-11205
rwinch pushed a commit that referenced this pull request Jun 6, 2022
When MultipartFormData is enabled currently the CsrfWebFilter compares
the content-type header against MULTIPART_FORM_DATA MediaType which
leads to NullPointerExecption when there is no content-type header.
This commit reverse the check to compare the MULTIPART_FORM_DATA
MediaType against the content-type which contains null check and avoids
the exception.

closes gh-11204
Closes gh-11205
@rwinch

rwinch commented Jun 6, 2022

Copy link
Copy Markdown
Member

Thanks for the Pull Request @ZhivkoDelchev! This is now merged into main 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

in: web An issue in web modules (web, webmvc) type: bug A general bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CsrfWebFilter null save content-type check

3 participants