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 sign: move sign key/cert init from doc init to sign dispatch #10311

Merged
merged 1 commit into from
Oct 24, 2024

Conversation

vmiklos
Copy link
Contributor

@vmiklos vmiklos commented Oct 24, 2024

core.git commit d48264d51891d81f77fcfd77766e1d34ec17412b (cool#9992 lok
doc sign: allow late-init of the sign cert, 2024-10-22) allows sending
the sign key/cert only when actually signing.

Also commit 7998ba5 (fix uno:Signature
cypress test, etc., 2024-10-23) already started to annotate
.uno:Signature with sign parameters.

Complete this move by:

  1. Extracting the .uno:Signature handling code to a separate function,
    since ChildSession::_handleInput() is large enough already.

  2. Poco::Dynamic::Var::extract() can throw an exception if the user
    private info is not an object (but is e.g. a list), guard against
    that.

  3. Stop sending the sign cert/key in Document::makeRenderParams().

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

…patch

core.git commit d48264d51891d81f77fcfd77766e1d34ec17412b (cool#9992 lok
doc sign: allow late-init of the sign cert, 2024-10-22) allows sending
the sign key/cert only when actually signing.

Also commit 7998ba5 (fix uno:Signature
cypress test, etc., 2024-10-23) already started to annotate
.uno:Signature with sign parameters.

Complete this move by:

1) Extracting the .uno:Signature handling code to a separate function,
   since ChildSession::_handleInput() is large enough already.

2) Poco::Dynamic::Var::extract() can throw an exception if the user
   private info is not an object (but is e.g. a list), guard against
   that.

3) Stop sending the sign cert/key in Document::makeRenderParams().

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I426c0dc8b028eb874f0baf6b99f5c803ad8078d7
@vmiklos
Copy link
Contributor Author

vmiklos commented Oct 24, 2024

@vmiklos vmiklos requested a review from caolanm October 24, 2024 10:04
@vmiklos
Copy link
Contributor Author

vmiklos commented Oct 24, 2024

@caolanm could you please review this? Thanks.

This does the cleanup you suggested, also gets rid of the manual escaping in the string literal, which is ~fine, but I easily get it wrong myself, so I switched to the json writer to get some safety.

@caolanm caolanm merged commit 542560f into master Oct 24, 2024
13 checks passed
@caolanm caolanm deleted the private/vmiklos/master branch October 24, 2024 11:43
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