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.

Sign up for GitHub

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

Jump to bottom

Fix IPv6 handling in WOPI allow list #2696

Merged
merged 3 commits into from
Jan 2, 2023
Merged

Fix IPv6 handling in WOPI allow list #2696

merged 3 commits into from
Jan 2, 2023

Conversation

juliushaertl
Copy link
Member

  • fix(wopi): Properly handle single IPv6 addresses in WOPI allow list
  • refactor(wopi): Use symfony/http-foundation util to match ip addresses

Refactoring is kept separate so we can backport the fix to older releases since symfony/http-foundation is only available since 25: nextcloud/3rdparty#1102

Checklist

  • Code is properly formatted
  • Sign-off message is added to all commits
  • Documentation (manuals or wiki) has been updated or is not required

@juliushaertl juliushaertl mentioned this pull request Dec 21, 2022
Closed
@juliushaertl
tests(psalm): Add stub for symfony IpUtils
ce2a935 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl
Copy link
Member Author

juliushaertl commented Jan 2, 2023 •
edited
Loading

ping for review

max-nextcloud
max-nextcloud approved these changes Jan 2, 2023
View reviewed changes
Copy link
Contributor

@max-nextcloud max-nextcloud left a comment

Choose a reason for hiding this comment

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

Looks good.
Tests included... yay!

@juliushaertl juliushaertl merged commit d47ac0a into master Jan 2, 2023
@juliushaertl juliushaertl deleted the bugfix/allow-list-ipv6 branch January 2, 2023 11:40
@juliushaertl
Copy link
Member Author

/backport 016c3ac to stable25

@juliushaertl
Copy link
Member Author

/backport 016c3ac to stable24

@juliushaertl
Copy link
Member Author

/backport 016c3ac to stable23

This was referenced Jan 2, 2023
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@max-nextcloud max-nextcloud max-nextcloud approved these changes

@Raudius Raudius Awaiting requested review from Raudius

@julien-nc julien-nc Awaiting requested review from julien-nc

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@juliushaertl @max-nextcloud