Uh oh!
There was an error while loading. Please reload this page.
fix: make federation address book sync work with allow_local_remote_servers = false - #48451
Merged
kesselb merged 2 commits intoOct 1, 2024
Conversation
kesselbforce-pushed
the
bug/noid/federated-addressbook-sync-without-localaddressallowed
branch
from
September 30, 2024 11:09
f4d1897 to
c7f8a9fComparekesselb
marked this pull request as ready for review
September 30, 2024 11:12
kesselb
requested review from
ChristophWurst, miaulalala and tcitworld
as code ownersSeptember 30, 2024 11:12
kesselb
commented
Sep 30, 2024
| 'auth' => [$userName, $sharedSecret], | ||
| 'base_uri' => $url, | ||
| 'body' => $this->buildSyncCollectionRequestBody($syncToken), | ||
| 'headers' => ['Content-Type' => 'application/xml'] |
ContributorAuthor
There was a problem hiding this comment.
We could also add 'nextcloud' => ['allow_local_address' => true], to always allow private IP ranges for address book federation. But we should also enable it for the initial handshake then, and therefore that's something for a follow-up.
kesselbforce-pushed
the
bug/noid/federated-addressbook-sync-without-localaddressallowed
branch
from
September 30, 2024 12:15
c7f8a9f to
a16eb6cCompareContributorAuthor
ClientTest is failing: The above URL is invalid, and guzzle/curl will reject it with:
If we keep a16eb6c, then the notable change is that the request is just rejected a bit earlier. Though, it might be nicer to use a different/new exception for it. Opinions? |
come-nc
approved these changes
Sep 30, 2024
ChristophWurst
approved these changes
Sep 30, 2024
kesselbforce-pushed
the
bug/noid/federated-addressbook-sync-without-localaddressallowed
branch
from
October 1, 2024 15:55
a16eb6c to
5576f05Compare…ervers = false Client.preventLocalAddress expects an absolute URL, which means the base_uri option cannot be used. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This change should make it easier to spot wrong uses of the HTTP client on development setups where allow_local_remote_servers is usually true. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselbforce-pushed
the
bug/noid/federated-addressbook-sync-without-localaddressallowed
branch
from
October 1, 2024 16:00
5576f05 to
6be0043Comparekesselb
deleted the
bug/noid/federated-addressbook-sync-without-localaddressallowed
branch
October 1, 2024 18:41
kesselb
commented
Oct 1, 2024
ContributorAuthor
/backport 8708164 to stable30 |
kesselb
commented
Oct 1, 2024
ContributorAuthor
/backport 8708164 to stable29 |
1 task
1 task
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Client.preventLocalAddress expects an absolute URL, which means the base_uri option cannot be used.
Regression from #46002
TODO
Checklist