Skip to content

Improve local IP detection#33031

Merged
come-nc merged 4 commits intomasterfrom
fix/improve-local-ip-detection
Jul 26, 2022
Merged

Improve local IP detection#33031
come-nc merged 4 commits intomasterfrom
fix/improve-local-ip-detection

Conversation

@come-nc
Copy link
Contributor

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

Signed-off-by: Côme Chilliet come.chilliet@nextcloud.com

@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

come-nc added 3 commits July 12, 2022 09:49
@come-nc
Improve local IP detection
bd9aff4 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Refactor local IP if and set strict to true for in_array
d083043 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Check for local IPs nested in IPv6 as well
707b46b 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@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

@come-nc
Use Symfony IpUtils to check for local IP ranges
c5ffd7c 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@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.

6 participants

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