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.

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

cool#9992 doc electronic sign: allow more user private info settings with make run #10540

Merged
merged 1 commit into from
Nov 20, 2024

Conversation

vmiklos
Copy link
Contributor

@vmiklos vmiklos commented Nov 20, 2024

Digital signing already supported .ca.pem / .cert.pem / .key.pem files
next to documents in the no-integration case, but electronic signing
would now bring 3 more similar settings, and this isn't really scaling.

FileServer.cpp handleWopiRequest() already builds a JSON dictionary from
these files, so it would be natural to allow any other UserPrivateInfo
keys as well in files next to local documents.

Fix the problem by reading a single .user-private-info.json file
instead, which means that setting any user private info keys is now
possible without explicit support by the local file WOPI backend.

Adapt the only cypress test that used the old format accordingly.

Signed-off-by: Miklos Vajna vmiklos@collabora.com
Change-Id: Ic833821074e622d12933c42a127e4193ade46ca8

…with make run

Digital signing already supported .ca.pem / .cert.pem / .key.pem files
next to documents in the no-integration case, but electronic signing
would now bring 3 more similar settings, and this isn't really scaling.

FileServer.cpp handleWopiRequest() already builds a JSON dictionary from
these files, so it would be natural to allow any other UserPrivateInfo
keys as well in files next to local documents.

Fix the problem by reading a single .user-private-info.json file
instead, which means that setting any user private info keys is now
possible without explicit support by the local file WOPI backend.

Adapt the only cypress test that used the old format accordingly.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: Ic833821074e622d12933c42a127e4193ade46ca8
@vmiklos vmiklos requested a review from caolanm November 20, 2024 08:05
@vmiklos
Copy link
Contributor Author

vmiklos commented Nov 20, 2024

@caolanm could you please review this? Thanks.

#9992 (comment) has a sample JSON to show how this looks like in practice, so we have something more generic and not increasing 3 specific settings to 6 ones.

@caolanm caolanm merged commit f6f3390 into master Nov 20, 2024
13 checks passed
@caolanm caolanm deleted the private/vmiklos/master branch November 20, 2024 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants