GpgOL: Add mixed mode for S/MIME and OpenPGP to libkleo newkeyresolver
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	aheinecke
	Feb 1 2021, 9:01 AM

Description

For T5228 we need GUI for the combined mode. The API should already provide this but it has not been tested and needs to be properly implemented.

Details

Version: master

Revisions and Commits

rLIBKLEO Libkleo
	rLIBKLEOa98a9de20d71 Omit "Encrypt to others" box if there are no other recipients
	rLIBKLEOdbaf6eba1b8b Add test for normalized sender address in encrypt-only mode
	rLIBKLEO4e326a132b19 Always set/store the normalized sender address
	rLIBKLEOcad54768c779 Update documentation
	rLIBKLEO011e28191c03 Update copyright information
	rLIBKLEOc43b69027c10 Take groups into account when resolving signing keys
	rLIBKLEOfde4ff96a3a4 Resolve encryption groups only if encryption keys are needed
	rLIBKLEO50bea92e5c0b Simplify adding signing key to result
	rLIBKLEO265662200481 Log warning if test key was not found to catch typos and c&p bugs in tests
	rLIBKLEO729cdb3e475a Resolve groups after overrides but before keys
	rLIBKLEO4f0aadb32a1a Improve cleanup after tests
	rLIBKLEO68fda099d430 Improve group support in key resolver
	rLIBKLEO1b9f9eb11095 Replace bool arguments needSign and needEncrypt with KeyUsage enum
	rLIBKLEO689aeee8f0d0 Set protocol of result and ignore null keys
	rLIBKLEO744e209ae607 Fix testKey() helper
	rLIBKLEO12e4b81f7c10 Emit currentKeyChanged() signal even if it is already set
	rLIBKLEO02c7ddc30da5 Iterate over all combos in one loop
	rLIBKLEOde29db8962fe Add the possibility to fake crypto config values in tests
	rLIBKLEO441ccde8ddae Ignore null keys when checking for de-vs compliance
	rLIBKLEOc3f83b3cb58c Add tests for the compliance label
	rLIBKLEOe0f24a57e7f9 Disable OK button iff all encryption keys are set to "Ignore"
	rLIBKLEO8f4b261aa366 Show "Generate" button iff "Generate key" is selected for _visible_ combo
	rLIBKLEO5166325ce6c2 Fill the key cache with test keys and use those keys in the tests
	rLIBKLEO03bdbbec7123 Allow filling the key cache with test keys
	rLIBKLEO29d9d7ee0e2d Ensure that at least one protocol button is checked
	rLIBKLEOe73a99227710 Remove obsolete fromOverride members
	rLIBKLEOf3464a1bdcc9 In mixed mode allow users to restrict key selection to single protocol
	rLIBKLEOe44e240f68b9 Simplify a few connects and disconnects
	rLIBKLEO2e3724999b73 Use signal introduced in Qt 5.15 to simplify connect call
	rLIBKLEO2831423b04dc Restrict key selection for recipients to encryption keys also in mixed mode
	rLIBKLEO2f216aae9c5a Remove obsolete test helpers
	rLIBKLEO5850dc189981 Mark partial/full single-protocol solutions in mixed mode with protocol
	rLIBKLEOb31b915a6acf Abort resolution if mandatory overrides conflict with protocol requirement
	rLIBKLEO2c3e7b4cc7ad Simplify/change result type of KeyResolver and its internal helpers
	rLIBKLEO62f126bd9403 Correctly handle mixed protocol mode everywhere
	rLIBKLEO3d119f5de8fc Fix result of resolution if mixed protocols are needed but not allowed
	rLIBKLEO6d3f3aa09761 Remove unused and incomplete member function
	rLIBKLEO589dd7f6a555 Add a few tests for failed resolution
	rLIBKLEOff7dbb417c40 Common overrides override protocol-specific resolution
	rLIBKLEO900995e43048 Ignore protocol-specific overrides if common overrides are given
	rLIBKLEO7455e56a016f Add tests verifying that common overrides are used for OpenPGP and S/MIME
	rLIBKLEOee2a8036cfb3 Ignore S/MIME certificates given as OpenPGP overrides and vice versa
	rLIBKLEO63285e198b8b Add some tests for protocol-specific overrides
	rLIBKLEO6e5b353f093e Add and update some test keys and certificates
	rLIBKLEOa02a75711ee5 Add template specialization of qCompare for GpgME::UserID::Validity
	rLIBKLEO4be125c3540b Simplify/change result type of KeyResolver and its internal helpers
	rLIBKLEOf6f91597e545 Abort resolution if mandatory overrides conflict with protocol requirement
	rLIBKLEOe645923e5e07 Correctly handle mixed protocol mode everywhere
	rLIBKLEO531636d17484 Fix result of resolution if mixed protocols are needed but not allowed
	rLIBKLEOd7bbf9769fbb Remove unused and incomplete member function
	rLIBKLEOe92fc1ee058b Ignore protocol-specific overrides if common overrides are given
	rLIBKLEOefd5ed706765 Add a few tests for failed resolution
	rLIBKLEO5d8d213d62d5 Common overrides override protocol-specific resolution
	rLIBKLEO610531cd93c3 Add tests verifying that common overrides are used for OpenPGP and S/MIME
	rLIBKLEO2363f8ffd472 Add some tests for protocol-specific overrides
	rLIBKLEO4549f8ba127c Add template specialization of qCompare for GpgME::UserID::Validity
	rLIBKLEO2b08d0fa121f Ignore S/MIME certificates given as OpenPGP overrides and vice versa
	rLIBKLEO1ccf13eb8f96 Add and update some test keys and certificates
	rLIBKLEO122281c18034 Set correct filter for encryption key selection
	rLIBKLEO499040ec8a25 Ignore protocol-specific overrides if common overrides are given
	rLIBKLEOdcc4febe198d Add tests verifying that common overrides are used for OpenPGP and S/MIME
	rLIBKLEO2bc9161b87de Ignore S/MIME certificates given as OpenPGP overrides and vice versa
	rLIBKLEO792fcca0bff9 Add some tests for protocol-specific overrides
	rLIBKLEO023585a2fedc Common overrides override protocol-specific resolution
	rLIBKLEO44f1d27b179a Add template specialization of qCompare for GpgME::UserID::Validity
	rLIBKLEO1461de5f5027 Add and update some test keys and certificates
	rLIBKLEO16733a655af0 In mixed mode create "best of" list of resolved OpenPGP and S/MIME keys
	rLIBKLEOaf081b7f01d9 Omit entries for unresolved recipients in encryption keys result
	rLIBKLEOe9bb7c4171d0 Fix normalization of addresses of encryption key overrides
	rLIBKLEOa40b7a07a5c7 Store encryption keys internally per address and then per protocol
	rLIBKLEOe036e1b003d5 Store encryption key overrides per address and then per protocol
	rLIBKLEOa9f6ac7b7549 Move all method implementations to the private class
	rLIBKLEO420b962dea30 Test KeyResolverCore instead of KeyResolver
	rLIBKLEO000d602a964f Extract the core of the resolver into a separate class
	rLIBKLEO6ec029a01364 Remove the separate lists of unresolved recipients
	rLIBKLEO442c12365db1 Factor out resolving the keys of a single recipient
	rLIBKLEO1fd410fb8fcf Move implementation of KeyResolverCore to separate file
	rLIBKLEO710d07a82193 Add definition and fix private implementation of setSigningKeys()
	rLIBKLEO747be9043fe6 Remove getter for override keys
	rLIBKLEO1b3ecd9a280e Fix overriding of the sender's encryption keys
	rLIBKLEO15ec596d67a9 Add helper for getting a test key
	rLIBKLEOa6359957b1ef Refactor update of icon and tooltip of filter button
	rLIBKLEOfeb787ba173a Fix help of test application for key resolver
	rLIBKLEO60fe2079cea4 Improve tooltips of filter button
	rLIBKLEObfed420f6d05 Use S/MIME if S/MIME only is possible and S/MIME is preferred
	rLIBKLEOc5f0aa65fca8 Do not remove all keys if OpenPGP only and S/MIME only are both possible
	rLIBKLEOec81b2b53114 In mixed mode prefer recipient keys matching preferred protocol
	rLIBKLEO1aa4ab483ff8 Show the sender's encryption key(s) separately
	rLIBKLEO5d64856ba00e In mixed mode, use fixed protocols for the sender's keys
	rLIBKLEO8c53761a9e32 Fix visibility of sender's signing and encryption keys in mixed mode
	rLIBKLEO755d5283ad24 Add autotest for NewKeyApprovalDialog
	rLIBKLEO0b64e1011576 Remove distinction between To/CC and BCC recipients
	rLIBKLEOb2fd2a1ea4ac Make the key resolver agnostic to different crypto message formats
	rLIBKLEOfe9b83598f71 Remove incomplete nagging functionality
