5c3fecfb85
Merge pull request 'Formatting corrections and whitespace character fixes' ( #112 ) from Onnayaku/gpg-lacre:doc-fixes into main
...
Reviewed-on: #112
Reviewed-by: pfm <pfm@no-reply@disroot.org>
2022-12-14 19:32:40 +00:00
c7c49977c9
Change 'Indented code blocks' to 'Fenced code blocks' in adv-filt.md
2022-11-01 23:53:37 +01:00
2c6adfe335
Minor formatting corrections and whitespace character fixes in adv-filt.md testing.md INSTALL.md and README.md
2022-11-01 21:35:48 +01:00
9f1c4db49d
Merge pull request 'doc-updates' ( #108 ) from doc-updates into main
...
Reviewed-on: #108
2022-10-26 17:21:41 +00:00
86b0cd335e
Replace UTF-8 non-breaking space with a plain space
2022-10-26 19:20:47 +02:00
6f379709f3
Update README to explicitly state that Lacre is in beta state
2022-10-26 19:19:24 +02:00
dab882550e
Merge pull request 'improved formatting' ( #107 ) from EmanuelLoos/gpg-lacre:main into main
...
Reviewed-on: #107
2022-10-26 16:57:35 +00:00
68c09c0eb1
improved formatting
...
Just some small Markdown syntax corrections.
2022-10-26 16:57:35 +00:00
c3cc37bf56
Merge pull request 'Improve code quality' ( #103 ) from rc2-improvements into main
...
Reviewed-on: #103
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2022-10-26 16:49:04 +00:00
18c790f986
Only reload on pubring.kbx file modifications
2022-10-23 13:51:42 +02:00
d39cadb9aa
Use proper name in webgate-cron.py logs
2022-10-23 13:51:10 +02:00
53378b516e
Add a test for message with PGP inline markers that's not encrypted
...
If a user mentions PGP markers inside their message, we should not classify it
as already encrypted.
2022-10-22 21:29:59 +02:00
b4f30d7e8f
Add test clear text input message with PGP markers
...
It's possible to trick Lacre by sending PGP markers in message body, causing
it to classify that message being already encrypted. This test case is used
to reproduce this scenario.
2022-10-22 20:54:08 +02:00
b91501d3dd
Convert all test input messages to CRLF line endings
2022-10-22 20:52:14 +02:00
fc85cdb841
Rework PGP-Inline verification/recognition
2022-10-22 19:58:16 +02:00
ba7978b4a6
Make webgate-cron code more readable
2022-10-22 14:33:20 +02:00
2ac26c09ce
Simplify code, improve log entries, add comments
2022-10-22 11:23:17 +02:00
00289759a3
Add aiosmtpd dependency
2022-10-22 11:23:11 +02:00
8f8d9dc1b6
Rename mailgate.py to core.py
2022-10-22 11:23:04 +02:00
4bdbd0febb
Merge pull request 'Improve logging' ( #101 ) from 100-logging-improvements into main
...
Reviewed-on: #101
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2022-10-21 06:30:23 +00:00
99e939bb4e
Remove too verbose debug logs, implement repr() for KeyCache
2022-10-20 22:27:34 +02:00
540ca2adf3
Improve logging
...
- Report processing time in milliseconds.
- Use module names in log messages instead of file-names without extensions.
2022-10-20 21:56:01 +02:00
9aa1c3732c
Merge pull request 'Adjust cron tests after recent FE decoupling' ( #99 ) from cron-tests into main
...
Reviewed-on: #99
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2022-10-19 19:09:38 +00:00
a82d9f96b3
Fix indentation and some warnings
2022-10-19 21:04:25 +02:00
fe49d985ec
Adjust cron tests after recent FE decoupling
2022-10-19 20:54:40 +02:00
13636bfddd
Merge pull request 'Implement Advanced Content Filter' ( #97 ) from daemon into main
...
Reviewed-on: #97
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2022-10-19 18:48:39 +00:00
5f8c94673d
Add basic daemon documentation
2022-10-19 18:36:23 +00:00
641253b3ec
Make key-loading async, remove unused parameter
2022-10-19 18:36:23 +00:00
9696b7e997
Separate key-cache and key-loader
...
Extract key-loading code to a dedicated class KeyRing in lacre.keyring module.
KeyCache only keeps a static map of identities, making it safe to use in
asynchronous context (and race condition resistant).
2022-10-19 18:36:23 +00:00
9f3ad49f14
Rename lacre.keycache to lacre.keyring
...
This will better reflect the fact we're doing more than just caching.
2022-10-19 18:36:23 +00:00
acbb2ab776
Document dependencies
...
Add requirements.txt file with versions of dependencies known to work well.
2022-10-19 18:36:23 +00:00
2da97a5a9a
Reformat code, add doc comments
2022-10-19 18:36:23 +00:00
eb0d5a1326
Reload keyring on filesystem events
...
Subscribe to FS events from keyring directory using Python Watchdog and when a
modification is observed, reload the key cache.
Since we may receive more than one event about a single modification, keep
directory's last modification to recognise 'false positives'.
2022-10-19 18:36:23 +00:00
386c23f9f8
Document dependencies on the logging module
2022-10-19 18:36:23 +00:00
1db0a09fa5
Log processing time for successful deliveries
2022-10-19 18:36:23 +00:00
a85b7b7a43
Reload key cache only if keyring dir was modified
2022-10-19 18:36:23 +00:00
f5cff3292a
Reload key cache periodically
...
Use [default]cache_refresh_minutes configuration parameter to define periods
between cache reloads. After this number of minutes cache will be reloaded.
2022-10-19 18:36:23 +00:00
d7e4947afd
Add cache validity configuration parameter
...
Also, log basic information in KeyCache and provide load() and reload()
operations to make daemon's code cleaner.
2022-10-19 18:36:23 +00:00
5f601fa50c
Implement a basic KeyCache
2022-10-19 18:36:23 +00:00
07263d5afa
Reformat tests
2022-10-19 18:36:23 +00:00
c41df63e42
Reorder tests to avoid interferences
2022-10-19 18:36:23 +00:00
a2eeaeee9d
Implement Advanced Filter flow for cleartext and OpenPGP
...
- Polish implementation of mail operations (lacre/mailop.py). Add two
strategies: InlineOpenPGPEncrypt and MimeOpenPGPEncrypt, to support two modes
of OpenPGP encryption.
- In delivery_plan, only use those strategies that actually make sense with
the recipients we'd got.
- Add flag_enabled predicate (lacre/config.py) to make configuration checks
easier / simpler.
- Handle TypeError errors in Advanced Filter, indicating a delivery failure
when they appear.
- Add type hints to some of the functions.
2022-10-19 18:36:23 +00:00
ce6a0c5466
Continue refactoring
...
- Add more encryption strategies.
- Replace tuples (email + key) with dedicated objects.
2022-10-19 18:36:23 +00:00
8963eee47f
Reformat GnuPG module
2022-10-19 18:36:23 +00:00
a5bcf2d9b2
Make daemon E2E tests use configured parameters
2022-10-19 18:36:23 +00:00
d01865d21c
Refactor into smaller functions and objects
2022-10-19 18:36:23 +00:00
ddcef93abb
Fix a bug introduced by refactoring, clean up code
...
- Fix certificate retrieval.
- Store recipients within MailOperation objects.
- Log more information.
- Fix some warnings.
2022-10-19 18:36:23 +00:00
ce2e55e90c
Change indentation from tabs to 4 spaces
2022-10-19 18:36:23 +00:00
0cb656f89d
Add more debug logging to _try_direct_key_lookup
2022-10-19 18:36:23 +00:00
603710c41e
Continue splitting _sort_gpg_recipients
...
Extract new functions to match keys using enc_keymap and enc_domain_keymap
configuration sections, another one to look them up directly in GnuPG keyring,
optionally stripping delimiters ("+" followed by a topic).
Add some comments and docstrings.
2022-10-19 18:36:23 +00:00
