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(federation): give some time to prepare both servers #44771

Merged
merged 1 commit into from
Apr 11, 2024
Merged

fix(federation): give some time to prepare both servers #44771

merged 1 commit into from
Apr 11, 2024

Conversation

blizzz
Copy link
Member

@blizzz blizzz commented Apr 10, 2024 •
edited
Loading

Summary

  • when this background job runs, while the current server was not being added as trusted_server in the other instance, yet, the secret sharing would not be attempted again, without visual feedback.
  • the change allows 5 attempts, which gives more than 20minutes to complete. More do not really help as the endpoint is brute force protected.

Checklist

@blizzz blizzz added this to the Nextcloud 30 milestone Apr 10, 2024
@blizzz blizzz requested review from nickvergessen, Fenn-CS, a team, icewind1991 and yemkareems and removed request for a team April 10, 2024 19:51
@blizzz blizzz mentioned this pull request Apr 10, 2024
Closed
8 tasks
@blizzz blizzz force-pushed the fix/39941/fed-trusted-race-condition branch 2 times, most recently from 3c29f5e to faf6a65 Compare April 11, 2024 08:48
@blizzz
fix(federation): give some time to prepare both servers
faf6a65 
- when this background job runs, while the current server was not being
  added as trusted_server in the other instance, yet, the secret sharing
  would not be attempted again, without visual feedback.
- the change allows 5 attempts, which gives more than 20minutes to
  complete. More do not really help as the endpoint is brute force
  protected.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@nickvergessen nickvergessen merged commit 6041c7f into master Apr 11, 2024
157 checks passed
@nickvergessen nickvergessen deleted the fix/39941/fed-trusted-race-condition branch April 11, 2024 09:32
@blizzz
Copy link
Member Author

blizzz commented Apr 11, 2024

/backport to stable29

@blizzz
Copy link
Member Author

blizzz commented Apr 11, 2024

/backport to stable28

@backportbot backportbot bot mentioned this pull request Apr 11, 2024
Merged
@backportbot backportbot bot mentioned this pull request Apr 11, 2024
Merged
@blizzz blizzz mentioned this pull request Jul 24, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickvergessen nickvergessen nickvergessen approved these changes

@Fenn-CS Fenn-CS Fenn-CS approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991 icewind1991 was automatically assigned from nextcloud/server-backend

@yemkareems yemkareems Awaiting requested review from yemkareems yemkareems was automatically assigned from nextcloud/server-backend

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug feature: federation
Projects
None yet
Milestone
Nextcloud 30
Development

Successfully merging this pull request may close these issues.

[Bug]: Trusted Server Stuck at Yellow/Orange
3 participants
@blizzz @nickvergessen @Fenn-CS