rGTO Gpg4win-Tools
	rGTO344149824426 Require same version of gpgme as libkleo
	rGTO39e9b67ba48b Remove obsolete workingDirectory parameter
	rGTOc3d63768121c Adapt to new result type of KeyResolver
	rGTO1824fdc4061a Adapt to API changes of KeyResolver

Related Objects
Search...

Status	Assigned	Task
Resolved	aheinecke	T5967 GpgOL: Use kleopatra groups in keyresolver
Resolved	aheinecke	T5283 GpgOL: Add mixed mode for S/MIME and OpenPGP to libkleo newkeyresolver
Resolved	ikloecker	T5397 GpgOL: Add support for groups with S/MIME keys
Resolved	ikloecker	T5398 GpgOL: In mixed mode disable or hide not needed signing and encrypt-to-self keys

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes

ikloecker added a commit: rLIBKLEO420b962dea30: Test KeyResolverCore instead of KeyResolver.Mar 25 2021, 5:24 PM

ikloecker added a commit: rLIBKLEOa9f6ac7b7549: Move all method implementations to the private class.

ikloecker added a commit: rLIBKLEO442c12365db1: Factor out resolving the keys of a single recipient.

ikloecker added a commit: rLIBKLEO6ec029a01364: Remove the separate lists of unresolved recipients.

