Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PPS-588 add guppy csrf #2430

Merged
merged 4 commits into from
Jan 10, 2024
Merged

PPS-588 add guppy csrf #2430

merged 4 commits into from
Jan 10, 2024

Conversation

mfshao
Copy link
Contributor

@mfshao mfshao commented Dec 15, 2023

Jira Ticket: PPS-588

Improvements

  • Add CSRF protection for Guppy paths

Deployment changes

  • After merging this, envs must use a data-portal version that contains PPS-588 guppy csrf data-portal#1464. Otherwise the communication between portal and guppy will be interrupted

Copy link
Contributor

@MaribelleHGomez MaribelleHGomez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@@ -1,4 +1,8 @@
location /guppy/ {
if ($csrf_check !~ ^ok-\S.+$) {
Copy link
Contributor

@paulineribeyre paulineribeyre Dec 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't think we can't merge this 🤔 like you mentioned in the PR description, all the data commons that don't have the latest data-portal and guppy will fail... we need to somehow make this conditional based on the deployed version of portal and guppy, or leave it out for now and merge it in a few months once everyone has deployed the new portal and guppy.

But iirc we need this for a security ticket? if there's a deadline we might have to make everyone upgrade portal and guppy. Not great right before we all go on break 😬 can it be pushed to Jan, or even Feb when the change is included in 2024.02?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that is true, the process we have formulized is not to merge this right away. The Guppy and Portal changes will be merged, and then the Portal changes will be cherry-picked into the 2023.12 release (no need to update Guppy since the Guppy changes are purely frontend). And Elise will continue her work on updating envs to ES7, which will bring all these envs to Portal 2023.12. After that we then we will merge this cloud-auto PR and re-roll Portal in those envs

@@ -1,4 +1,8 @@
location /guppy/ {
if ($csrf_check !~ ^ok-\S.+$) {
return 403 "failed csrf check";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe this could say "failed csrf check. Make sure to use guppy version >=x and data-portal version >=y"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call, I can update this

@EliseCastle23 EliseCastle23 merged commit b859d3f into master Jan 10, 2024
11 checks passed
@EliseCastle23 EliseCastle23 deleted the fix/guppy-csrf branch January 10, 2024 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants