Skip to content

fix(sharing): Adapt share suggestions to match trusted servers configs - #55080

Merged
nfebe merged 3 commits into
masterfrom
fix/54511/federation-trusted-server-suggestions
Oct 9, 2025
Merged

fix(sharing): Adapt share suggestions to match trusted servers configs#55080
nfebe merged 3 commits into
masterfrom
fix/54511/federation-trusted-server-suggestions

Conversation

@nfebe

Copy link
Copy Markdown
Contributor

When show_federated_shares_to_trusted_servers_as_internal is enabled but show_federated_shares_as_internal is not, filter federated share suggestions to only include trusted servers. Previously, searching for an email address would suggest non-trusted federated servers.

Resolved: #54511

@nfebe
nfebe requested a review from a team as a code ownerSeptember 12, 2025 11:14
@nfebe
nfebe requested review from leftybournes and removed request for a teamSeptember 12, 2025 11:14
@nfebe
nfebeforce-pushed the fix/54511/federation-trusted-server-suggestions branch 2 times, most recently from dd038fb to 7dca29bCompareSeptember 12, 2025 11:21
Comment threadlib/private/Collaboration/Collaborators/RemotePlugin.php Outdated
Comment threadlib/private/Collaboration/Collaborators/RemotePlugin.php Outdated
Comment threadlib/private/Collaboration/Collaborators/RemotePlugin.php Outdated
Comment threadlib/private/Collaboration/Collaborators/RemotePlugin.php Outdated

@susnuxsusnux left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I do not fully understand how this is possible only on backend side.
Because with "show trusted servers as internal" the search request from the frontend is basically the same, both "internal shares" and "external shares" will search for remote type.

The difference is only that with "show trusted servers as internal" that only trusted servers should be shown in the "internal share" results, while all other remotes should still be listed in "external shares" results

Comment threadlib/private/Collaboration/Collaborators/RemotePlugin.php Outdated
Comment threadlib/private/Collaboration/Collaborators/RemotePlugin.php Outdated
Comment threadlib/private/Collaboration/Collaborators/RemotePlugin.php Outdated
@nfebe
nfebeforce-pushed the fix/54511/federation-trusted-server-suggestions branch from 7dca29b to 9763088CompareSeptember 15, 2025 12:55
@tobiasKaminsky

Copy link
Copy Markdown
Member

/backport to stable-31

@nfebe
nfebeforce-pushed the fix/54511/federation-trusted-server-suggestions branch from 9763088 to cfda889CompareSeptember 16, 2025 15:21
@nfebe
nfebe requested a review from a team as a code ownerSeptember 16, 2025 15:21
@nfebe
nfebe requested review from susnux and szaimen and removed request for a teamSeptember 16, 2025 15:21
@szaimen
szaimen requested review from fsamapoor and removed request for szaimenSeptember 16, 2025 15:22
@nfebe
nfebeforce-pushed the fix/54511/federation-trusted-server-suggestions branch 2 times, most recently from 3e3a68b to e93743fCompareSeptember 16, 2025 17:30
@nfebe

Copy link
Copy Markdown
ContributorAuthor

/compile

@nfebe
nfebeforce-pushed the fix/54511/federation-trusted-server-suggestions branch 3 times, most recently from 600912f to e08c77bCompareSeptember 17, 2025 12:50
@nfebe
nfebeforce-pushed the fix/54511/federation-trusted-server-suggestions branch from 28ab7bf to c68b379CompareOctober 1, 2025 11:54
@nfebe
nfebe enabled auto-merge October 1, 2025 11:54
@nfebe
nfebeforce-pushed the fix/54511/federation-trusted-server-suggestions branch from c68b379 to 09f100cCompareOctober 1, 2025 14:19
@nfebe

nfebe commented Oct 1, 2025

Copy link
Copy Markdown
ContributorAuthor

/compile

@nfebe
nfebeforce-pushed the fix/54511/federation-trusted-server-suggestions branch from 7a2d805 to b4654f7CompareOctober 2, 2025 14:49
@nfebe

nfebe commented Oct 2, 2025

Copy link
Copy Markdown
ContributorAuthor

/compile

@nfebe
nfebeforce-pushed the fix/54511/federation-trusted-server-suggestions branch from 8eedbac to 7a9c82cCompareOctober 6, 2025 07:58
@nfebe

nfebe commented Oct 6, 2025

Copy link
Copy Markdown
ContributorAuthor

/compile

@nfebe
nfebeforce-pushed the fix/54511/federation-trusted-server-suggestions branch 3 times, most recently from 65dfd15 to 2467fafCompareOctober 9, 2025 05:32
When `show_federated_shares_to_trusted_servers_as_internal` is enabled
but `show_federated_shares_as_internal` is not, filter federated share
suggestions to only include trusted servers. Previously, searching for
an email address would suggest non-trusted federated servers.
Resolved: #54511
Signed-off-by: nfebe <fenn25.fn@gmail.com>
Signed-off-by: nfebe <fenn25.fn@gmail.com>
@nfebe
nfebeforce-pushed the fix/54511/federation-trusted-server-suggestions branch from 2467faf to c9bb6eeCompareOctober 9, 2025 05:55
@nfebe

nfebe commented Oct 9, 2025

Copy link
Copy Markdown
ContributorAuthor

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@nfebe
nfebe merged commit 8e5f436 into masterOct 9, 2025
189 checks passed
@nfebe
nfebe deleted the fix/54511/federation-trusted-server-suggestions branch October 9, 2025 06:29
@backportbot

Copy link
Copy Markdown

The backport to stable-31 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-31
git pull origin stable-31
# Create the new backport branch
git checkout -b backport/55080/stable-31
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts, resolve them
git cherry-pick c1d9e22c c9bb6eed 8c7be09d
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/55080/stable-31

Error: Failed to clone repository: Failed to create working tree: Preparing worktree (new branch 'backport/55080/stable-31')
fatal: not a valid object name: 'origin/stable-31'


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@nfebe

nfebe commented Oct 9, 2025

Copy link
Copy Markdown
ContributorAuthor

/backport to stable32

@nfebe

nfebe commented Oct 9, 2025

Copy link
Copy Markdown
ContributorAuthor

/backport to stable31

Comment threadlib/private/Collaboration/Collaborators/RemotePlugin.php
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

8 participants

@nfebe@tobiasKaminsky@maximelehericy@nickvergessen@susnux@artonge@come-nc@nextcloud-command