ikloecker added a commit: rLIBKLEOe036e1b003d5: Store encryption key overrides per address and then per protocol.

ikloecker added a commit: rLIBKLEOe9bb7c4171d0: Fix normalization of addresses of encryption key overrides.

ikloecker added a commit: rLIBKLEOa40b7a07a5c7: Store encryption keys internally per address and then per protocol.

ikloecker added a commit: rLIBKLEOaf081b7f01d9: Omit entries for unresolved recipients in encryption keys result.

ikloecker added a commit: rLIBKLEO16733a655af0: In mixed mode create "best of" list of resolved OpenPGP and S/MIME keys.

ikloecker added a commit: rLIBKLEO1461de5f5027: Add and update some test keys and certificates.Mar 31 2021, 12:31 PM

ikloecker added a commit: rLIBKLEO44f1d27b179a: Add template specialization of qCompare for GpgME::UserID::Validity.

ikloecker added a commit: rLIBKLEO792fcca0bff9: Add some tests for protocol-specific overrides.

ikloecker added a commit: rLIBKLEO023585a2fedc: Common overrides override protocol-specific resolution.

ikloecker added a commit: rLIBKLEO2bc9161b87de: Ignore S/MIME certificates given as OpenPGP overrides and vice versa.

ikloecker added a commit: rLIBKLEOdcc4febe198d: Add tests verifying that common overrides are used for OpenPGP and S/MIME.

ikloecker added a commit: rLIBKLEO499040ec8a25: Ignore protocol-specific overrides if common overrides are given.

ikloecker added a commit: rLIBKLEO122281c18034: Set correct filter for encryption key selection.Apr 12 2021, 11:41 AM

ikloecker added a commit: rLIBKLEO1ccf13eb8f96: Add and update some test keys and certificates.Apr 14 2021, 5:33 PM

ikloecker added a commit: rLIBKLEO4549f8ba127c: Add template specialization of qCompare for GpgME::UserID::Validity.

ikloecker added a commit: rLIBKLEO2363f8ffd472: Add some tests for protocol-specific overrides.

ikloecker added a commit: rLIBKLEO2b08d0fa121f: Ignore S/MIME certificates given as OpenPGP overrides and vice versa.

ikloecker added a commit: rLIBKLEO610531cd93c3: Add tests verifying that common overrides are used for OpenPGP and S/MIME.

ikloecker added a commit: rLIBKLEO5d8d213d62d5: Common overrides override protocol-specific resolution.

ikloecker added a commit: rLIBKLEOe92fc1ee058b: Ignore protocol-specific overrides if common overrides are given.

ikloecker added a commit: rLIBKLEOefd5ed706765: Add a few tests for failed resolution.

