Skip to content

Improve local IP detection #33031

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
Merged
come-nc merged 4 commits into from
Jul 26, 2022
Merged

Improve local IP detection #33031

come-nc merged 4 commits into from
Jul 26, 2022

Conversation

@come-nc
Copy link
Contributor

@come-nc come-nc commented Jun 27, 2022

Signed-off-by: Côme Chilliet [email protected]

@come-nc come-nc added the 3. to review Waiting for reviews label Jun 27, 2022
@come-nc come-nc added this to the Nextcloud 25 milestone Jun 27, 2022
@come-nc come-nc requested a review from a team June 27, 2022 14:50
@come-nc come-nc self-assigned this Jun 27, 2022
@come-nc come-nc requested review from ArtificialOwl, PVince81 and icewind1991 and removed request for a team June 27, 2022 14:50
@come-nc
Copy link
Contributor Author

come-nc commented Jun 27, 2022

/backport to stable24

@come-nc
Copy link
Contributor Author

come-nc commented Jun 27, 2022

/backport to stable23

@come-nc
Copy link
Contributor Author

come-nc commented Jun 27, 2022

/backport to stable22

@come-nc come-nc force-pushed the fix/improve-local-ip-detection branch from ee4fba1 to f1037b9 Compare June 27, 2022 15:14
tcitworld
tcitworld reviewed Jun 27, 2022
View reviewed changes
ChristophWurst
ChristophWurst approved these changes Jun 27, 2022
View reviewed changes
@come-nc come-nc requested a review from tcitworld June 28, 2022 09:36
@kesselb
Copy link
Contributor

kesselb commented Jun 28, 2022

Does it make sense to add the $localIps check to

server/lib/private/Http/Client/LocalAddressChecker.php

Line 55 in 0c04991

if (!filter_var($ipv4Address, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
as well?

@come-nc
Copy link
Contributor Author

come-nc commented Jun 28, 2022

Good catch, I suppose it makes sense

icewind1991
icewind1991 requested changes Jun 29, 2022
View reviewed changes
@come-nc come-nc mentioned this pull request Jul 12, 2022
Merged
@come-nc
Copy link
Contributor Author

come-nc commented Jul 12, 2022

/rebase

@nextcloud-command nextcloud-command force-pushed the fix/improve-local-ip-detection branch from ae30410 to 707b46b Compare July 12, 2022 09:49
@github-actions
Copy link
Contributor

github-actions bot commented Jul 12, 2022

Possible performance regression detected

Show Output 
1 queries added

≠ /remote.php/dav/files/test with 1 queries added
  + UPDATE "oc_preferences" SET "configvalue" = :dcValue1 WHERE ("userid" = :dcValue2) AND ("appid" = :dcValue3) AND ("configkey" = :dcValue4)
= /remote.php/dav/files/test/test.txt
= /remote.php/dav/files/test/many_files
= /remote.php/dav/files/test/new_file.txt
= /remote.php/dav/files/test/new_file.txt

@github-actions
Copy link
Contributor

github-actions bot commented Jul 12, 2022

Possible performance regression detected

Show Output 
2 queries added

≠ /remote.php/dav/files/test with 1 queries added
  + UPDATE "oc_preferences" SET "configvalue" = :dcValue1 WHERE ("userid" = :dcValue2) AND ("appid" = :dcValue3) AND ("configkey" = :dcValue4)
≠ /remote.php/dav/files/test/test.txt with 1 queries removed
  - UPDATE "oc_preferences" SET "configvalue" = :dcValue1 WHERE ("userid" = :dcValue2) AND ("appid" = :dcValue3) AND ("configkey" = :dcValue4)
≠ /remote.php/dav/files/test/many_files with 1 queries added
  + UPDATE "oc_preferences" SET "configvalue" = :dcValue1 WHERE ("userid" = :dcValue2) AND ("appid" = :dcValue3) AND ("configkey" = :dcValue4)
= /remote.php/dav/files/test/new_file.txt
≠ /remote.php/dav/files/test/new_file.txt with 1 queries added
  + UPDATE "oc_preferences" SET "configvalue" = :dcValue1 WHERE ("userid" = :dcValue2) AND ("appid" = :dcValue3) AND ("configkey" = :dcValue4)

@come-nc come-nc merged commit 7615536 into master Jul 26, 2022
@come-nc come-nc deleted the fix/improve-local-ip-detection branch July 26, 2022 09:39
This was referenced Jul 26, 2022
Merged
Merged
Merged
@skjnldsv skjnldsv mentioned this pull request Aug 11, 2022
Merged
@kesselb kesselb mentioned this pull request Aug 29, 2022
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@CarlSchwan CarlSchwan CarlSchwan approved these changes

@PVince81 PVince81 Awaiting requested review from PVince81

@ArtificialOwl ArtificialOwl Awaiting requested review from ArtificialOwl

@tcitworld tcitworld Awaiting requested review from tcitworld

@icewind1991 icewind1991 Awaiting requested review from icewind1991

Assignees

@come-nc come-nc

Labels

3. to review Waiting for reviews

Projects

None yet

Milestone

Nextcloud 25

Development

Successfully merging this pull request may close these issues.

7 participants

@come-nc @kesselb @icewind1991 @ChristophWurst @tcitworld @CarlSchwan