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

Rewrite communication between client and File Provider extensions using XPC #6324

Merged
merged 52 commits into from
Feb 19, 2024
Merged

Rewrite communication between client and File Provider extensions using XPC #6324

merged 52 commits into from
Feb 19, 2024

Conversation

claucambra
Copy link
Collaborator

Makes communicating with the extensions far more ergonomic and is a requirement for #5693

Closes #6235

@claucambra claucambra self-assigned this Jan 2, 2024
@claucambra claucambra force-pushed the work/fileprovider-xpc branch from ac986ca to 911539d Compare January 2, 2024 09:18
github-actions[bot]
github-actions bot requested changes Jan 2, 2024
View reviewed changes
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

⚠️ Clang-Tidy found issue(s) with the introduced code (1/1)

src/gui/macOS/fileproviderxpc_mac_utils.h Show resolved Hide resolved
...tegration/MacOSX/NextcloudIntegration/FileProviderExt/Services/ClientCommunicationProtocol.h Show resolved Hide resolved
...tegration/MacOSX/NextcloudIntegration/FileProviderExt/Services/ClientCommunicationProtocol.h Show resolved Hide resolved
src/gui/macOS/fileproviderxpc_mac_utils.h Show resolved Hide resolved
src/gui/macOS/fileproviderxpc_mac_utils.h Show resolved Hide resolved
@claucambra claucambra force-pushed the work/fileprovider-xpc branch 2 times, most recently from 2ae4692 to d13c543 Compare January 30, 2024 01:10
@claucambra claucambra force-pushed the work/fileprovider-xpc branch from d13c543 to 83e327b Compare February 5, 2024 10:00
@claucambra claucambra mentioned this pull request Feb 6, 2024
Merged
mgallien
mgallien requested changes Feb 7, 2024
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

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

@claucambra can you fix the conflicts ?

@claucambra claucambra force-pushed the work/fileprovider-xpc branch from 83e327b to 4935d1f Compare February 7, 2024 10:09
@claucambra claucambra requested a review from mgallien February 7, 2024 10:09
@claucambra
Copy link
Collaborator Author

Conflicts now fixed

claucambra
claucambra commented Feb 19, 2024
View reviewed changes
Copy link
Collaborator Author

@claucambra claucambra left a comment

Choose a reason for hiding this comment

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

Just re-reviewed this and it looks good to me @mgallien

@claucambra claucambra force-pushed the work/fileprovider-xpc branch from 4935d1f to fd20058 Compare February 19, 2024 14:22
@claucambra
Add starter client communication service
22c176a 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Keep pointer to FileProviderExtension around in ClientCommunicationSe…
a2d69fc 
…rvice

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Add ClientCommunicationProtocol
e763a9d 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Implement ClientCommunicationProtocol in ClientCommunicationService
dd39991 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Reimplement ClientCommunicationService in Swift
026f082 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Properly implement listener should accept connection in ClientCommuni…
ac43369 
…cationService

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Add starter FileProviderXPC class on client side
5cc8b6e 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Add relative symlink to ClientCommunicationProtocol in srd/gui/macOS
e8c1bbb 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Fix logging for fileproviderdomainmanager
9dddaf4 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Implement connection begin in XPC
2520111 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Flatten FileProviderXPC::start()
0b505a9 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Extract remote service object acquisistion from connection into separ…
c9997ce 
…ate function

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Remove redundant static in anonymous fileproviderxpc utils namespace
8a8d3b3 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Extract account id acquisition from clientCommService into separate f…
23a3a3e 
…unction

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Cast clientCommServices to NSObject with correct protocol
502d738 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Add method to unauthenticate file provider extension in FileProviderXPC
f728ec1 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Define NSDictionary types in _clientCommServices
94bfa03 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Move extension authentication into separate method
c1fa662 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Implement recognition of account state changing in FileProviderXPC
0856138 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Fix clang-tidy namespace concatenation warning
fca6b37 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Remove all obj-c classes from fileproviderxpc.h
784cd12 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Do not shadow sender()
be3bd7b 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Remove unused extension ID NSString
6d4e785 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Use accountStateFromFileProviderDomainIdentifier method in authentica…
43b7ae5 
…teExtension

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Improve domain discovery logging
798f77f 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Get services using better non-url based method if available (macOS 13…
58dc42a 
….0+)

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Separate starting of domain manager tasks from constructor
4238912 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Separate XPC init from file provider constructor
45b1231 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Only start XPC after file provider domains have been configured
a01e552 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Simplify and clarify utility of socket system for file provider
a44454d 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Clarify utility of xpc system for file provider
41133e4 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Add explainer to client interface
b22f463 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Simplify xpc service acquisition completion handler
9611e47 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Improve socket controller logging
71119fe 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Do not reconfigure file provider extension account if we are receivin…
3334b4e 
…g the same details again

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra claucambra force-pushed the work/fileprovider-xpc branch from fd20058 to 3334b4e Compare February 19, 2024 14:39
@claucambra claucambra merged commit 8ab52b8 into master Feb 19, 2024
9 of 12 checks passed
@claucambra claucambra deleted the work/fileprovider-xpc branch February 19, 2024 14:40
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6324-3334b4e49c3d4392cfdc9f510bd31eb59018fd22-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@mgallien mgallien added this to the 3.13.0 milestone Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] requested changes

@mgallien mgallien mgallien approved these changes

@camilasan camilasan Awaiting requested review from camilasan

@allexzander allexzander Awaiting requested review from allexzander

Assignees

@claucambra claucambra

Labels
feature: 💽 virtual filesystem os: 🍎 macOS
Projects
None yet
Milestone
3.13.0
Development

Successfully merging this pull request may close these issues.

Replace socket-based Client->File Provider Extension communication with in-built File Provider XPC
3 participants
@claucambra @nextcloud-desktop-bot @mgallien