ikloecker added a commit: rLIBKLEO531636d17484: Fix result of resolution if mixed protocols are needed but not allowed.

ikloecker added a commit: rLIBKLEOd7bbf9769fbb: Remove unused and incomplete member function.

ikloecker added a commit: rLIBKLEOe645923e5e07: Correctly handle mixed protocol mode everywhere.

ikloecker added a commit: rLIBKLEOf6f91597e545: Abort resolution if mandatory overrides conflict with protocol requirement.

ikloecker added a commit: rLIBKLEO4be125c3540b: Simplify/change result type of KeyResolver and its internal helpers.

ikloecker added a commit: rLIBKLEOa02a75711ee5: Add template specialization of qCompare for GpgME::UserID::Validity.Apr 15 2021, 12:25 PM

ikloecker added a commit: rLIBKLEO6e5b353f093e: Add and update some test keys and certificates.

ikloecker added a commit: rLIBKLEO63285e198b8b: Add some tests for protocol-specific overrides.

ikloecker added a commit: rLIBKLEOee2a8036cfb3: Ignore S/MIME certificates given as OpenPGP overrides and vice versa.

ikloecker added a commit: rLIBKLEO7455e56a016f: Add tests verifying that common overrides are used for OpenPGP and S/MIME.

ikloecker added a commit: rLIBKLEOff7dbb417c40: Common overrides override protocol-specific resolution.

ikloecker added a commit: rLIBKLEO900995e43048: Ignore protocol-specific overrides if common overrides are given.

ikloecker added a commit: rLIBKLEO589dd7f6a555: Add a few tests for failed resolution.

ikloecker added a commit: rLIBKLEO3d119f5de8fc: Fix result of resolution if mixed protocols are needed but not allowed.

ikloecker added a commit: rLIBKLEO6d3f3aa09761: Remove unused and incomplete member function.

ikloecker added a commit: rLIBKLEO62f126bd9403: Correctly handle mixed protocol mode everywhere.

ikloecker added a commit: rLIBKLEOb31b915a6acf: Abort resolution if mandatory overrides conflict with protocol requirement.

ikloecker added a commit: rLIBKLEO2c3e7b4cc7ad: Simplify/change result type of KeyResolver and its internal helpers.

ikloecker added a commit: rGTO39e9b67ba48b: Remove obsolete workingDirectory parameter.Apr 15 2021, 1:45 PM

ikloecker added a commit: rGTOc3d63768121c: Adapt to new result type of KeyResolver.

ikloecker added a commit: rGTO344149824426: Require same version of gpgme as libkleo.

ikloecker added a commit: rLIBKLEO2831423b04dc: Restrict key selection for recipients to encryption keys also in mixed mode.Apr 19 2021, 5:17 PM

ikloecker added a commit: rLIBKLEO5850dc189981: Mark partial/full single-protocol solutions in mixed mode with protocol.

ikloecker added a commit: rLIBKLEO2f216aae9c5a: Remove obsolete test helpers.

ikloecker added a commit: rLIBKLEO2e3724999b73: Use signal introduced in Qt 5.15 to simplify connect call.

ikloecker added a commit: rLIBKLEOf3464a1bdcc9: In mixed mode allow users to restrict key selection to single protocol.

ikloecker added a commit: rLIBKLEOe44e240f68b9: Simplify a few connects and disconnects.

ikloecker added a commit: rLIBKLEOe73a99227710: Remove obsolete fromOverride members.

ikloecker added a commit: rLIBKLEO29d9d7ee0e2d: Ensure that at least one protocol button is checked.Apr 20 2021, 4:57 PM

ikloecker added a commit: rLIBKLEO5166325ce6c2: Fill the key cache with test keys and use those keys in the tests.

ikloecker added a commit: rLIBKLEO03bdbbec7123: Allow filling the key cache with test keys.

ikloecker added a commit: rLIBKLEO8f4b261aa366: Show "Generate" button iff "Generate key" is selected for _visible_ combo.

ikloecker added a commit: rLIBKLEOe0f24a57e7f9: Disable OK button iff all encryption keys are set to "Ignore".Apr 21 2021, 5:46 PM

ikloecker added a commit: rLIBKLEOc3f83b3cb58c: Add tests for the compliance label.

ikloecker added a commit: rLIBKLEOde29db8962fe: Add the possibility to fake crypto config values in tests.

ikloecker added a commit: rLIBKLEO02c7ddc30da5: Iterate over all combos in one loop.

ikloecker added a commit: rLIBKLEO441ccde8ddae: Ignore null keys when checking for de-vs compliance.

ikloecker added a commit: rLIBKLEO12e4b81f7c10: Emit currentKeyChanged() signal even if it is already set.Apr 22 2021, 12:50 PM

ikloecker added a commit: rLIBKLEO744e209ae607: Fix testKey() helper.

ikloecker added a commit: rLIBKLEO689aeee8f0d0: Set protocol of result and ignore null keys.

ikloecker closed subtask T5398: GpgOL: In mixed mode disable or hide not needed signing and encrypt-to-self keys as Resolved.Apr 22 2021, 2:50 PM

ikloecker moved this task from Restricted Project Column to Restricted Project Column on the Restricted Project board.

ikloecker added a commit: rLIBKLEO1b9f9eb11095: Replace bool arguments needSign and needEncrypt with KeyUsage enum.Apr 27 2021, 5:03 PM

ikloecker added a commit: rLIBKLEO68fda099d430: Improve group support in key resolver.

ikloecker added a commit: rLIBKLEO4f0aadb32a1a: Improve cleanup after tests.

ikloecker added a commit: rLIBKLEO729cdb3e475a: Resolve groups after overrides but before keys.

ikloecker added a commit: rLIBKLEOfde4ff96a3a4: Resolve encryption groups only if encryption keys are needed.Apr 28 2021, 12:10 PM

ikloecker added a commit: rLIBKLEO265662200481: Log warning if test key was not found to catch typos and c&p bugs in tests.

ikloecker added a commit: rLIBKLEO50bea92e5c0b: Simplify adding signing key to result.

ikloecker added a commit: rLIBKLEOc43b69027c10: Take groups into account when resolving signing keys.

ikloecker added a commit: rLIBKLEO011e28191c03: Update copyright information.Apr 28 2021, 3:49 PM

ikloecker added a commit: rLIBKLEOcad54768c779: Update documentation.

Should be mostly done. What's missing is selection of groups in the approval dialog. Groups are not (yet) supported by the KeySelectionCombo.

ikloecker changed the task status from Open to Testing.May 10 2021, 9:28 AM

ikloecker reassigned this task from ikloecker to aheinecke.

ikloecker moved this task from Restricted Project Column to Restricted Project Column on the Restricted Project board.

ikloecker added a subscriber: ikloecker.

• Ramtin2021 added a subtask: T5465: Kleopatra: Improve configuration of LDAP servers for X.509.Jun 1 2021, 7:03 PM

• Ramtin2021 added a subscriber: • Ramtin2021.

ikloecker removed a subtask: T5465: Kleopatra: Improve configuration of LDAP servers for X.509.Jun 1 2021, 7:54 PM

ikloecker added a commit: rLIBKLEO4e326a132b19: Always set/store the normalized sender address.Jun 11 2021, 2:38 PM

ikloecker added a commit: rLIBKLEOdbaf6eba1b8b: Add test for normalized sender address in encrypt-only mode.Jun 11 2021, 3:19 PM

ikloecker added a commit: rLIBKLEOa98a9de20d71: Omit "Encrypt to others" box if there are no other recipients.

ikloecker moved this task from Restricted Project Column to Restricted Project Column on the Restricted Project board.Oct 20 2021, 4:37 PM

ikloecker moved this task from Restricted Project Column to Restricted Project Column on the Restricted Project board.Oct 25 2021, 11:44 AM

This needs to be tested with group configuration even for non mixed mode. There is an important wish to have the kleopatra group configuration be used in the keyresolver from outlook.

I think in theory the only thing that is missing for that would be to set the group config in gpg4win-tools accordingly. And then testing of course.

I am closing this as the group support for gpgol is now in T5967

aheinecke removed a subtask: T5228: GpgOL: Combined S/MIME and OpenPGP operation.May 9 2022, 9:26 AM

• ebo moved this task from Restricted Project Column to Restricted Project Column on the Restricted Project board.Apr 5 2023, 2:59 PM

GpgOL: Add mixed mode for S/MIME and OpenPGP to libkleo newkeyresolverClosed, ResolvedPublicActions