diff options
Diffstat (limited to 'hosts/surtr/email')
13 files changed, 640 insertions, 341 deletions
diff --git a/hosts/surtr/email/ccert-policy-server/.envrc b/hosts/surtr/email/ccert-policy-server/.envrc new file mode 100644 index 00000000..2c909235 --- /dev/null +++ b/hosts/surtr/email/ccert-policy-server/.envrc | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | use flake | ||
| 2 | |||
| 3 | [[ -d ".venv" ]] || ( uv venv && uv sync ) | ||
| 4 | . .venv/bin/activate | ||
diff --git a/hosts/surtr/email/ccert-policy-server/.gitignore b/hosts/surtr/email/ccert-policy-server/.gitignore new file mode 100644 index 00000000..4ccfae70 --- /dev/null +++ b/hosts/surtr/email/ccert-policy-server/.gitignore | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | .venv | ||
| 2 | **/__pycache__ | ||
diff --git a/hosts/surtr/email/ccert-policy-server/ccert_policy_server/__main__.py b/hosts/surtr/email/ccert-policy-server/ccert_policy_server/__main__.py index 00182523..45619fb0 100644 --- a/hosts/surtr/email/ccert-policy-server/ccert_policy_server/__main__.py +++ b/hosts/surtr/email/ccert-policy-server/ccert_policy_server/__main__.py | |||
| @@ -28,12 +28,14 @@ class PolicyHandler(StreamRequestHandler): | |||
| 28 | 28 | ||
| 29 | allowed = False | 29 | allowed = False |
| 30 | user = None | 30 | user = None |
| 31 | relay_eligible = False | ||
| 31 | if self.args['sasl_username']: | 32 | if self.args['sasl_username']: |
| 32 | user = self.args['sasl_username'] | 33 | user = self.args['sasl_username'] |
| 33 | if self.args['ccert_subject']: | 34 | if self.args['ccert_subject']: |
| 34 | user = self.args['ccert_subject'] | 35 | user = self.args['ccert_subject'] |
| 36 | relay_eligible = True | ||
| 35 | 37 | ||
| 36 | if user: | 38 | if user and '@' in self.args['sender']: |
| 37 | with self.server.db_pool.connection() as conn: | 39 | with self.server.db_pool.connection() as conn: |
| 38 | local, domain = self.args['sender'].split(sep='@', maxsplit=1) | 40 | local, domain = self.args['sender'].split(sep='@', maxsplit=1) |
| 39 | extension = None | 41 | extension = None |
| @@ -44,10 +46,16 @@ class PolicyHandler(StreamRequestHandler): | |||
| 44 | 46 | ||
| 45 | with conn.cursor() as cur: | 47 | with conn.cursor() as cur: |
| 46 | cur.row_factory = namedtuple_row | 48 | cur.row_factory = namedtuple_row |
| 47 | cur.execute('SELECT "mailbox"."mailbox" as "user", "local", "extension", "domain" FROM "mailbox" INNER JOIN "mailbox_mapping" ON "mailbox".id = "mailbox_mapping"."mailbox" WHERE "mailbox"."mailbox" = %(user)s AND ("local" = %(local)s OR "local" IS NULL) AND ("extension" = %(extension)s OR "extension" IS NULL) AND "domain" = %(domain)s', params = {'user': user, 'local': local, 'extension': extension if extension is not None else '', 'domain': domain}, prepare=True) | 49 | |
| 48 | for record in cur: | 50 | if relay_eligible: |
| 49 | logger.debug('Received result: %s', record) | 51 | cur.execute('SELECT EXISTS(SELECT true FROM "mailbox" INNER JOIN "relay_access" ON "mailbox".id = "relay_access"."mailbox" WHERE "mailbox"."mailbox" = %(user)s AND ("domain" = %(domain)s OR %(domain)s ilike CONCAT(\'%%_.\', "domain"))) as "exists"', params = {'user': user, 'domain': domain}) |
| 50 | allowed = True | 52 | if (row := cur.fetchone()) is not None: |
| 53 | allowed = row.exists | ||
| 54 | |||
| 55 | if not allowed: | ||
| 56 | cur.execute('SELECT EXISTS(SELECT true FROM "mailbox" INNER JOIN "mailbox_mapping" ON "mailbox".id = "mailbox_mapping"."mailbox" WHERE "mailbox"."mailbox" = %(user)s AND ("local" = %(local)s OR "local" IS NULL) AND ("extension" = %(extension)s OR "extension" IS NULL) AND "domain" = %(domain)s) as "exists"', params = {'user': user, 'local': local, 'extension': extension if extension is not None else '', 'domain': domain}, prepare=True) | ||
| 57 | if (row := cur.fetchone()) is not None: | ||
| 58 | allowed = row.exists | ||
| 51 | 59 | ||
| 52 | action = '550 5.7.0 Sender address not authorized for current user' | 60 | action = '550 5.7.0 Sender address not authorized for current user' |
| 53 | if allowed: | 61 | if allowed: |
diff --git a/hosts/surtr/email/ccert-policy-server/poetry.lock b/hosts/surtr/email/ccert-policy-server/poetry.lock deleted file mode 100644 index acd354e8..00000000 --- a/hosts/surtr/email/ccert-policy-server/poetry.lock +++ /dev/null | |||
| @@ -1,169 +0,0 @@ | |||
| 1 | # This file is automatically @generated by Poetry 1.4.2 and should not be changed by hand. | ||
| 2 | |||
| 3 | [[package]] | ||
| 4 | name = "psycopg" | ||
| 5 | version = "3.1.8" | ||
| 6 | description = "PostgreSQL database adapter for Python" | ||
| 7 | category = "main" | ||
| 8 | optional = false | ||
| 9 | python-versions = ">=3.7" | ||
| 10 | files = [ | ||
| 11 | {file = "psycopg-3.1.8-py3-none-any.whl", hash = "sha256:b1500c42063abaa01d30b056f0b300826b8dd8d586900586029a294ce74af327"}, | ||
| 12 | {file = "psycopg-3.1.8.tar.gz", hash = "sha256:59b4a71536b146925513c0234dfd1dc42b81e65d56ce5335dff4813434dbc113"}, | ||
| 13 | ] | ||
| 14 | |||
| 15 | [package.dependencies] | ||
| 16 | typing-extensions = ">=4.1" | ||
| 17 | tzdata = {version = "*", markers = "sys_platform == \"win32\""} | ||
| 18 | |||
| 19 | [package.extras] | ||
| 20 | binary = ["psycopg-binary (>=3.1.6,<=3.1.8)"] | ||
| 21 | c = ["psycopg-c (>=3.1.6,<=3.1.8)"] | ||
| 22 | dev = ["black (>=22.3.0)", "dnspython (>=2.1)", "flake8 (>=4.0)", "mypy (>=0.990)", "types-setuptools (>=57.4)", "wheel (>=0.37)"] | ||
| 23 | docs = ["Sphinx (>=5.0)", "furo (==2022.6.21)", "sphinx-autobuild (>=2021.3.14)", "sphinx-autodoc-typehints (>=1.12)"] | ||
| 24 | pool = ["psycopg-pool"] | ||
| 25 | test = ["mypy (>=0.990)", "pproxy (>=2.7)", "pytest (>=6.2.5)", "pytest-asyncio (>=0.17)", "pytest-cov (>=3.0)", "pytest-randomly (>=3.5)"] | ||
| 26 | |||
| 27 | [[package]] | ||
| 28 | name = "psycopg-binary" | ||
| 29 | version = "3.1.8" | ||
| 30 | description = "PostgreSQL database adapter for Python -- C optimisation distribution" | ||
| 31 | category = "main" | ||
| 32 | optional = false | ||
| 33 | python-versions = ">=3.7" | ||
| 34 | files = [ | ||
| 35 | {file = "psycopg_binary-3.1.8-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f32684b4fc3863190c4b9c141342b2cbdb81632731b9c68e6946d772ba0560f2"}, | ||
| 36 | {file = "psycopg_binary-3.1.8-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:37212244817b3cc7193ee4b5d60765c020ead5e53589c935d249bfb96452878b"}, | ||
| 37 | {file = "psycopg_binary-3.1.8-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:32f2563db6e44372f593a76c94452ce476306e0fb508e092f3fab4d9091a9974"}, | ||
| 38 | {file = "psycopg_binary-3.1.8-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b36fcc67d8b23935ee871a6331c9631ecfdb11452a64f34b8ecb9642de43aec8"}, | ||
| 39 | {file = "psycopg_binary-3.1.8-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8bb9f577a09e799322008e574a1671c5b2645e990f954be2b7dae669e3779750"}, | ||
| 40 | {file = "psycopg_binary-3.1.8-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9ac81e68262b03163ca977f34448b4cadbc49db929146406b4706fe2141d76d1"}, | ||
| 41 | {file = "psycopg_binary-3.1.8-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:fbfc9ae4edfb76c14d09bd70d6f399eb935008bbb3bc4cd6a4ab76645ba3443e"}, | ||
| 42 | {file = "psycopg_binary-3.1.8-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8602836138bc209aa5f9821c8e8439466f151c3ec4fcdbc740697e49cff1b920"}, | ||
| 43 | {file = "psycopg_binary-3.1.8-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:9cf94411f5a9064cf4ab1066976a7bce44f970f9603a01585c1040465eb312f9"}, | ||
| 44 | {file = "psycopg_binary-3.1.8-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a8fee8d846f9614331bd764850b4c1363730d36e88e14aa28ec4639318fd2093"}, | ||
| 45 | {file = "psycopg_binary-3.1.8-cp310-cp310-win_amd64.whl", hash = "sha256:2d5ae85c6037e45862e304d39ec24a24ddebc7d2b5b3601155dddc07c19c0cdc"}, | ||
| 46 | {file = "psycopg_binary-3.1.8-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:17d187743d8ca63d24fa724bfee76e50b6473f1fef998cebcd35348b0d5936de"}, | ||
| 47 | {file = "psycopg_binary-3.1.8-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3762e73b6743139c5258d8b3a294edb309c691ba4f172c9f272315501390e7c2"}, | ||
| 48 | {file = "psycopg_binary-3.1.8-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:87973d064a72bc2716309381b713f49f57c48100fb1f046943b780a04bc011f6"}, | ||
| 49 | {file = "psycopg_binary-3.1.8-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5f8400d400f64f659a897d1ef67212012524cc44882bd24387515df9bb723364"}, | ||
| 50 | {file = "psycopg_binary-3.1.8-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f45766ce8e74eb456d8672116e936391e67290c50fd0cc1b41876b61261869b6"}, | ||
| 51 | {file = "psycopg_binary-3.1.8-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:33ecf37c6348232073ea62b0630655479021f855635f72b4170693032993cdaf"}, | ||
| 52 | {file = "psycopg_binary-3.1.8-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:10b8f1f96f5e8f02a60ba76dab315d3e71cb76c18ff49aa18bbf48a8089c3202"}, | ||
| 53 | {file = "psycopg_binary-3.1.8-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:58cb0d007768dbccb67783baacf1c4016c7be8a494339a514321edee3d3b787a"}, | ||
| 54 | {file = "psycopg_binary-3.1.8-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:59d8dbea1bc3dbbc819c0320cb2b641dc362389b096098c62172f49605f58284"}, | ||
| 55 | {file = "psycopg_binary-3.1.8-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:4325cee1641c25719bcf063f7683e909cb8cc9932ace3f8bf20ce112e47ce743"}, | ||
| 56 | {file = "psycopg_binary-3.1.8-cp311-cp311-win_amd64.whl", hash = "sha256:064502d191d7bc32a48670cc605ce49abcdb5e01e2697ee3fe546cff330fb8ae"}, | ||
| 57 | {file = "psycopg_binary-3.1.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5fd8492931865cc7181169b2dbf472377a5b5808f001e73f5c25b05bb61e9622"}, | ||
| 58 | {file = "psycopg_binary-3.1.8-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4d1a4ea2ca20f0bc944bc28e4addb80e6a22ac60a85fc7035e57c88e96f3a18"}, | ||
| 59 | {file = "psycopg_binary-3.1.8-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c27be5ddf4a05146ae7fb8429e9367dad0dc278a7d0e2f5094dd533195c4f8a1"}, | ||
| 60 | {file = "psycopg_binary-3.1.8-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fa8ca48a35be0f9880ed2093c213f07d318fa9389a2b9194196c239e41a77841"}, | ||
| 61 | {file = "psycopg_binary-3.1.8-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf59e1d06f420930fc4c16a42ed6476c60c83976c82e53012dbca45f009d5978"}, | ||
| 62 | {file = "psycopg_binary-3.1.8-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:cb3013b76cbab4a903f3b9c87f4518335627cb05fd89f9e04520c1743c2b919b"}, | ||
| 63 | {file = "psycopg_binary-3.1.8-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:db84eaa9e2d13e37a97dcd39d2fe78e0a3052c9aa67b5f0b4f3d346a155f4d21"}, | ||
| 64 | {file = "psycopg_binary-3.1.8-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:2c3d268cf2dbb79e52a555c2e7b26c6df2d014f3fb918d512ffc25ecc9c54582"}, | ||
| 65 | {file = "psycopg_binary-3.1.8-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:0fe6205af5f63ee6e4816b267bf06add5934a259cddcf7dfdfc8ed738f5127b2"}, | ||
| 66 | {file = "psycopg_binary-3.1.8-cp37-cp37m-win_amd64.whl", hash = "sha256:f99806a5b9a5ba5cb5f46a0fa0440cd721556e0af09a7cadcc39e27ae9b1807e"}, | ||
| 67 | {file = "psycopg_binary-3.1.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0cc5d5a9b0acbf38e0b4de1c701d235f0cb750ef3de528dedfdbab1a367f2396"}, | ||
| 68 | {file = "psycopg_binary-3.1.8-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:478ecbb774398e5df6ee365a4d0a77f382a65f140e76720909804255c7801d4a"}, | ||
| 69 | {file = "psycopg_binary-3.1.8-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b40b56c5b3ffa8481f7bebb08473602ddb8e2e86ba25bf9261ba428eb7887175"}, | ||
| 70 | {file = "psycopg_binary-3.1.8-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:37df8714837d2c701ba4c54462a189b95d1a4439d4d147fb71018560e9a60547"}, | ||
| 71 | {file = "psycopg_binary-3.1.8-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:29a38b48cbec8484d83efea4d1d0707e49a3c51a2273cfbaa3d9ba280d3df7d9"}, | ||
| 72 | {file = "psycopg_binary-3.1.8-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c1a2209ef4df25f4ed8d91924bd4d9c7028d254e61216366c4b894c8a6ea4f88"}, | ||
| 73 | {file = "psycopg_binary-3.1.8-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:858a794c2d5e984627503581f03cc68cef97ee080993b7b6a0b7b30cb4fac107"}, | ||
| 74 | {file = "psycopg_binary-3.1.8-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:574c8b7b51e8d5c06f27125fc218d1328c018c0c1ad8f1202033aa6897b8ee99"}, | ||
| 75 | {file = "psycopg_binary-3.1.8-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:e3dc783eedde10f966039ecc5f96f7df25c288ea4f6795d28b990f312c33ff09"}, | ||
| 76 | {file = "psycopg_binary-3.1.8-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:94f9e7ccbfdba1c4f5de80b615187eb47a351ab64a9123d87aea4bf347c1e1d8"}, | ||
| 77 | {file = "psycopg_binary-3.1.8-cp38-cp38-win_amd64.whl", hash = "sha256:1425c2cc4cfd4778d9dee578541f11546a93fc2f5c558a0411c94026a1cf94c7"}, | ||
| 78 | {file = "psycopg_binary-3.1.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e68e8b8077cd45dd2683fcd9a384e7672b400e26c0c7d04dac0cf0763c12be78"}, | ||
| 79 | {file = "psycopg_binary-3.1.8-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:60b22dd46e4e4f678379cf3388468171c2ecea74e90b1332d173ffa8cd83315f"}, | ||
| 80 | {file = "psycopg_binary-3.1.8-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:61a1ccef7e0bf6128a7818c9d22cc850cf7649cee9541e82e4a8c080a734024d"}, | ||
| 81 | {file = "psycopg_binary-3.1.8-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2e7a7b41eba96c7b9648efee57298f1aa0d96e081dea76489f52113536981712"}, | ||
| 82 | {file = "psycopg_binary-3.1.8-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a161785b1c8e26cd8e8d5436fa39ba2a8af590c17f1741aae11f8076a08485e6"}, | ||
| 83 | {file = "psycopg_binary-3.1.8-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a978d2bea09265eb6ebcd1b8a3aa05ea4118aa4013cb9669e12a8656975385cd"}, | ||
| 84 | {file = "psycopg_binary-3.1.8-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:251d2e6dca112dd359c029f422a025d75e78f2f2af4a2aceff506fdc5120f5f9"}, | ||
| 85 | {file = "psycopg_binary-3.1.8-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:a1f052642a54eda53786fa8b72fca2e48ceaf0fc2f3e8709c87694fd7c45ac50"}, | ||
| 86 | {file = "psycopg_binary-3.1.8-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:73747e6a5dfb05500ff3857f9b9ee50e4f4f663250454d773b98d818545f10fa"}, | ||
| 87 | {file = "psycopg_binary-3.1.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:811d870ca9e97875db92f9b346492c4fa7a9edd74dce3604015dd13389fef46a"}, | ||
| 88 | {file = "psycopg_binary-3.1.8-cp39-cp39-win_amd64.whl", hash = "sha256:8a0f425171e95379f1fe93b41d67c6dfe85b6b635944facf07ca26ff7fa8ab1d"}, | ||
| 89 | ] | ||
| 90 | |||
| 91 | [[package]] | ||
| 92 | name = "psycopg-pool" | ||
| 93 | version = "3.1.7" | ||
| 94 | description = "Connection Pool for Psycopg" | ||
| 95 | category = "main" | ||
| 96 | optional = false | ||
| 97 | python-versions = ">=3.7" | ||
| 98 | files = [ | ||
| 99 | {file = "psycopg-pool-3.1.7.tar.gz", hash = "sha256:d02741dc48303495f4021900630442af87d6b1c3bfd1a3ece54cc11aa43d7dde"}, | ||
| 100 | {file = "psycopg_pool-3.1.7-py3-none-any.whl", hash = "sha256:ca1f2c366b5910acd400e16e812912827c57836af638c1717ba495111d22073b"}, | ||
| 101 | ] | ||
| 102 | |||
| 103 | [package.dependencies] | ||
| 104 | typing-extensions = ">=3.10" | ||
| 105 | |||
| 106 | [[package]] | ||
| 107 | name = "sdnotify" | ||
| 108 | version = "0.3.2" | ||
| 109 | description = "A pure Python implementation of systemd's service notification protocol (sd_notify)" | ||
| 110 | category = "main" | ||
| 111 | optional = false | ||
| 112 | python-versions = "*" | ||
| 113 | files = [ | ||
| 114 | {file = "sdnotify-0.3.2.tar.gz", hash = "sha256:73977fc746b36cc41184dd43c3fe81323e7b8b06c2bb0826c4f59a20c56bb9f1"}, | ||
| 115 | ] | ||
| 116 | |||
| 117 | [[package]] | ||
| 118 | name = "systemd-python" | ||
| 119 | version = "235" | ||
| 120 | description = "Python interface for libsystemd" | ||
| 121 | category = "main" | ||
| 122 | optional = false | ||
| 123 | python-versions = "*" | ||
| 124 | files = [ | ||
| 125 | {file = "systemd-python-235.tar.gz", hash = "sha256:4e57f39797fd5d9e2d22b8806a252d7c0106c936039d1e71c8c6b8008e695c0a"}, | ||
| 126 | ] | ||
| 127 | |||
| 128 | [[package]] | ||
| 129 | name = "systemd-socketserver" | ||
| 130 | version = "1.0" | ||
| 131 | description = "Socket server implementation that works with systemd socket activation" | ||
| 132 | category = "main" | ||
| 133 | optional = false | ||
| 134 | python-versions = ">=3" | ||
| 135 | files = [ | ||
| 136 | {file = "systemd_socketserver-1.0-py3-none-any.whl", hash = "sha256:987a8bfbf28d959e7c2966c742ad7bad482f05e121077defcf95bb38267db9a8"}, | ||
| 137 | ] | ||
| 138 | |||
| 139 | [package.dependencies] | ||
| 140 | systemd-python = "*" | ||
| 141 | |||
| 142 | [[package]] | ||
| 143 | name = "typing-extensions" | ||
| 144 | version = "4.5.0" | ||
| 145 | description = "Backported and Experimental Type Hints for Python 3.7+" | ||
| 146 | category = "main" | ||
| 147 | optional = false | ||
| 148 | python-versions = ">=3.7" | ||
| 149 | files = [ | ||
| 150 | {file = "typing_extensions-4.5.0-py3-none-any.whl", hash = "sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4"}, | ||
| 151 | {file = "typing_extensions-4.5.0.tar.gz", hash = "sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb"}, | ||
| 152 | ] | ||
| 153 | |||
| 154 | [[package]] | ||
| 155 | name = "tzdata" | ||
| 156 | version = "2023.3" | ||
| 157 | description = "Provider of IANA time zone data" | ||
| 158 | category = "main" | ||
| 159 | optional = false | ||
| 160 | python-versions = ">=2" | ||
| 161 | files = [ | ||
| 162 | {file = "tzdata-2023.3-py2.py3-none-any.whl", hash = "sha256:7e65763eef3120314099b6939b5546db7adce1e7d6f2e179e3df563c70511eda"}, | ||
| 163 | {file = "tzdata-2023.3.tar.gz", hash = "sha256:11ef1e08e54acb0d4f95bdb1be05da659673de4acbd21bf9c69e94cc5e907a3a"}, | ||
| 164 | ] | ||
| 165 | |||
| 166 | [metadata] | ||
| 167 | lock-version = "2.0" | ||
| 168 | python-versions = "^3.9" | ||
| 169 | content-hash = "caba2a43081cb7820a3d1243e0c4aae70e0604405fbe1601cea99bd93a2f1429" | ||
diff --git a/hosts/surtr/email/ccert-policy-server/pyproject.toml b/hosts/surtr/email/ccert-policy-server/pyproject.toml index 97a18c65..518bd4f9 100644 --- a/hosts/surtr/email/ccert-policy-server/pyproject.toml +++ b/hosts/surtr/email/ccert-policy-server/pyproject.toml | |||
| @@ -1,20 +1,30 @@ | |||
| 1 | [tool.poetry] | 1 | [project] |
| 2 | name = "ccert_policy_server" | 2 | name = "ccert_policy_server" |
| 3 | version = "0.0.0" | 3 | version = "0.0.0" |
| 4 | authors = ["Gregor Kleen <gkleen@yggdrasil.li>"] | ||
| 5 | description = "" | 4 | description = "" |
| 5 | authors = [{ name = "Gregor Kleen", email = "gkleen@yggdrasil.li" }] | ||
| 6 | requires-python = ">=3.12,<4" | ||
| 7 | classifiers = [ | ||
| 8 | "Programming Language :: Python :: 3", | ||
| 9 | "Programming Language :: Python :: 3.12", | ||
| 10 | "Programming Language :: Python :: 3.13", | ||
| 11 | "Programming Language :: Python :: 3.14", | ||
| 12 | ] | ||
| 13 | dependencies = [ | ||
| 14 | "sdnotify>=0.3.2,<0.4", | ||
| 15 | "systemd-socketserver>=1.0,<2", | ||
| 16 | "psycopg>=3.3,<4", | ||
| 17 | "psycopg-pool>=3.3,<4", | ||
| 18 | "psycopg-binary>=3.3.3,<4", | ||
| 19 | ] | ||
| 6 | 20 | ||
| 7 | [tool.poetry.scripts] | 21 | [project.scripts] |
| 8 | ccert-policy-server = "ccert_policy_server.__main__:main" | 22 | ccert-policy-server = "ccert_policy_server.__main__:main" |
| 9 | 23 | ||
| 10 | [tool.poetry.dependencies] | ||
| 11 | python = "^3.9" | ||
| 12 | sdnotify = "^0.3.2" | ||
| 13 | systemd-socketserver = "^1.0" | ||
| 14 | psycopg = "^3.1.8" | ||
| 15 | psycopg-pool = "^3.1.7" | ||
| 16 | psycopg-binary = "^3.1.8" | ||
| 17 | |||
| 18 | [build-system] | 24 | [build-system] |
| 19 | requires = ["poetry-core>=1.0.0"] | 25 | requires = ["uv_build>=0.10.9,<0.11.0"] |
| 20 | build-backend = "poetry.core.masonry.api" \ No newline at end of file | 26 | build-backend = "uv_build" |
| 27 | |||
| 28 | [tool.uv.build-backend] | ||
| 29 | module-root = "." | ||
| 30 | module-name = ["ccert_policy_server"] | ||
diff --git a/hosts/surtr/email/ccert-policy-server/uv.lock b/hosts/surtr/email/ccert-policy-server/uv.lock new file mode 100644 index 00000000..0024400b --- /dev/null +++ b/hosts/surtr/email/ccert-policy-server/uv.lock | |||
| @@ -0,0 +1,130 @@ | |||
| 1 | version = 1 | ||
| 2 | revision = 3 | ||
| 3 | requires-python = ">=3.12, <4" | ||
| 4 | |||
| 5 | [[package]] | ||
| 6 | name = "ccert-policy-server" | ||
| 7 | version = "0.0.0" | ||
| 8 | source = { editable = "." } | ||
| 9 | dependencies = [ | ||
| 10 | { name = "psycopg" }, | ||
| 11 | { name = "psycopg-binary" }, | ||
| 12 | { name = "psycopg-pool" }, | ||
| 13 | { name = "sdnotify" }, | ||
| 14 | { name = "systemd-socketserver" }, | ||
| 15 | ] | ||
| 16 | |||
| 17 | [package.metadata] | ||
| 18 | requires-dist = [ | ||
| 19 | { name = "psycopg", specifier = ">=3.3,<4" }, | ||
| 20 | { name = "psycopg-binary", specifier = ">=3.3.3,<4" }, | ||
| 21 | { name = "psycopg-pool", specifier = ">=3.3,<4" }, | ||
| 22 | { name = "sdnotify", specifier = ">=0.3.2,<0.4" }, | ||
| 23 | { name = "systemd-socketserver", specifier = ">=1.0,<2" }, | ||
| 24 | ] | ||
| 25 | |||
| 26 | [[package]] | ||
| 27 | name = "psycopg" | ||
| 28 | version = "3.3.3" | ||
| 29 | source = { registry = "https://pypi.org/simple" } | ||
| 30 | dependencies = [ | ||
| 31 | { name = "typing-extensions", marker = "python_full_version < '3.13'" }, | ||
| 32 | { name = "tzdata", marker = "sys_platform == 'win32'" }, | ||
| 33 | ] | ||
| 34 | sdist = { url = "https://files.pythonhosted.org/packages/d3/b6/379d0a960f8f435ec78720462fd94c4863e7a31237cf81bf76d0af5883bf/psycopg-3.3.3.tar.gz", hash = "sha256:5e9a47458b3c1583326513b2556a2a9473a1001a56c9efe9e587245b43148dd9", size = 165624, upload-time = "2026-02-18T16:52:16.546Z" } | ||
| 35 | wheels = [ | ||
| 36 | { url = "https://files.pythonhosted.org/packages/c8/5b/181e2e3becb7672b502f0ed7f16ed7352aca7c109cfb94cf3878a9186db9/psycopg-3.3.3-py3-none-any.whl", hash = "sha256:f96525a72bcfade6584ab17e89de415ff360748c766f0106959144dcbb38c698", size = 212768, upload-time = "2026-02-18T16:46:27.365Z" }, | ||
| 37 | ] | ||
| 38 | |||
| 39 | [[package]] | ||
| 40 | name = "psycopg-binary" | ||
| 41 | version = "3.3.3" | ||
| 42 | source = { registry = "https://pypi.org/simple" } | ||
| 43 | wheels = [ | ||
| 44 | { url = "https://files.pythonhosted.org/packages/90/15/021be5c0cbc5b7c1ab46e91cc3434eb42569f79a0592e67b8d25e66d844d/psycopg_binary-3.3.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6698dbab5bcef8fdb570fc9d35fd9ac52041771bfcfe6fd0fc5f5c4e36f1e99d", size = 4591170, upload-time = "2026-02-18T16:48:55.594Z" }, | ||
| 45 | { url = "https://files.pythonhosted.org/packages/f1/54/a60211c346c9a2f8c6b272b5f2bbe21f6e11800ce7f61e99ba75cf8b63e1/psycopg_binary-3.3.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:329ff393441e75f10b673ae99ab45276887993d49e65f141da20d915c05aafd8", size = 4670009, upload-time = "2026-02-18T16:49:03.608Z" }, | ||
| 46 | { url = "https://files.pythonhosted.org/packages/c1/53/ac7c18671347c553362aadbf65f92786eef9540676ca24114cc02f5be405/psycopg_binary-3.3.3-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:eb072949b8ebf4082ae24289a2b0fd724da9adc8f22743409d6fd718ddb379df", size = 5469735, upload-time = "2026-02-18T16:49:10.128Z" }, | ||
| 47 | { url = "https://files.pythonhosted.org/packages/7f/c3/4f4e040902b82a344eff1c736cde2f2720f127fe939c7e7565706f96dd44/psycopg_binary-3.3.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:263a24f39f26e19ed7fc982d7859a36f17841b05bebad3eb47bb9cd2dd785351", size = 5152919, upload-time = "2026-02-18T16:49:16.335Z" }, | ||
| 48 | { url = "https://files.pythonhosted.org/packages/0c/e7/d929679c6a5c212bcf738806c7c89f5b3d0919f2e1685a0e08d6ff877945/psycopg_binary-3.3.3-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5152d50798c2fa5bd9b68ec68eb68a1b71b95126c1d70adaa1a08cd5eefdc23d", size = 6738785, upload-time = "2026-02-18T16:49:22.687Z" }, | ||
| 49 | { url = "https://files.pythonhosted.org/packages/69/b0/09703aeb69a9443d232d7b5318d58742e8ca51ff79f90ffe6b88f1db45e7/psycopg_binary-3.3.3-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9d6a1e56dd267848edb824dbeb08cf5bac649e02ee0b03ba883ba3f4f0bd54f2", size = 4979008, upload-time = "2026-02-18T16:49:27.313Z" }, | ||
| 50 | { url = "https://files.pythonhosted.org/packages/cc/a6/e662558b793c6e13a7473b970fee327d635270e41eded3090ef14045a6a5/psycopg_binary-3.3.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:73eaaf4bb04709f545606c1db2f65f4000e8a04cdbf3e00d165a23004692093e", size = 4508255, upload-time = "2026-02-18T16:49:31.575Z" }, | ||
| 51 | { url = "https://files.pythonhosted.org/packages/5f/7f/0f8b2e1d5e0093921b6f324a948a5c740c1447fbb45e97acaf50241d0f39/psycopg_binary-3.3.3-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:162e5675efb4704192411eaf8e00d07f7960b679cd3306e7efb120bb8d9456cc", size = 4189166, upload-time = "2026-02-18T16:49:35.801Z" }, | ||
| 52 | { url = "https://files.pythonhosted.org/packages/92/ec/ce2e91c33bc8d10b00c87e2f6b0fb570641a6a60042d6a9ae35658a3a797/psycopg_binary-3.3.3-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:fab6b5e37715885c69f5d091f6ff229be71e235f272ebaa35158d5a46fd548a0", size = 3924544, upload-time = "2026-02-18T16:49:41.129Z" }, | ||
| 53 | { url = "https://files.pythonhosted.org/packages/c5/2f/7718141485f73a924205af60041c392938852aa447a94c8cbd222ff389a1/psycopg_binary-3.3.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a4aab31bd6d1057f287c96c0effca3a25584eb9cc702f282ecb96ded7814e830", size = 4235297, upload-time = "2026-02-18T16:49:46.726Z" }, | ||
| 54 | { url = "https://files.pythonhosted.org/packages/57/f9/1add717e2643a003bbde31b1b220172e64fbc0cb09f06429820c9173f7fc/psycopg_binary-3.3.3-cp312-cp312-win_amd64.whl", hash = "sha256:59aa31fe11a0e1d1bcc2ce37ed35fe2ac84cd65bb9036d049b1a1c39064d0f14", size = 3547659, upload-time = "2026-02-18T16:49:52.999Z" }, | ||
| 55 | { url = "https://files.pythonhosted.org/packages/03/0a/cac9fdf1df16a269ba0e5f0f06cac61f826c94cadb39df028cdfe19d3a33/psycopg_binary-3.3.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:05f32239aec25c5fb15f7948cffdc2dc0dac098e48b80a140e4ba32b572a2e7d", size = 4590414, upload-time = "2026-02-18T16:50:01.441Z" }, | ||
| 56 | { url = "https://files.pythonhosted.org/packages/9c/c0/d8f8508fbf440edbc0099b1abff33003cd80c9e66eb3a1e78834e3fb4fb9/psycopg_binary-3.3.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:7c84f9d214f2d1de2fafebc17fa68ac3f6561a59e291553dfc45ad299f4898c1", size = 4669021, upload-time = "2026-02-18T16:50:08.803Z" }, | ||
| 57 | { url = "https://files.pythonhosted.org/packages/04/05/097016b77e343b4568feddf12c72171fc513acef9a4214d21b9478569068/psycopg_binary-3.3.3-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:e77957d2ba17cada11be09a5066d93026cdb61ada7c8893101d7fe1c6e1f3925", size = 5467453, upload-time = "2026-02-18T16:50:14.985Z" }, | ||
| 58 | { url = "https://files.pythonhosted.org/packages/91/23/73244e5feb55b5ca109cede6e97f32ef45189f0fdac4c80d75c99862729d/psycopg_binary-3.3.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:42961609ac07c232a427da7c87a468d3c82fee6762c220f38e37cfdacb2b178d", size = 5151135, upload-time = "2026-02-18T16:50:24.82Z" }, | ||
| 59 | { url = "https://files.pythonhosted.org/packages/11/49/5309473b9803b207682095201d8708bbc7842ddf3f192488a69204e36455/psycopg_binary-3.3.3-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ae07a3114313dd91fce686cab2f4c44af094398519af0e0f854bc707e1aeedf1", size = 6737315, upload-time = "2026-02-18T16:50:35.106Z" }, | ||
| 60 | { url = "https://files.pythonhosted.org/packages/d4/5d/03abe74ef34d460b33c4d9662bf6ec1dd38888324323c1a1752133c10377/psycopg_binary-3.3.3-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d257c58d7b36a621dcce1d01476ad8b60f12d80eb1406aee4cf796f88b2ae482", size = 4979783, upload-time = "2026-02-18T16:50:42.067Z" }, | ||
| 61 | { url = "https://files.pythonhosted.org/packages/f0/6c/3fbf8e604e15f2f3752900434046c00c90bb8764305a1b81112bff30ba24/psycopg_binary-3.3.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:07c7211f9327d522c9c47560cae00a4ecf6687f4e02d779d035dd3177b41cb12", size = 4509023, upload-time = "2026-02-18T16:50:50.116Z" }, | ||
| 62 | { url = "https://files.pythonhosted.org/packages/9c/6b/1a06b43b7c7af756c80b67eac8bfaa51d77e68635a8a8d246e4f0bb7604a/psycopg_binary-3.3.3-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:8e7e9eca9b363dbedeceeadd8be97149d2499081f3c52d141d7cd1f395a91f83", size = 4185874, upload-time = "2026-02-18T16:50:55.97Z" }, | ||
| 63 | { url = "https://files.pythonhosted.org/packages/2b/d3/bf49e3dcaadba510170c8d111e5e69e5ae3f981c1554c5bb71c75ce354bb/psycopg_binary-3.3.3-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:cb85b1d5702877c16f28d7b92ba030c1f49ebcc9b87d03d8c10bf45a2f1c7508", size = 3925668, upload-time = "2026-02-18T16:51:03.299Z" }, | ||
| 64 | { url = "https://files.pythonhosted.org/packages/f8/92/0aac830ed6a944fe334404e1687a074e4215630725753f0e3e9a9a595b62/psycopg_binary-3.3.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4d4606c84d04b80f9138d72f1e28c6c02dc5ae0c7b8f3f8aaf89c681ce1cd1b1", size = 4234973, upload-time = "2026-02-18T16:51:09.097Z" }, | ||
| 65 | { url = "https://files.pythonhosted.org/packages/2e/96/102244653ee5a143ece5afe33f00f52fe64e389dfce8dbc87580c6d70d3d/psycopg_binary-3.3.3-cp313-cp313-win_amd64.whl", hash = "sha256:74eae563166ebf74e8d950ff359be037b85723d99ca83f57d9b244a871d6c13b", size = 3551342, upload-time = "2026-02-18T16:51:13.892Z" }, | ||
| 66 | { url = "https://files.pythonhosted.org/packages/a2/71/7a57e5b12275fe7e7d84d54113f0226080423a869118419c9106c083a21c/psycopg_binary-3.3.3-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:497852c5eaf1f0c2d88ab74a64a8097c099deac0c71de1cbcf18659a8a04a4b2", size = 4607368, upload-time = "2026-02-18T16:51:19.295Z" }, | ||
| 67 | { url = "https://files.pythonhosted.org/packages/c7/04/cb834f120f2b2c10d4003515ef9ca9d688115b9431735e3936ae48549af8/psycopg_binary-3.3.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:258d1ea53464d29768bf25930f43291949f4c7becc706f6e220c515a63a24edd", size = 4687047, upload-time = "2026-02-18T16:51:23.84Z" }, | ||
| 68 | { url = "https://files.pythonhosted.org/packages/40/e9/47a69692d3da9704468041aa5ed3ad6fc7f6bb1a5ae788d261a26bbca6c7/psycopg_binary-3.3.3-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:111c59897a452196116db12e7f608da472fbff000693a21040e35fc978b23430", size = 5487096, upload-time = "2026-02-18T16:51:29.645Z" }, | ||
| 69 | { url = "https://files.pythonhosted.org/packages/0b/b6/0e0dd6a2f802864a4ae3dbadf4ec620f05e3904c7842b326aafc43e5f464/psycopg_binary-3.3.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:17bb6600e2455993946385249a3c3d0af52cd70c1c1cdbf712e9d696d0b0bf1b", size = 5168720, upload-time = "2026-02-18T16:51:36.499Z" }, | ||
| 70 | { url = "https://files.pythonhosted.org/packages/6f/0d/977af38ac19a6b55d22dff508bd743fd7c1901e1b73657e7937c7cccb0a3/psycopg_binary-3.3.3-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:642050398583d61c9856210568eb09a8e4f2fe8224bf3be21b67a370e677eead", size = 6762076, upload-time = "2026-02-18T16:51:43.167Z" }, | ||
| 71 | { url = "https://files.pythonhosted.org/packages/34/40/912a39d48322cf86895c0eaf2d5b95cb899402443faefd4b09abbba6b6e1/psycopg_binary-3.3.3-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:533efe6dc3a7cba5e2a84e38970786bb966306863e45f3db152007e9f48638a6", size = 4997623, upload-time = "2026-02-18T16:51:47.707Z" }, | ||
| 72 | { url = "https://files.pythonhosted.org/packages/98/0c/c14d0e259c65dc7be854d926993f151077887391d5a081118907a9d89603/psycopg_binary-3.3.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:5958dbf28b77ce2033482f6cb9ef04d43f5d8f4b7636e6963d5626f000efb23e", size = 4532096, upload-time = "2026-02-18T16:51:51.421Z" }, | ||
| 73 | { url = "https://files.pythonhosted.org/packages/39/21/8b7c50a194cfca6ea0fd4d1f276158307785775426e90700ab2eba5cd623/psycopg_binary-3.3.3-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:a6af77b6626ce92b5817bf294b4d45ec1a6161dba80fc2d82cdffdd6814fd023", size = 4208884, upload-time = "2026-02-18T16:51:57.336Z" }, | ||
| 74 | { url = "https://files.pythonhosted.org/packages/c7/2c/a4981bf42cf30ebba0424971d7ce70a222ae9b82594c42fc3f2105d7b525/psycopg_binary-3.3.3-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:47f06fcbe8542b4d96d7392c476a74ada521c5aebdb41c3c0155f6595fc14c8d", size = 3944542, upload-time = "2026-02-18T16:52:04.266Z" }, | ||
| 75 | { url = "https://files.pythonhosted.org/packages/60/e9/b7c29b56aa0b85a4e0c4d89db691c1ceef08f46a356369144430c155a2f5/psycopg_binary-3.3.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:e7800e6c6b5dc4b0ca7cc7370f770f53ac83886b76afda0848065a674231e856", size = 4254339, upload-time = "2026-02-18T16:52:10.444Z" }, | ||
| 76 | { url = "https://files.pythonhosted.org/packages/98/5a/291d89f44d3820fffb7a04ebc8f3ef5dda4f542f44a5daea0c55a84abf45/psycopg_binary-3.3.3-cp314-cp314-win_amd64.whl", hash = "sha256:165f22ab5a9513a3d7425ffb7fcc7955ed8ccaeef6d37e369d6cc1dff1582383", size = 3652796, upload-time = "2026-02-18T16:52:14.02Z" }, | ||
| 77 | ] | ||
| 78 | |||
| 79 | [[package]] | ||
| 80 | name = "psycopg-pool" | ||
| 81 | version = "3.3.0" | ||
| 82 | source = { registry = "https://pypi.org/simple" } | ||
| 83 | dependencies = [ | ||
| 84 | { name = "typing-extensions" }, | ||
| 85 | ] | ||
| 86 | sdist = { url = "https://files.pythonhosted.org/packages/56/9a/9470d013d0d50af0da9c4251614aeb3c1823635cab3edc211e3839db0bcf/psycopg_pool-3.3.0.tar.gz", hash = "sha256:fa115eb2860bd88fce1717d75611f41490dec6135efb619611142b24da3f6db5", size = 31606, upload-time = "2025-12-01T11:34:33.11Z" } | ||
| 87 | wheels = [ | ||
| 88 | { url = "https://files.pythonhosted.org/packages/e7/c3/26b8a0908a9db249de3b4169692e1c7c19048a9bc41a4d3209cee7dbb758/psycopg_pool-3.3.0-py3-none-any.whl", hash = "sha256:2e44329155c410b5e8666372db44276a8b1ebd8c90f1c3026ebba40d4bc81063", size = 39995, upload-time = "2025-12-01T11:34:29.761Z" }, | ||
| 89 | ] | ||
| 90 | |||
| 91 | [[package]] | ||
| 92 | name = "sdnotify" | ||
| 93 | version = "0.3.2" | ||
| 94 | source = { registry = "https://pypi.org/simple" } | ||
| 95 | sdist = { url = "https://files.pythonhosted.org/packages/ce/d8/9fdc36b2a912bf78106de4b3f0de3891ff8f369e7a6f80be842b8b0b6bd5/sdnotify-0.3.2.tar.gz", hash = "sha256:73977fc746b36cc41184dd43c3fe81323e7b8b06c2bb0826c4f59a20c56bb9f1", size = 2459, upload-time = "2017-08-02T20:03:44.395Z" } | ||
| 96 | |||
| 97 | [[package]] | ||
| 98 | name = "systemd-python" | ||
| 99 | version = "235" | ||
| 100 | source = { registry = "https://pypi.org/simple" } | ||
| 101 | sdist = { url = "https://files.pythonhosted.org/packages/10/9e/ab4458e00367223bda2dd7ccf0849a72235ee3e29b36dce732685d9b7ad9/systemd-python-235.tar.gz", hash = "sha256:4e57f39797fd5d9e2d22b8806a252d7c0106c936039d1e71c8c6b8008e695c0a", size = 61677, upload-time = "2023-02-11T13:42:16.588Z" } | ||
| 102 | |||
| 103 | [[package]] | ||
| 104 | name = "systemd-socketserver" | ||
| 105 | version = "1.0" | ||
| 106 | source = { registry = "https://pypi.org/simple" } | ||
| 107 | dependencies = [ | ||
| 108 | { name = "systemd-python" }, | ||
| 109 | ] | ||
| 110 | wheels = [ | ||
| 111 | { url = "https://files.pythonhosted.org/packages/d8/4f/b28b7f08880120a26669b080ca74487c8c67e8b54dcb0467a8f0c9f38ed6/systemd_socketserver-1.0-py3-none-any.whl", hash = "sha256:987a8bfbf28d959e7c2966c742ad7bad482f05e121077defcf95bb38267db9a8", size = 3248, upload-time = "2020-04-26T05:26:40.661Z" }, | ||
| 112 | ] | ||
| 113 | |||
| 114 | [[package]] | ||
| 115 | name = "typing-extensions" | ||
| 116 | version = "4.15.0" | ||
| 117 | source = { registry = "https://pypi.org/simple" } | ||
| 118 | sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" } | ||
| 119 | wheels = [ | ||
| 120 | { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" }, | ||
| 121 | ] | ||
| 122 | |||
| 123 | [[package]] | ||
| 124 | name = "tzdata" | ||
| 125 | version = "2025.3" | ||
| 126 | source = { registry = "https://pypi.org/simple" } | ||
| 127 | sdist = { url = "https://files.pythonhosted.org/packages/5e/a7/c202b344c5ca7daf398f3b8a477eeb205cf3b6f32e7ec3a6bac0629ca975/tzdata-2025.3.tar.gz", hash = "sha256:de39c2ca5dc7b0344f2eba86f49d614019d29f060fc4ebc8a417896a620b56a7", size = 196772, upload-time = "2025-12-13T17:45:35.667Z" } | ||
| 128 | wheels = [ | ||
| 129 | { url = "https://files.pythonhosted.org/packages/c7/b0/003792df09decd6849a5e39c28b513c06e84436a54440380862b5aeff25d/tzdata-2025.3-py2.py3-none-any.whl", hash = "sha256:06a47e5700f3081aab02b2e513160914ff0694bce9947d6b76ebd6bf57cfc5d1", size = 348521, upload-time = "2025-12-13T17:45:33.889Z" }, | ||
| 130 | ] | ||
diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix index 4196a8bc..4243366c 100644 --- a/hosts/surtr/email/default.nix +++ b/hosts/surtr/email/default.nix | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | { config, pkgs, lib, flakeInputs, ... }: | 1 | { config, pkgs, lib, flake, flakeInputs, ... }: |
| 2 | 2 | ||
| 3 | with lib; | 3 | with lib; |
| 4 | 4 | ||
| @@ -15,30 +15,49 @@ let | |||
| 15 | 15 | ||
| 16 | for file in $out/pipe/bin/*; do | 16 | for file in $out/pipe/bin/*; do |
| 17 | wrapProgram $file \ | 17 | wrapProgram $file \ |
| 18 | --set PATH "${pkgs.coreutils}/bin:${pkgs.rspamd}/bin" | 18 | --set PATH "${makeBinPath (with pkgs; [coreutils rspamd])}" |
| 19 | done | 19 | done |
| 20 | ''; | 20 | ''; |
| 21 | }; | 21 | }; |
| 22 | 22 | ||
| 23 | ccert-policy-server = | 23 | ccert-policy-server = |
| 24 | with pkgs.poetry2nix; | 24 | let |
| 25 | mkPoetryApplication { | 25 | workspace = flakeInputs.uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./ccert-policy-server; }; |
| 26 | python = pkgs.python311; | 26 | pythonSet = flake.lib.pythonSet { |
| 27 | 27 | inherit pkgs; | |
| 28 | projectDir = cleanPythonSources { src = ./ccert-policy-server; }; | 28 | python = pkgs.python312; |
| 29 | 29 | overlay = workspace.mkPyprojectOverlay { | |
| 30 | overrides = overrides.withDefaults (self: super: { | 30 | sourcePreference = "wheel"; |
| 31 | systemd-python = super.systemd-python.overridePythonAttrs (oldAttrs: { | 31 | }; |
| 32 | buildInputs = (oldAttrs.buildInputs or []) ++ [ super.setuptools ]; | 32 | }; |
| 33 | }); | 33 | virtualEnv = pythonSet.mkVirtualEnv "ccert-policy-server-env" workspace.deps.default; |
| 34 | }); | 34 | in virtualEnv.overrideAttrs (oldAttrs: { |
| 35 | }; | 35 | meta = (oldAttrs.meta or {}) // { |
| 36 | 36 | mainProgram = "ccert-policy-server"; | |
| 37 | nftables-nologin-script = pkgs.writeScript "nftables-mail-nologin" '' | 37 | }; |
| 38 | #!${pkgs.zsh}/bin/zsh | 38 | }); |
| 39 | internal-policy-server = | ||
| 40 | let | ||
| 41 | workspace = flakeInputs.uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./internal-policy-server; }; | ||
| 42 | pythonSet = flake.lib.pythonSet { | ||
| 43 | inherit pkgs; | ||
| 44 | python = pkgs.python312; | ||
| 45 | overlay = workspace.mkPyprojectOverlay { | ||
| 46 | sourcePreference = "wheel"; | ||
| 47 | }; | ||
| 48 | }; | ||
| 49 | virtualEnv = pythonSet.mkVirtualEnv "internal-policy-server-env" workspace.deps.default; | ||
| 50 | in virtualEnv.overrideAttrs (oldAttrs: { | ||
| 51 | meta = (oldAttrs.meta or {}) // { | ||
| 52 | mainProgram = "internal-policy-server"; | ||
| 53 | }; | ||
| 54 | }); | ||
| 39 | 55 | ||
| 56 | nftables-nologin-script = pkgs.resholve.writeScript "nftables-mail-nologin" { | ||
| 57 | inputs = with pkgs; [inetutils nftables gnugrep findutils]; | ||
| 58 | interpreter = lib.getExe pkgs.zsh; | ||
| 59 | } '' | ||
| 40 | set -e | 60 | set -e |
| 41 | export PATH="${lib.makeBinPath (with pkgs; [inetutils nftables])}:$PATH" | ||
| 42 | 61 | ||
| 43 | typeset -a as_sets mnt_bys route route6 | 62 | typeset -a as_sets mnt_bys route route6 |
| 44 | as_sets=(${lib.escapeShellArgs config.services.email.nologin.ASSets}) | 63 | as_sets=(${lib.escapeShellArgs config.services.email.nologin.ASSets}) |
| @@ -51,7 +70,7 @@ let | |||
| 51 | elif [[ "''${line}" =~ "^route6:\s+(.+)$" ]]; then | 70 | elif [[ "''${line}" =~ "^route6:\s+(.+)$" ]]; then |
| 52 | route6+=($match[1]) | 71 | route6+=($match[1]) |
| 53 | fi | 72 | fi |
| 54 | done < <(whois -h whois.radb.net "!i''${as_set},1" | egrep -o 'AS[0-9]+' | xargs -- whois -h whois.radb.net -- -i origin) | 73 | done < <(whois -h whois.radb.net "!i''${as_set},1" | grep -Eo 'AS[0-9]+' | xargs whois -h whois.radb.net -- -i origin) |
| 55 | done | 74 | done |
| 56 | for mnt_by in $mnt_bys; do | 75 | for mnt_by in $mnt_bys; do |
| 57 | while IFS=$'\n' read line; do | 76 | while IFS=$'\n' read line; do |
| @@ -108,22 +127,20 @@ in { | |||
| 108 | services.postfix = { | 127 | services.postfix = { |
| 109 | enable = true; | 128 | enable = true; |
| 110 | enableSmtp = false; | 129 | enableSmtp = false; |
| 111 | hostname = "surtr.yggdrasil.li"; | ||
| 112 | recipientDelimiter = ""; | ||
| 113 | setSendmail = true; | 130 | setSendmail = true; |
| 114 | postmasterAlias = ""; rootAlias = ""; extraAliases = ""; | 131 | postmasterAlias = ""; rootAlias = ""; extraAliases = ""; |
| 115 | destination = []; | 132 | settings.main = { |
| 116 | sslCert = "/run/credentials/postfix.service/surtr.yggdrasil.li.pem"; | 133 | recpipient_delimiter = ""; |
| 117 | sslKey = "/run/credentials/postfix.service/surtr.yggdrasil.li.key.pem"; | 134 | mydestination = []; |
| 118 | networks = []; | 135 | mynetworks = []; |
| 119 | config = let | 136 | myhostname = "surtr.yggdrasil.li"; |
| 120 | relay_ccert = "texthash:${pkgs.writeText "relay_ccert" ""}"; | 137 | |
| 121 | in { | ||
| 122 | smtpd_tls_security_level = "may"; | 138 | smtpd_tls_security_level = "may"; |
| 123 | 139 | ||
| 124 | #the dh params | 140 | smtpd_tls_chain_files = [ |
| 125 | smtpd_tls_dh1024_param_file = toString config.security.dhparams.params."postfix-1024".path; | 141 | "/run/credentials/postfix.service/surtr.yggdrasil.li.full.pem" |
| 126 | smtpd_tls_dh512_param_file = toString config.security.dhparams.params."postfix-512".path; | 142 | ]; |
| 143 | |||
| 127 | #enable ECDH | 144 | #enable ECDH |
| 128 | smtpd_tls_eecdh_grade = "strong"; | 145 | smtpd_tls_eecdh_grade = "strong"; |
| 129 | #enabled SSL protocols, don't allow SSLv2 and SSLv3 | 146 | #enabled SSL protocols, don't allow SSLv2 and SSLv3 |
| @@ -155,21 +172,14 @@ in { | |||
| 155 | 172 | ||
| 156 | smtp_tls_connection_reuse = true; | 173 | smtp_tls_connection_reuse = true; |
| 157 | 174 | ||
| 158 | tls_server_sni_maps = ''texthash:${pkgs.writeText "sni" ( | 175 | tls_server_sni_maps = "inline:{${concatMapStringsSep ", " (domain: "{ ${domain} = /run/credentials/postfix.service/${removePrefix "." domain}.full.pem }") (concatMap (domain: [domain "mailin.${domain}" "mailsub.${domain}" ".${domain}"]) emailDomains)}}"; |
| 159 | concatMapStringsSep "\n\n" (domain: | ||
| 160 | concatMapStringsSep "\n" (subdomain: "${subdomain} /run/credentials/postfix.service/${removePrefix "." subdomain}.full.pem") | ||
| 161 | [domain "mailin.${domain}" "mailsub.${domain}" ".${domain}"] | ||
| 162 | ) emailDomains | ||
| 163 | )}''; | ||
| 164 | 176 | ||
| 165 | smtp_tls_policy_maps = "socketmap:unix:${config.services.postfix-mta-sts-resolver.settings.path}:postfix"; | 177 | smtp_tls_policy_maps = "socketmap:unix:${config.services.postfix-mta-sts-resolver.settings.path}:postfix"; |
| 166 | 178 | ||
| 167 | local_recipient_maps = ""; | 179 | local_recipient_maps = ""; |
| 168 | 180 | ||
| 169 | # 10 GiB | 181 | message_size_limit = 10 * 1024 * 1024 * 1024; |
| 170 | message_size_limit = "10737418240"; | 182 | mailbox_size_limit = 10 * 1024 * 1024 * 1024; |
| 171 | # 10 GiB | ||
| 172 | mailbox_size_limit = "10737418240"; | ||
| 173 | 183 | ||
| 174 | smtpd_delay_reject = true; | 184 | smtpd_delay_reject = true; |
| 175 | smtpd_helo_required = true; | 185 | smtpd_helo_required = true; |
| @@ -184,25 +194,26 @@ in { | |||
| 184 | dbname = email | 194 | dbname = email |
| 185 | query = SELECT action FROM virtual_mailbox_access WHERE lookup = '%s' | 195 | query = SELECT action FROM virtual_mailbox_access WHERE lookup = '%s' |
| 186 | ''}" | 196 | ''}" |
| 187 | "check_ccert_access ${relay_ccert}" | ||
| 188 | "reject_non_fqdn_helo_hostname" | 197 | "reject_non_fqdn_helo_hostname" |
| 189 | "reject_invalid_helo_hostname" | 198 | "reject_invalid_helo_hostname" |
| 190 | "reject_unauth_destination" | 199 | "reject_unauth_destination" |
| 191 | "reject_unknown_recipient_domain" | 200 | "reject_unknown_recipient_domain" |
| 192 | "reject_unverified_recipient" | 201 | "reject_unverified_recipient" |
| 202 | "check_policy_service unix:/run/postfix-internal-policy.sock" | ||
| 193 | ]; | 203 | ]; |
| 194 | unverified_recipient_reject_code = "550"; | 204 | unverified_recipient_reject_code = "550"; |
| 195 | unverified_recipient_reject_reason = "Recipient address lookup failed"; | 205 | unverified_recipient_reject_reason = "Recipient address lookup failed"; |
| 196 | address_verify_map = "internal:address_verify_map"; | 206 | address_verify_map = "internal:address_verify_map"; |
| 197 | address_verify_positive_expire_time = "1h"; | 207 | address_verify_positive_expire_time = "1h"; |
| 198 | address_verify_positive_refresh_time = "15m"; | 208 | address_verify_positive_refresh_time = "15m"; |
| 199 | address_verify_negative_expire_time = "15s"; | 209 | address_verify_negative_expire_time = "5m"; |
| 200 | address_verify_negative_refresh_time = "5s"; | 210 | address_verify_negative_refresh_time = "1m"; |
| 201 | address_verify_cache_cleanup_interval = "5s"; | 211 | address_verify_cache_cleanup_interval = "12h"; |
| 212 | address_verify_poll_count = "\${stress?15}\${stress:30}"; | ||
| 202 | address_verify_poll_delay = "1s"; | 213 | address_verify_poll_delay = "1s"; |
| 214 | address_verify_sender_ttl = "30045s"; | ||
| 203 | 215 | ||
| 204 | smtpd_relay_restrictions = [ | 216 | smtpd_relay_restrictions = [ |
| 205 | "check_ccert_access ${relay_ccert}" | ||
| 206 | "reject_unauth_destination" | 217 | "reject_unauth_destination" |
| 207 | ]; | 218 | ]; |
| 208 | 219 | ||
| @@ -213,8 +224,8 @@ in { | |||
| 213 | smtpd_client_event_limit_exceptions = ""; | 224 | smtpd_client_event_limit_exceptions = ""; |
| 214 | 225 | ||
| 215 | milter_default_action = "accept"; | 226 | milter_default_action = "accept"; |
| 216 | smtpd_milters = [config.services.opendkim.socket "local:/run/rspamd/rspamd-milter.sock"]; | 227 | smtpd_milters = ["local:/run/rspamd/rspamd-milter.sock" "local:/run/postsrsd/postsrsd-milter.sock"]; |
| 217 | non_smtpd_milters = [config.services.opendkim.socket "local:/run/rspamd/rspamd-milter.sock"]; | 228 | non_smtpd_milters = ["local:/run/rspamd/rspamd-milter.sock"]; |
| 218 | 229 | ||
| 219 | alias_maps = ""; | 230 | alias_maps = ""; |
| 220 | 231 | ||
| @@ -225,6 +236,37 @@ in { | |||
| 225 | bounce_queue_lifetime = "20m"; | 236 | bounce_queue_lifetime = "20m"; |
| 226 | delay_warning_time = "10m"; | 237 | delay_warning_time = "10m"; |
| 227 | 238 | ||
| 239 | failure_template_file = toString (pkgs.writeText "failure.cf" '' | ||
| 240 | Charset: us-ascii | ||
| 241 | From: Mail Delivery System <MAILER-DAEMON> | ||
| 242 | Subject: Undelivered Mail Returned to Sender | ||
| 243 | Postmaster-Subject: Postmaster Copy: Undelivered Mail | ||
| 244 | |||
| 245 | This is the mail system at host $myhostname. | ||
| 246 | |||
| 247 | I'm sorry to have to inform you that your message could not | ||
| 248 | be delivered to one or more recipients. It's attached below. | ||
| 249 | |||
| 250 | The mail system | ||
| 251 | ''); | ||
| 252 | delay_template_file = toString (pkgs.writeText "delay.cf" '' | ||
| 253 | Charset: us-ascii | ||
| 254 | From: Mail Delivery System <MAILER-DAEMON> | ||
| 255 | Subject: Delayed Mail (still being retried) | ||
| 256 | Postmaster-Subject: Postmaster Warning: Delayed Mail | ||
| 257 | |||
| 258 | This is the mail system at host $myhostname. | ||
| 259 | |||
| 260 | #################################################################### | ||
| 261 | # THIS IS A WARNING ONLY. YOU DO NOT NEED TO RESEND YOUR MESSAGE. # | ||
| 262 | #################################################################### | ||
| 263 | |||
| 264 | Your message could not be delivered for more than $delay_warning_time_minutes minute(s). | ||
| 265 | It will be retried until it is $maximal_queue_lifetime_minutes minute(s) old. | ||
| 266 | |||
| 267 | The mail system | ||
| 268 | ''); | ||
| 269 | |||
| 228 | smtpd_discard_ehlo_keyword_address_maps = "cidr:${pkgs.writeText "esmtp_access" '' | 270 | smtpd_discard_ehlo_keyword_address_maps = "cidr:${pkgs.writeText "esmtp_access" '' |
| 229 | # Allow DSN requests from local subnet only | 271 | # Allow DSN requests from local subnet only |
| 230 | 192.168.0.0/16 silent-discard | 272 | 192.168.0.0/16 silent-discard |
| @@ -235,11 +277,6 @@ in { | |||
| 235 | ::/0 silent-discard, dsn | 277 | ::/0 silent-discard, dsn |
| 236 | ''}"; | 278 | ''}"; |
| 237 | 279 | ||
| 238 | sender_canonical_maps = "tcp:localhost:${toString config.services.postsrsd.forwardPort}"; | ||
| 239 | sender_canonical_classes = "envelope_sender"; | ||
| 240 | recipient_canonical_maps = "tcp:localhost:${toString config.services.postsrsd.reversePort}"; | ||
| 241 | recipient_canonical_classes = ["envelope_recipient" "header_recipient"]; | ||
| 242 | |||
| 243 | virtual_mailbox_domains = ''pgsql:${pkgs.writeText "virtual_mailbox_domains.cf" '' | 280 | virtual_mailbox_domains = ''pgsql:${pkgs.writeText "virtual_mailbox_domains.cf" '' |
| 244 | hosts = postgresql:///email | 281 | hosts = postgresql:///email |
| 245 | dbname = email | 282 | dbname = email |
| @@ -254,13 +291,26 @@ in { | |||
| 254 | virtual_transport = "dvlmtp:unix:/run/dovecot-lmtp"; | 291 | virtual_transport = "dvlmtp:unix:/run/dovecot-lmtp"; |
| 255 | smtputf8_enable = false; | 292 | smtputf8_enable = false; |
| 256 | 293 | ||
| 257 | authorized_submit_users = "inline:{ root= postfwd= }"; | 294 | authorized_submit_users = "inline:{ root= postfwd= ${config.services.dovecot2.user}= }"; |
| 295 | authorized_flush_users = "inline:{ root= }"; | ||
| 296 | authorized_mailq_users = "inline:{ root= }"; | ||
| 258 | 297 | ||
| 259 | postscreen_access_list = ""; | 298 | postscreen_access_list = ""; |
| 260 | postscreen_denylist_action = "drop"; | 299 | postscreen_denylist_action = "drop"; |
| 261 | postscreen_greet_action = "enforce"; | 300 | postscreen_greet_action = "enforce"; |
| 301 | |||
| 302 | sender_bcc_maps = ''pgsql:${pkgs.writeText "sender_bcc_maps.cf" '' | ||
| 303 | hosts = postgresql:///email | ||
| 304 | dbname = email | ||
| 305 | query = SELECT value FROM sender_bcc_maps WHERE key = '%s' | ||
| 306 | ''}''; | ||
| 307 | recipient_bcc_maps = ''pgsql:${pkgs.writeText "recipient_bcc_maps.cf" '' | ||
| 308 | hosts = postgresql:///email | ||
| 309 | dbname = email | ||
| 310 | query = SELECT value FROM recipient_bcc_maps WHERE key = '%s' | ||
| 311 | ''}''; | ||
| 262 | }; | 312 | }; |
| 263 | masterConfig = { | 313 | settings.master = { |
| 264 | "465" = { | 314 | "465" = { |
| 265 | type = "inet"; | 315 | type = "inet"; |
| 266 | private = false; | 316 | private = false; |
| @@ -283,13 +333,12 @@ in { | |||
| 283 | hosts = postgresql:///email | 333 | hosts = postgresql:///email |
| 284 | dbname = email | 334 | dbname = email |
| 285 | query = SELECT action FROM virtual_mailbox_access WHERE lookup = '%s' OR (lookup = regexp_replace('%s', '\+[^@]*@', '@') AND NOT EXISTS (SELECT 1 FROM virtual_mailbox_access WHERE lookup = '%s')) | 335 | query = SELECT action FROM virtual_mailbox_access WHERE lookup = '%s' OR (lookup = regexp_replace('%s', '\+[^@]*@', '@') AND NOT EXISTS (SELECT 1 FROM virtual_mailbox_access WHERE lookup = '%s')) |
| 286 | ''},permit_tls_all_clientcerts,reject}'' | 336 | ''},check_policy_service unix:/run/postfix-internal-policy.sock,permit_tls_all_clientcerts,reject}'' |
| 287 | "-o" "smtpd_relay_restrictions=permit_tls_all_clientcerts,reject" | 337 | "-o" "smtpd_relay_restrictions=permit_tls_all_clientcerts,reject" |
| 288 | "-o" "{smtpd_data_restrictions = check_policy_service unix:/run/postfwd3/postfwd3.sock}" | 338 | "-o" "{smtpd_data_restrictions = check_policy_service unix:/run/postfwd3/postfwd3.sock}" |
| 289 | "-o" "unverified_sender_reject_code=550" | 339 | "-o" "unverified_sender_reject_code=550" |
| 290 | "-o" "unverified_sender_reject_reason={Sender address rejected: undeliverable address}" | 340 | "-o" "unverified_sender_reject_reason={Sender address rejected: undeliverable address}" |
| 291 | "-o" "milter_macro_daemon_name=surtr.yggdrasil.li" | 341 | "-o" "milter_macro_daemon_name=surtr.yggdrasil.li" |
| 292 | "-o" ''smtpd_milters=${config.services.opendkim.socket}'' | ||
| 293 | ]; | 342 | ]; |
| 294 | }; | 343 | }; |
| 295 | "466" = { | 344 | "466" = { |
| @@ -313,13 +362,12 @@ in { | |||
| 313 | hosts = postgresql:///email | 362 | hosts = postgresql:///email |
| 314 | dbname = email | 363 | dbname = email |
| 315 | query = SELECT action FROM virtual_mailbox_access WHERE lookup = '%s' OR (lookup = regexp_replace('%s', '\+[^@]*@', '@') AND NOT EXISTS (SELECT 1 FROM virtual_mailbox_access WHERE lookup = '%s')) | 364 | query = SELECT action FROM virtual_mailbox_access WHERE lookup = '%s' OR (lookup = regexp_replace('%s', '\+[^@]*@', '@') AND NOT EXISTS (SELECT 1 FROM virtual_mailbox_access WHERE lookup = '%s')) |
| 316 | ''},permit_sasl_authenticated,reject}'' | 365 | ''},check_policy_service unix:/run/postfix-internal-policy.sock,permit_sasl_authenticated,reject}'' |
| 317 | "-o" "smtpd_relay_restrictions=permit_sasl_authenticated,reject" | 366 | "-o" "smtpd_relay_restrictions=permit_sasl_authenticated,reject" |
| 318 | "-o" "{smtpd_data_restrictions = check_policy_service unix:/run/postfwd3/postfwd3.sock}" | 367 | "-o" "{smtpd_data_restrictions = check_policy_service unix:/run/postfwd3/postfwd3.sock}" |
| 319 | "-o" "unverified_sender_reject_code=550" | 368 | "-o" "unverified_sender_reject_code=550" |
| 320 | "-o" "unverified_sender_reject_reason={Sender address rejected: undeliverable address}" | 369 | "-o" "unverified_sender_reject_reason={Sender address rejected: undeliverable address}" |
| 321 | "-o" "milter_macro_daemon_name=surtr.yggdrasil.li" | 370 | "-o" "milter_macro_daemon_name=surtr.yggdrasil.li" |
| 322 | "-o" ''smtpd_milters=${config.services.opendkim.socket}'' | ||
| 323 | ]; | 371 | ]; |
| 324 | }; | 372 | }; |
| 325 | subcleanup = { | 373 | subcleanup = { |
| @@ -328,7 +376,10 @@ in { | |||
| 328 | maxproc = 0; | 376 | maxproc = 0; |
| 329 | args = [ | 377 | args = [ |
| 330 | "-o" "header_checks=pcre:${pkgs.writeText "header_checks_submission" '' | 378 | "-o" "header_checks=pcre:${pkgs.writeText "header_checks_submission" '' |
| 379 | if /^Received: / | ||
| 380 | !/by surtr\.yggdrasil\.li/ STRIP | ||
| 331 | /^Received: from [^ ]+ \([^ ]+ [^ ]+\)\s+(.*)$/ REPLACE Received: $1 | 381 | /^Received: from [^ ]+ \([^ ]+ [^ ]+\)\s+(.*)$/ REPLACE Received: $1 |
| 382 | endif | ||
| 332 | ''}" | 383 | ''}" |
| 333 | ]; | 384 | ]; |
| 334 | }; | 385 | }; |
| @@ -364,23 +415,11 @@ in { | |||
| 364 | 415 | ||
| 365 | services.postsrsd = { | 416 | services.postsrsd = { |
| 366 | enable = true; | 417 | enable = true; |
| 367 | domain = "surtr.yggdrasil.li"; | 418 | domains = [ "surtr.yggdrasil.li" ] ++ concatMap (domain: [".${domain}" domain]) emailDomains; |
| 368 | separator = "+"; | 419 | separator = "+"; |
| 369 | excludeDomains = [ "surtr.yggdrasil.li" | 420 | extraConfig = '' |
| 370 | ] ++ concatMap (domain: [".${domain}" domain]) emailDomains; | 421 | socketmap = unix:/run/postsrsd/postsrsd-socketmap.sock |
| 371 | }; | 422 | milter = unix:/run/postsrsd/postsrsd-milter.sock |
| 372 | |||
| 373 | services.opendkim = { | ||
| 374 | enable = true; | ||
| 375 | user = "postfix"; group = "postfix"; | ||
| 376 | socket = "local:/run/opendkim/opendkim.sock"; | ||
| 377 | domains = ''csl:${concatStringsSep "," (["surtr.yggdrasil.li"] ++ emailDomains)}''; | ||
| 378 | selector = "surtr"; | ||
| 379 | configFile = builtins.toFile "opendkim.conf" '' | ||
| 380 | Syslog true | ||
| 381 | MTA surtr.yggdrasil.li | ||
| 382 | MTACommand ${config.security.wrapperDir}/sendmail | ||
| 383 | LogResults true | ||
| 384 | ''; | 423 | ''; |
| 385 | }; | 424 | }; |
| 386 | 425 | ||
| @@ -415,6 +454,8 @@ in { | |||
| 415 | milter = yes; | 454 | milter = yes; |
| 416 | timeout = 120s; | 455 | timeout = 120s; |
| 417 | 456 | ||
| 457 | client_ca_name = "yggdrasil.li"; | ||
| 458 | |||
| 418 | upstream "local" { | 459 | upstream "local" { |
| 419 | default = yes; | 460 | default = yes; |
| 420 | self_scan = yes; | 461 | self_scan = yes; |
| @@ -451,7 +492,13 @@ in { | |||
| 451 | "redis.conf".text = '' | 492 | "redis.conf".text = '' |
| 452 | servers = "${config.services.redis.servers.rspamd.unixSocket}"; | 493 | servers = "${config.services.redis.servers.rspamd.unixSocket}"; |
| 453 | ''; | 494 | ''; |
| 454 | "dkim_signing.conf".text = "enabled = false;"; | 495 | "dkim_signing.conf".text = '' |
| 496 | enabled = true; | ||
| 497 | allow_username_mismatch = true; | ||
| 498 | |||
| 499 | path = "/var/lib/rspamd/dkim/$domain.key"; | ||
| 500 | selector = "mail"; | ||
| 501 | ''; | ||
| 455 | "neural.conf".text = "enabled = false;"; | 502 | "neural.conf".text = "enabled = false;"; |
| 456 | "classifier-bayes.conf".text = '' | 503 | "classifier-bayes.conf".text = '' |
| 457 | enable = true; | 504 | enable = true; |
| @@ -472,55 +519,58 @@ in { | |||
| 472 | spam = true; | 519 | spam = true; |
| 473 | } | 520 | } |
| 474 | ''; | 521 | ''; |
| 522 | "logging.inc".text = '' | ||
| 523 | debug_modules = ["milter", "dkim_signing"]; | ||
| 524 | ''; | ||
| 475 | # "redirectors.inc".text = '' | 525 | # "redirectors.inc".text = '' |
| 476 | # visit.creeper.host | 526 | # visit.creeper.host |
| 477 | # ''; | 527 | # ''; |
| 478 | }; | 528 | }; |
| 479 | }; | 529 | }; |
| 480 | 530 | ||
| 481 | users.groups.${config.services.rspamd.group}.members = [ config.services.postfix.user "dovecot2" ]; | 531 | users.groups.${config.services.rspamd.group}.members = [ config.services.postfix.user config.services.dovecot2.user ]; |
| 482 | 532 | ||
| 483 | services.redis.servers.rspamd.enable = true; | 533 | services.redis.servers.rspamd.enable = true; |
| 484 | 534 | ||
| 485 | users.groups.${config.services.redis.servers.rspamd.user}.members = [ config.services.rspamd.user ]; | 535 | users.groups.${config.services.redis.servers.rspamd.user}.members = [ config.services.rspamd.user ]; |
| 486 | 536 | ||
| 537 | environment.systemPackages = with pkgs; [ dovecot_pigeonhole dovecot-fts-flatcurve ]; | ||
| 487 | services.dovecot2 = { | 538 | services.dovecot2 = { |
| 488 | enable = true; | 539 | enable = true; |
| 489 | enablePAM = false; | 540 | enablePAM = false; |
| 490 | sslServerCert = "/run/credentials/dovecot2.service/surtr.yggdrasil.li.pem"; | 541 | sslServerCert = "/run/credentials/dovecot.service/surtr.yggdrasil.li.pem"; |
| 491 | sslServerKey = "/run/credentials/dovecot2.service/surtr.yggdrasil.li.key.pem"; | 542 | sslServerKey = "/run/credentials/dovecot.service/surtr.yggdrasil.li.key.pem"; |
| 492 | sslCACert = toString ./ca/ca.crt; | 543 | sslCACert = toString ./ca/ca.crt; |
| 493 | mailLocation = "maildir:/var/lib/mail/%u/maildir:UTF-8:INDEX=/var/lib/dovecot/indices/%u"; | 544 | mailLocation = "maildir:/var/lib/mail/%u/maildir:UTF-8:INDEX=/var/lib/dovecot/indices/%u"; |
| 494 | modules = with pkgs; [ dovecot_pigeonhole dovecot_fts_xapian ]; | 545 | mailPlugins.globally.enable = [ "fts" "fts_flatcurve" ]; |
| 495 | mailPlugins.globally.enable = [ "fts" "fts_xapian" ]; | ||
| 496 | protocols = [ "lmtp" "sieve" ]; | 546 | protocols = [ "lmtp" "sieve" ]; |
| 497 | sieve = { | 547 | sieve = { |
| 498 | extensions = ["copy" "imapsieve" "variables" "imap4flags" "vacation"]; | 548 | extensions = ["copy" "imapsieve" "variables" "imap4flags" "vacation" "vacation-seconds" "vnd.dovecot.debug"]; |
| 499 | globalExtensions = ["copy" "imapsieve" "variables" "imap4flags" "vacation"]; | 549 | globalExtensions = ["copy" "imapsieve" "variables" "imap4flags" "vacation" "vacation-seconds" "vnd.dovecot.debug"]; |
| 500 | }; | 550 | }; |
| 501 | extraConfig = let | 551 | extraConfig = let |
| 502 | dovecotSqlConf = pkgs.writeText "dovecot-sql.conf" '' | 552 | dovecotSqlConf = pkgs.writeText "dovecot-sql.conf" '' |
| 503 | driver = pgsql | 553 | driver = pgsql |
| 504 | connect = dbname=email | 554 | connect = dbname=email |
| 505 | password_query = SELECT (CASE WHEN '%k' = 'valid' AND '%m' = 'EXTERNAL' THEN NULL ELSE "password" END) as password, (CASE WHEN '%k' = 'valid' AND '%m' = 'EXTERNAL' THEN true WHEN password IS NULL THEN true ELSE NULL END) as nopassword, "user", quota_rule, 'dovecot2' as uid, 'dovecot2' as gid FROM imap_user WHERE "user" = '%n' | 555 | password_query = SELECT (CASE WHEN '%k' = 'valid' AND '%m' = 'EXTERNAL' THEN NULL ELSE "password" END) as password, (CASE WHEN '%k' = 'valid' AND '%m' = 'EXTERNAL' THEN true WHEN password IS NULL THEN true ELSE NULL END) as nopassword, "user", quota_rule, '${config.services.dovecot2.user}' as uid, '${config.services.dovecot2.group}' as gid FROM imap_user WHERE "user" = '%n' |
| 506 | user_query = SELECT "user", quota_rule, 'dovecot2' as uid, 'dovecot2' as gid FROM imap_user WHERE "user" = '%n' | 556 | user_query = SELECT "user", quota_rule, '${config.services.dovecot2.user}' as uid, 'dovecot2' as gid FROM imap_user WHERE "user" = '%n' |
| 507 | iterate_query = SELECT "user" FROM imap_user | 557 | iterate_query = SELECT "user" FROM imap_user |
| 508 | ''; | 558 | ''; |
| 509 | in '' | 559 | in '' |
| 510 | mail_home = /var/lib/mail/%u | 560 | mail_home = /var/lib/mail/%u |
| 511 | 561 | ||
| 512 | mail_plugins = $mail_plugins quota | 562 | mail_plugins = $mail_plugins quota fts fts_flatcurve |
| 513 | 563 | ||
| 514 | first_valid_uid = ${toString config.users.users.dovecot2.uid} | 564 | first_valid_uid = ${toString config.users.users.${config.services.dovecot2.user}.uid} |
| 515 | last_valid_uid = ${toString config.users.users.dovecot2.uid} | 565 | last_valid_uid = ${toString config.users.users.${config.services.dovecot2.user}.uid} |
| 516 | first_valid_gid = ${toString config.users.groups.dovecot2.gid} | 566 | first_valid_gid = ${toString config.users.groups.${config.services.dovecot2.group}.gid} |
| 517 | last_valid_gid = ${toString config.users.groups.dovecot2.gid} | 567 | last_valid_gid = ${toString config.users.groups.${config.services.dovecot2.group}.gid} |
| 518 | 568 | ||
| 519 | ${concatMapStringsSep "\n\n" (domain: | 569 | ${concatMapStringsSep "\n\n" (domain: |
| 520 | concatMapStringsSep "\n" (subdomain: '' | 570 | concatMapStringsSep "\n" (subdomain: '' |
| 521 | local_name ${subdomain} { | 571 | local_name ${subdomain} { |
| 522 | ssl_cert = </run/credentials/dovecot2.service/${subdomain}.pem | 572 | ssl_cert = </run/credentials/dovecot.service/${subdomain}.pem |
| 523 | ssl_key = </run/credentials/dovecot2.service/${subdomain}.key.pem | 573 | ssl_key = </run/credentials/dovecot.service/${subdomain}.key.pem |
| 524 | } | 574 | } |
| 525 | '') ["imap.${domain}" domain] | 575 | '') ["imap.${domain}" domain] |
| 526 | ) emailDomains} | 576 | ) emailDomains} |
| @@ -541,10 +591,10 @@ in { | |||
| 541 | auth_debug = yes | 591 | auth_debug = yes |
| 542 | 592 | ||
| 543 | service auth { | 593 | service auth { |
| 544 | user = dovecot2 | 594 | user = ${config.services.dovecot2.user} |
| 545 | } | 595 | } |
| 546 | service auth-worker { | 596 | service auth-worker { |
| 547 | user = dovecot2 | 597 | user = ${config.services.dovecot2.user} |
| 548 | } | 598 | } |
| 549 | 599 | ||
| 550 | userdb { | 600 | userdb { |
| @@ -565,7 +615,7 @@ in { | |||
| 565 | args = ${pkgs.writeText "dovecot-sql.conf" '' | 615 | args = ${pkgs.writeText "dovecot-sql.conf" '' |
| 566 | driver = pgsql | 616 | driver = pgsql |
| 567 | connect = dbname=email | 617 | connect = dbname=email |
| 568 | user_query = SELECT DISTINCT ON (extension IS NULL, local IS NULL) "user", quota_rule, 'dovecot2' as uid, 'dovecot2' as gid FROM lmtp_mapping WHERE CASE WHEN extension IS NOT NULL AND local IS NOT NULL THEN ('%n' :: citext) = local || '+' || extension AND domain = ('%d' :: citext) WHEN local IS NOT NULL THEN (local = ('%n' :: citext) OR ('%n' :: citext) ILIKE local || '+%%') AND domain = ('%d' :: citext) WHEN extension IS NOT NULL THEN ('%n' :: citext) ILIKE '%%+' || extension AND domain = ('%d' :: citext) ELSE domain = ('%d' :: citext) END ORDER BY (extension IS NULL) ASC, (local IS NULL) ASC | 618 | user_query = SELECT DISTINCT ON (extension IS NULL, local IS NULL) "user", quota_rule, '${config.services.dovecot2.user}' as uid, '${config.services.dovecot2.group}' as gid FROM lmtp_mapping WHERE CASE WHEN extension IS NOT NULL AND local IS NOT NULL THEN ('%n' :: citext) = local || '+' || extension AND domain = ('%d' :: citext) WHEN local IS NOT NULL THEN (local = ('%n' :: citext) OR ('%n' :: citext) ILIKE local || '+%%') AND domain = ('%d' :: citext) WHEN extension IS NOT NULL THEN ('%n' :: citext) ILIKE '%%+' || extension AND domain = ('%d' :: citext) ELSE domain = ('%d' :: citext) END ORDER BY (extension IS NULL) ASC, (local IS NULL) ASC |
| 569 | ''} | 619 | ''} |
| 570 | 620 | ||
| 571 | skip = never | 621 | skip = never |
| @@ -635,7 +685,7 @@ in { | |||
| 635 | quota_status_success = DUNNO | 685 | quota_status_success = DUNNO |
| 636 | quota_status_nouser = DUNNO | 686 | quota_status_nouser = DUNNO |
| 637 | quota_grace = 10%% | 687 | quota_grace = 10%% |
| 638 | quota_max_mail_size = ${config.services.postfix.config.message_size_limit} | 688 | quota_max_mail_size = ${toString config.services.postfix.settings.main.message_size_limit} |
| 639 | quota_vsizes = yes | 689 | quota_vsizes = yes |
| 640 | } | 690 | } |
| 641 | 691 | ||
| @@ -671,13 +721,16 @@ in { | |||
| 671 | } | 721 | } |
| 672 | 722 | ||
| 673 | plugin { | 723 | plugin { |
| 674 | plugin = fts fts_xapian | 724 | fts = flatcurve |
| 675 | fts = xapian | 725 | |
| 676 | fts_xapian = partial=2 full=20 attachments=1 verbose=1 | 726 | fts_languages = en de |
| 727 | fts_tokenizers = generic email-address | ||
| 677 | 728 | ||
| 678 | fts_autoindex = yes | 729 | fts_tokenizer_email_address = maxlen=100 |
| 730 | fts_tokenizer_generic = algorithm=simple maxlen=30 | ||
| 679 | 731 | ||
| 680 | fts_enforced = no | 732 | fts_filters = normalizer-icu snowball stopwords |
| 733 | fts_filters_en = lowercase snowball stopwords | ||
| 681 | } | 734 | } |
| 682 | 735 | ||
| 683 | service indexer-worker { | 736 | service indexer-worker { |
| @@ -686,30 +739,6 @@ in { | |||
| 686 | ''; | 739 | ''; |
| 687 | }; | 740 | }; |
| 688 | 741 | ||
| 689 | systemd.services.dovecot-fts-xapian-optimize = { | ||
| 690 | description = "Optimize dovecot indices for fts_xapian"; | ||
| 691 | requisite = [ "dovecot2.service" ]; | ||
| 692 | after = [ "dovecot2.service" ]; | ||
| 693 | startAt = "*-*-* 22:00:00 Europe/Berlin"; | ||
| 694 | serviceConfig = { | ||
| 695 | Type = "oneshot"; | ||
| 696 | ExecStart = "${pkgs.dovecot}/bin/doveadm fts optimize -A"; | ||
| 697 | PrivateDevices = true; | ||
| 698 | PrivateNetwork = true; | ||
| 699 | ProtectKernelTunables = true; | ||
| 700 | ProtectKernelModules = true; | ||
| 701 | ProtectControlGroups = true; | ||
| 702 | ProtectHome = true; | ||
| 703 | ProtectSystem = true; | ||
| 704 | PrivateTmp = true; | ||
| 705 | }; | ||
| 706 | }; | ||
| 707 | systemd.timers.dovecot-fts-xapian-optimize = { | ||
| 708 | timerConfig = { | ||
| 709 | RandomizedDelaySec = 4 * 3600; | ||
| 710 | }; | ||
| 711 | }; | ||
| 712 | |||
| 713 | environment.etc = { | 742 | environment.etc = { |
| 714 | "dovecot/sieve_before.d/tag-junk.sieve".text = '' | 743 | "dovecot/sieve_before.d/tag-junk.sieve".text = '' |
| 715 | require ["imap4flags"]; | 744 | require ["imap4flags"]; |
| @@ -742,43 +771,31 @@ in { | |||
| 742 | ''; | 771 | ''; |
| 743 | }; | 772 | }; |
| 744 | 773 | ||
| 745 | security.dhparams = { | ||
| 746 | params = { | ||
| 747 | "postfix-512".bits = 512; | ||
| 748 | "postfix-1024".bits = 2048; | ||
| 749 | |||
| 750 | "postfix-smtps-512".bits = 512; | ||
| 751 | "postfix-smtps-1024".bits = 2048; | ||
| 752 | }; | ||
| 753 | }; | ||
| 754 | |||
| 755 | security.acme.rfc2136Domains = { | 774 | security.acme.rfc2136Domains = { |
| 756 | "surtr.yggdrasil.li" = { | 775 | "surtr.yggdrasil.li" = { |
| 757 | restartUnits = [ "postfix.service" "dovecot2.service" ]; | 776 | restartUnits = [ "postfix.service" "dovecot.service" ]; |
| 758 | }; | 777 | }; |
| 759 | } // listToAttrs (map (domain: nameValuePair "spm.${domain}" { restartUnits = ["nginx.service"]; }) spmDomains) | 778 | } // listToAttrs (map (domain: nameValuePair "spm.${domain}" { restartUnits = ["nginx.service"]; }) spmDomains) |
| 760 | // listToAttrs (concatMap (domain: [ | 779 | // listToAttrs (concatMap (domain: [ |
| 761 | (nameValuePair domain { restartUnits = ["postfix.service" "dovecot2.service"]; }) | 780 | (nameValuePair domain { restartUnits = ["postfix.service" "dovecot.service"]; }) |
| 762 | (nameValuePair "mailin.${domain}" { restartUnits = ["postfix.service"]; }) | 781 | (nameValuePair "mailin.${domain}" { restartUnits = ["postfix.service"]; }) |
| 763 | (nameValuePair "mailsub.${domain}" { restartUnits = ["postfix.service"]; }) | 782 | (nameValuePair "mailsub.${domain}" { restartUnits = ["postfix.service"]; }) |
| 764 | (nameValuePair "imap.${domain}" { restartUnits = ["dovecot2.service"]; }) | 783 | (nameValuePair "imap.${domain}" { restartUnits = ["dovecot.service"]; }) |
| 765 | (nameValuePair "mta-sts.${domain}" { restartUnits = ["nginx.service"]; }) | 784 | (nameValuePair "mta-sts.${domain}" { restartUnits = ["nginx.service"]; }) |
| 766 | ]) emailDomains); | 785 | ]) emailDomains); |
| 767 | 786 | ||
| 768 | systemd.services.postfix = { | 787 | systemd.services.postfix = { |
| 769 | serviceConfig.LoadCredential = [ | 788 | serviceConfig.LoadCredential = let |
| 770 | "surtr.yggdrasil.li.key.pem:${config.security.acme.certs."surtr.yggdrasil.li".directory}/key.pem" | 789 | tlsCredential = domain: "${domain}.full.pem:${config.security.acme.certs.${domain}.directory}/full.pem"; |
| 771 | "surtr.yggdrasil.li.pem:${config.security.acme.certs."surtr.yggdrasil.li".directory}/fullchain.pem" | 790 | in [ |
| 772 | ] ++ concatMap (domain: | 791 | (tlsCredential "surtr.yggdrasil.li") |
| 773 | map (subdomain: "${subdomain}.full.pem:${config.security.acme.certs.${subdomain}.directory}/full.pem") | 792 | ] ++ concatMap (domain: map tlsCredential [domain "mailin.${domain}" "mailsub.${domain}"]) emailDomains; |
| 774 | [domain "mailin.${domain}" "mailsub.${domain}"] | ||
| 775 | ) emailDomains; | ||
| 776 | }; | 793 | }; |
| 777 | 794 | ||
| 778 | systemd.services.dovecot2 = { | 795 | systemd.services.dovecot = { |
| 779 | preStart = '' | 796 | preStart = '' |
| 780 | for f in /etc/dovecot/sieve_flag.d/*.sieve /etc/dovecot/sieve_before.d/*.sieve; do | 797 | for f in /etc/dovecot/sieve_flag.d/*.sieve /etc/dovecot/sieve_before.d/*.sieve; do |
| 781 | ${pkgs.dovecot_pigeonhole}/bin/sievec $f | 798 | ${getExe' pkgs.dovecot_pigeonhole "sievec"} $f |
| 782 | done | 799 | done |
| 783 | ''; | 800 | ''; |
| 784 | 801 | ||
| @@ -845,15 +862,16 @@ in { | |||
| 845 | charset utf-8; | 862 | charset utf-8; |
| 846 | source_charset utf-8; | 863 | source_charset utf-8; |
| 847 | ''; | 864 | ''; |
| 848 | root = pkgs.runCommand "mta-sts.${domain}" {} '' | 865 | root = pkgs.writeTextFile { |
| 849 | mkdir -p $out/.well-known | 866 | name = "mta-sts.${domain}"; |
| 850 | cp ${pkgs.writeText "mta-sts.${domain}.txt" '' | 867 | destination = "/.well-known/mta-sts.txt"; |
| 868 | text = '' | ||
| 851 | version: STSv1 | 869 | version: STSv1 |
| 852 | mode: enforce | 870 | mode: enforce |
| 853 | max_age: 2419200 | 871 | max_age: 2419200 |
| 854 | mx: mailin.${domain} | 872 | mx: mailin.${domain} |
| 855 | ''} $out/.well-known/mta-sts.txt | 873 | ''; |
| 856 | ''; | 874 | }; |
| 857 | }; | 875 | }; |
| 858 | }) emailDomains); | 876 | }) emailDomains); |
| 859 | }; | 877 | }; |
| @@ -870,7 +888,7 @@ in { | |||
| 870 | systemd.services.spm = { | 888 | systemd.services.spm = { |
| 871 | serviceConfig = { | 889 | serviceConfig = { |
| 872 | Type = "notify"; | 890 | Type = "notify"; |
| 873 | ExecStart = "${pkgs.spm}/bin/spm-server"; | 891 | ExecStart = getExe' pkgs.spm "spm-server"; |
| 874 | User = "spm"; | 892 | User = "spm"; |
| 875 | Group = "spm"; | 893 | Group = "spm"; |
| 876 | 894 | ||
| @@ -928,7 +946,7 @@ in { | |||
| 928 | serviceConfig = { | 946 | serviceConfig = { |
| 929 | Type = "notify"; | 947 | Type = "notify"; |
| 930 | 948 | ||
| 931 | ExecStart = "${ccert-policy-server}/bin/ccert-policy-server"; | 949 | ExecStart = getExe' ccert-policy-server "ccert-policy-server"; |
| 932 | 950 | ||
| 933 | Environment = [ | 951 | Environment = [ |
| 934 | "PGDATABASE=email" | 952 | "PGDATABASE=email" |
| @@ -961,6 +979,53 @@ in { | |||
| 961 | }; | 979 | }; |
| 962 | users.groups."postfix-ccert-sender-policy" = {}; | 980 | users.groups."postfix-ccert-sender-policy" = {}; |
| 963 | 981 | ||
| 982 | systemd.sockets."postfix-internal-policy" = { | ||
| 983 | requiredBy = ["postfix.service"]; | ||
| 984 | wants = ["postfix-internal-policy.service"]; | ||
| 985 | socketConfig = { | ||
| 986 | ListenStream = "/run/postfix-internal-policy.sock"; | ||
| 987 | }; | ||
| 988 | }; | ||
| 989 | systemd.services."postfix-internal-policy" = { | ||
| 990 | after = [ "postgresql.service" ]; | ||
| 991 | bindsTo = [ "postgresql.service" ]; | ||
| 992 | |||
| 993 | serviceConfig = { | ||
| 994 | Type = "notify"; | ||
| 995 | |||
| 996 | ExecStart = lib.getExe internal-policy-server; | ||
| 997 | |||
| 998 | Environment = [ | ||
| 999 | "PGDATABASE=email" | ||
| 1000 | ]; | ||
| 1001 | |||
| 1002 | DynamicUser = false; | ||
| 1003 | User = "postfix-internal-policy"; | ||
| 1004 | Group = "postfix-internal-policy"; | ||
| 1005 | ProtectSystem = "strict"; | ||
| 1006 | SystemCallFilter = "@system-service"; | ||
| 1007 | NoNewPrivileges = true; | ||
| 1008 | ProtectKernelTunables = true; | ||
| 1009 | ProtectKernelModules = true; | ||
| 1010 | ProtectKernelLogs = true; | ||
| 1011 | ProtectControlGroups = true; | ||
| 1012 | MemoryDenyWriteExecute = true; | ||
| 1013 | RestrictSUIDSGID = true; | ||
| 1014 | KeyringMode = "private"; | ||
| 1015 | ProtectClock = true; | ||
| 1016 | RestrictRealtime = true; | ||
| 1017 | PrivateDevices = true; | ||
| 1018 | PrivateTmp = true; | ||
| 1019 | ProtectHostname = true; | ||
| 1020 | ReadWritePaths = ["/run/postgresql"]; | ||
| 1021 | }; | ||
| 1022 | }; | ||
| 1023 | users.users."postfix-internal-policy" = { | ||
| 1024 | isSystemUser = true; | ||
| 1025 | group = "postfix-internal-policy"; | ||
| 1026 | }; | ||
| 1027 | users.groups."postfix-internal-policy" = {}; | ||
| 1028 | |||
| 964 | services.postfwd = { | 1029 | services.postfwd = { |
| 965 | enable = true; | 1030 | enable = true; |
| 966 | cache = false; | 1031 | cache = false; |
diff --git a/hosts/surtr/email/internal-policy-server/.envrc b/hosts/surtr/email/internal-policy-server/.envrc new file mode 100644 index 00000000..2c909235 --- /dev/null +++ b/hosts/surtr/email/internal-policy-server/.envrc | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | use flake | ||
| 2 | |||
| 3 | [[ -d ".venv" ]] || ( uv venv && uv sync ) | ||
| 4 | . .venv/bin/activate | ||
diff --git a/hosts/surtr/email/internal-policy-server/.gitignore b/hosts/surtr/email/internal-policy-server/.gitignore new file mode 100644 index 00000000..4ccfae70 --- /dev/null +++ b/hosts/surtr/email/internal-policy-server/.gitignore | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | .venv | ||
| 2 | **/__pycache__ | ||
diff --git a/hosts/surtr/email/internal-policy-server/internal_policy_server/__init__.py b/hosts/surtr/email/internal-policy-server/internal_policy_server/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/hosts/surtr/email/internal-policy-server/internal_policy_server/__init__.py | |||
diff --git a/hosts/surtr/email/internal-policy-server/internal_policy_server/__main__.py b/hosts/surtr/email/internal-policy-server/internal_policy_server/__main__.py new file mode 100644 index 00000000..04f1a59a --- /dev/null +++ b/hosts/surtr/email/internal-policy-server/internal_policy_server/__main__.py | |||
| @@ -0,0 +1,106 @@ | |||
| 1 | from systemd.daemon import listen_fds | ||
| 2 | from sdnotify import SystemdNotifier | ||
| 3 | from socketserver import StreamRequestHandler, ThreadingMixIn | ||
| 4 | from systemd_socketserver import SystemdSocketServer | ||
| 5 | import sys | ||
| 6 | from threading import Thread | ||
| 7 | from psycopg_pool import ConnectionPool | ||
| 8 | from psycopg.rows import namedtuple_row | ||
| 9 | |||
| 10 | import logging | ||
| 11 | |||
| 12 | |||
| 13 | class PolicyHandler(StreamRequestHandler): | ||
| 14 | def handle(self): | ||
| 15 | logger.debug('Handling new connection...') | ||
| 16 | |||
| 17 | self.args = dict() | ||
| 18 | |||
| 19 | line = None | ||
| 20 | while line := self.rfile.readline().removesuffix(b'\n'): | ||
| 21 | if b'=' not in line: | ||
| 22 | break | ||
| 23 | |||
| 24 | key, val = line.split(sep=b'=', maxsplit=1) | ||
| 25 | self.args[key.decode()] = val.decode() | ||
| 26 | |||
| 27 | logger.info('Connection parameters: %s', self.args) | ||
| 28 | |||
| 29 | allowed = False | ||
| 30 | user = None | ||
| 31 | if self.args['sasl_username']: | ||
| 32 | user = self.args['sasl_username'] | ||
| 33 | if self.args['ccert_subject']: | ||
| 34 | user = self.args['ccert_subject'] | ||
| 35 | |||
| 36 | with self.server.db_pool.connection() as conn: | ||
| 37 | local, domain = self.args['recipient'].split(sep='@', maxsplit=1) | ||
| 38 | extension = None | ||
| 39 | if '+' in local: | ||
| 40 | local, extension = local.split(sep='+', maxsplit=1) | ||
| 41 | |||
| 42 | logger.debug('Parsed recipient address: %s', {'local': local, 'extension': extension, 'domain': domain}) | ||
| 43 | |||
| 44 | with conn.cursor() as cur: | ||
| 45 | cur.row_factory = namedtuple_row | ||
| 46 | cur.execute('SELECT id, internal FROM "mailbox_mapping" WHERE ("local" = %(local)s OR "local" IS NULL) AND ("extension" = %(extension)s OR "extension" IS NULL) AND "domain" = %(domain)s', params = {'local': local, 'extension': extension if extension is not None else '', 'domain': domain}, prepare = True) | ||
| 47 | if (row := cur.fetchone()) is not None: | ||
| 48 | if not row.internal: | ||
| 49 | logger.debug('Recipient mailbox is not internal') | ||
| 50 | allowed = True | ||
| 51 | elif user: | ||
| 52 | cur.execute('SELECT EXISTS(SELECT true FROM "mailbox_mapping_access" INNER JOIN "mailbox" ON "mailbox".id = "mailbox_mapping_access"."mailbox" WHERE mailbox_mapping = %(mailbox_mapping)s AND "mailbox"."mailbox" = %(user)s) as "exists"', params = { 'mailbox_mapping': row.id, 'user': user }, prepare = True) | ||
| 53 | if (row := cur.fetchone()) is not None: | ||
| 54 | allowed = row.exists | ||
| 55 | else: | ||
| 56 | logger.debug('Recipient is not local') | ||
| 57 | allowed = True | ||
| 58 | |||
| 59 | action = '550 5.7.0 Recipient mailbox mapping not authorized for current user' | ||
| 60 | if allowed: | ||
| 61 | action = 'DUNNO' | ||
| 62 | |||
| 63 | logger.info('Reached verdict: %s', {'allowed': allowed, 'action': action}) | ||
| 64 | self.wfile.write(f'action={action}\n\n'.encode()) | ||
| 65 | |||
| 66 | class ThreadedSystemdSocketServer(ThreadingMixIn, SystemdSocketServer): | ||
| 67 | def __init__(self, fd, RequestHandlerClass): | ||
| 68 | super().__init__(fd, RequestHandlerClass) | ||
| 69 | |||
| 70 | self.db_pool = ConnectionPool(min_size=1) | ||
| 71 | self.db_pool.wait() | ||
| 72 | |||
| 73 | def main(): | ||
| 74 | global logger | ||
| 75 | logger = logging.getLogger(__name__) | ||
| 76 | console_handler = logging.StreamHandler() | ||
| 77 | console_handler.setFormatter( logging.Formatter('[%(levelname)s](%(name)s): %(message)s') ) | ||
| 78 | if sys.stderr.isatty(): | ||
| 79 | console_handler.setFormatter( logging.Formatter('%(asctime)s [%(levelname)s](%(name)s): %(message)s') ) | ||
| 80 | logger.addHandler(console_handler) | ||
| 81 | logger.setLevel(logging.DEBUG) | ||
| 82 | |||
| 83 | # log uncaught exceptions | ||
| 84 | def log_exceptions(type, value, tb): | ||
| 85 | global logger | ||
| 86 | |||
| 87 | logger.error(value) | ||
| 88 | sys.__excepthook__(type, value, tb) # calls default excepthook | ||
| 89 | |||
| 90 | sys.excepthook = log_exceptions | ||
| 91 | |||
| 92 | fds = listen_fds() | ||
| 93 | servers = [ThreadedSystemdSocketServer(fd, PolicyHandler) for fd in fds] | ||
| 94 | |||
| 95 | if servers: | ||
| 96 | for server in servers: | ||
| 97 | Thread(name=f'Server for fd{server.fileno()}', target=server.serve_forever).start() | ||
| 98 | else: | ||
| 99 | return 2 | ||
| 100 | |||
| 101 | SystemdNotifier().notify('READY=1') | ||
| 102 | |||
| 103 | return 0 | ||
| 104 | |||
| 105 | if __name__ == '__main__': | ||
| 106 | sys.exit(main()) | ||
diff --git a/hosts/surtr/email/internal-policy-server/pyproject.toml b/hosts/surtr/email/internal-policy-server/pyproject.toml new file mode 100644 index 00000000..c697cd01 --- /dev/null +++ b/hosts/surtr/email/internal-policy-server/pyproject.toml | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | [project] | ||
| 2 | name = "internal-policy-server" | ||
| 3 | version = "0.1.0" | ||
| 4 | requires-python = ">=3.12" | ||
| 5 | dependencies = [ | ||
| 6 | "psycopg>=3.2.9", | ||
| 7 | "psycopg-binary>=3.2.9", | ||
| 8 | "psycopg-pool>=3.2.6", | ||
| 9 | "sdnotify>=0.3.2", | ||
| 10 | "systemd-socketserver>=1.0", | ||
| 11 | ] | ||
| 12 | |||
| 13 | [project.scripts] | ||
| 14 | internal-policy-server = "internal_policy_server.__main__:main" | ||
| 15 | |||
| 16 | [build-system] | ||
| 17 | requires = ["hatchling"] | ||
| 18 | build-backend = "hatchling.build" | ||
diff --git a/hosts/surtr/email/internal-policy-server/uv.lock b/hosts/surtr/email/internal-policy-server/uv.lock new file mode 100644 index 00000000..f7a4e729 --- /dev/null +++ b/hosts/surtr/email/internal-policy-server/uv.lock | |||
| @@ -0,0 +1,119 @@ | |||
| 1 | version = 1 | ||
| 2 | revision = 2 | ||
| 3 | requires-python = ">=3.12" | ||
| 4 | |||
| 5 | [[package]] | ||
| 6 | name = "internal-policy-server" | ||
| 7 | version = "0.1.0" | ||
| 8 | source = { editable = "." } | ||
| 9 | dependencies = [ | ||
| 10 | { name = "psycopg" }, | ||
| 11 | { name = "psycopg-binary" }, | ||
| 12 | { name = "psycopg-pool" }, | ||
| 13 | { name = "sdnotify" }, | ||
| 14 | { name = "systemd-socketserver" }, | ||
| 15 | ] | ||
| 16 | |||
| 17 | [package.metadata] | ||
| 18 | requires-dist = [ | ||
| 19 | { name = "psycopg", specifier = ">=3.2.9" }, | ||
| 20 | { name = "psycopg-binary", specifier = ">=3.2.9" }, | ||
| 21 | { name = "psycopg-pool", specifier = ">=3.2.6" }, | ||
| 22 | { name = "sdnotify", specifier = ">=0.3.2" }, | ||
| 23 | { name = "systemd-socketserver", specifier = ">=1.0" }, | ||
| 24 | ] | ||
| 25 | |||
| 26 | [[package]] | ||
| 27 | name = "psycopg" | ||
| 28 | version = "3.2.9" | ||
| 29 | source = { registry = "https://pypi.org/simple" } | ||
| 30 | dependencies = [ | ||
| 31 | { name = "typing-extensions", marker = "python_full_version < '3.13'" }, | ||
| 32 | { name = "tzdata", marker = "sys_platform == 'win32'" }, | ||
| 33 | ] | ||
| 34 | sdist = { url = "https://files.pythonhosted.org/packages/27/4a/93a6ab570a8d1a4ad171a1f4256e205ce48d828781312c0bbaff36380ecb/psycopg-3.2.9.tar.gz", hash = "sha256:2fbb46fcd17bc81f993f28c47f1ebea38d66ae97cc2dbc3cad73b37cefbff700", size = 158122, upload-time = "2025-05-13T16:11:15.533Z" } | ||
| 35 | wheels = [ | ||
| 36 | { url = "https://files.pythonhosted.org/packages/44/b0/a73c195a56eb6b92e937a5ca58521a5c3346fb233345adc80fd3e2f542e2/psycopg-3.2.9-py3-none-any.whl", hash = "sha256:01a8dadccdaac2123c916208c96e06631641c0566b22005493f09663c7a8d3b6", size = 202705, upload-time = "2025-05-13T16:06:26.584Z" }, | ||
| 37 | ] | ||
| 38 | |||
| 39 | [[package]] | ||
| 40 | name = "psycopg-binary" | ||
| 41 | version = "3.2.9" | ||
| 42 | source = { registry = "https://pypi.org/simple" } | ||
| 43 | wheels = [ | ||
| 44 | { url = "https://files.pythonhosted.org/packages/29/6f/ec9957e37a606cd7564412e03f41f1b3c3637a5be018d0849914cb06e674/psycopg_binary-3.2.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:be7d650a434921a6b1ebe3fff324dbc2364393eb29d7672e638ce3e21076974e", size = 4022205, upload-time = "2025-05-13T16:07:48.195Z" }, | ||
| 45 | { url = "https://files.pythonhosted.org/packages/6b/ba/497b8bea72b20a862ac95a94386967b745a472d9ddc88bc3f32d5d5f0d43/psycopg_binary-3.2.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6a76b4722a529390683c0304501f238b365a46b1e5fb6b7249dbc0ad6fea51a0", size = 4083795, upload-time = "2025-05-13T16:07:50.917Z" }, | ||
| 46 | { url = "https://files.pythonhosted.org/packages/42/07/af9503e8e8bdad3911fd88e10e6a29240f9feaa99f57d6fac4a18b16f5a0/psycopg_binary-3.2.9-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:96a551e4683f1c307cfc3d9a05fec62c00a7264f320c9962a67a543e3ce0d8ff", size = 4655043, upload-time = "2025-05-13T16:07:54.857Z" }, | ||
| 47 | { url = "https://files.pythonhosted.org/packages/28/ed/aff8c9850df1648cc6a5cc7a381f11ee78d98a6b807edd4a5ae276ad60ad/psycopg_binary-3.2.9-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:61d0a6ceed8f08c75a395bc28cb648a81cf8dee75ba4650093ad1a24a51c8724", size = 4477972, upload-time = "2025-05-13T16:07:57.925Z" }, | ||
| 48 | { url = "https://files.pythonhosted.org/packages/5c/bd/8e9d1b77ec1a632818fe2f457c3a65af83c68710c4c162d6866947d08cc5/psycopg_binary-3.2.9-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ad280bbd409bf598683dda82232f5215cfc5f2b1bf0854e409b4d0c44a113b1d", size = 4737516, upload-time = "2025-05-13T16:08:01.616Z" }, | ||
| 49 | { url = "https://files.pythonhosted.org/packages/46/ec/222238f774cd5a0881f3f3b18fb86daceae89cc410f91ef6a9fb4556f236/psycopg_binary-3.2.9-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:76eddaf7fef1d0994e3d536ad48aa75034663d3a07f6f7e3e601105ae73aeff6", size = 4436160, upload-time = "2025-05-13T16:08:04.278Z" }, | ||
| 50 | { url = "https://files.pythonhosted.org/packages/37/78/af5af2a1b296eeca54ea7592cd19284739a844974c9747e516707e7b3b39/psycopg_binary-3.2.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:52e239cd66c4158e412318fbe028cd94b0ef21b0707f56dcb4bdc250ee58fd40", size = 3753518, upload-time = "2025-05-13T16:08:07.567Z" }, | ||
| 51 | { url = "https://files.pythonhosted.org/packages/ec/ac/8a3ed39ea069402e9e6e6a2f79d81a71879708b31cc3454283314994b1ae/psycopg_binary-3.2.9-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:08bf9d5eabba160dd4f6ad247cf12f229cc19d2458511cab2eb9647f42fa6795", size = 3313598, upload-time = "2025-05-13T16:08:09.999Z" }, | ||
| 52 | { url = "https://files.pythonhosted.org/packages/da/43/26549af068347c808fbfe5f07d2fa8cef747cfff7c695136172991d2378b/psycopg_binary-3.2.9-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:1b2cf018168cad87580e67bdde38ff5e51511112f1ce6ce9a8336871f465c19a", size = 3407289, upload-time = "2025-05-13T16:08:12.66Z" }, | ||
| 53 | { url = "https://files.pythonhosted.org/packages/67/55/ea8d227c77df8e8aec880ded398316735add8fda5eb4ff5cc96fac11e964/psycopg_binary-3.2.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:14f64d1ac6942ff089fc7e926440f7a5ced062e2ed0949d7d2d680dc5c00e2d4", size = 3472493, upload-time = "2025-05-13T16:08:15.672Z" }, | ||
| 54 | { url = "https://files.pythonhosted.org/packages/3c/02/6ff2a5bc53c3cd653d281666728e29121149179c73fddefb1e437024c192/psycopg_binary-3.2.9-cp312-cp312-win_amd64.whl", hash = "sha256:7a838852e5afb6b4126f93eb409516a8c02a49b788f4df8b6469a40c2157fa21", size = 2927400, upload-time = "2025-05-13T16:08:18.652Z" }, | ||
| 55 | { url = "https://files.pythonhosted.org/packages/28/0b/f61ff4e9f23396aca674ed4d5c9a5b7323738021d5d72d36d8b865b3deaf/psycopg_binary-3.2.9-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:98bbe35b5ad24a782c7bf267596638d78aa0e87abc7837bdac5b2a2ab954179e", size = 4017127, upload-time = "2025-05-13T16:08:21.391Z" }, | ||
| 56 | { url = "https://files.pythonhosted.org/packages/bc/00/7e181fb1179fbfc24493738b61efd0453d4b70a0c4b12728e2b82db355fd/psycopg_binary-3.2.9-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:72691a1615ebb42da8b636c5ca9f2b71f266be9e172f66209a361c175b7842c5", size = 4080322, upload-time = "2025-05-13T16:08:24.049Z" }, | ||
| 57 | { url = "https://files.pythonhosted.org/packages/58/fd/94fc267c1d1392c4211e54ccb943be96ea4032e761573cf1047951887494/psycopg_binary-3.2.9-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25ab464bfba8c401f5536d5aa95f0ca1dd8257b5202eede04019b4415f491351", size = 4655097, upload-time = "2025-05-13T16:08:27.376Z" }, | ||
| 58 | { url = "https://files.pythonhosted.org/packages/41/17/31b3acf43de0b2ba83eac5878ff0dea5a608ca2a5c5dd48067999503a9de/psycopg_binary-3.2.9-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0e8aeefebe752f46e3c4b769e53f1d4ad71208fe1150975ef7662c22cca80fab", size = 4482114, upload-time = "2025-05-13T16:08:30.781Z" }, | ||
| 59 | { url = "https://files.pythonhosted.org/packages/85/78/b4d75e5fd5a85e17f2beb977abbba3389d11a4536b116205846b0e1cf744/psycopg_binary-3.2.9-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b7e4e4dd177a8665c9ce86bc9caae2ab3aa9360b7ce7ec01827ea1baea9ff748", size = 4737693, upload-time = "2025-05-13T16:08:34.625Z" }, | ||
| 60 | { url = "https://files.pythonhosted.org/packages/3b/95/7325a8550e3388b00b5e54f4ced5e7346b531eb4573bf054c3dbbfdc14fe/psycopg_binary-3.2.9-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7fc2915949e5c1ea27a851f7a472a7da7d0a40d679f0a31e42f1022f3c562e87", size = 4437423, upload-time = "2025-05-13T16:08:37.444Z" }, | ||
| 61 | { url = "https://files.pythonhosted.org/packages/1a/db/cef77d08e59910d483df4ee6da8af51c03bb597f500f1fe818f0f3b925d3/psycopg_binary-3.2.9-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a1fa38a4687b14f517f049477178093c39c2a10fdcced21116f47c017516498f", size = 3758667, upload-time = "2025-05-13T16:08:40.116Z" }, | ||
| 62 | { url = "https://files.pythonhosted.org/packages/95/3e/252fcbffb47189aa84d723b54682e1bb6d05c8875fa50ce1ada914ae6e28/psycopg_binary-3.2.9-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:5be8292d07a3ab828dc95b5ee6b69ca0a5b2e579a577b39671f4f5b47116dfd2", size = 3320576, upload-time = "2025-05-13T16:08:43.243Z" }, | ||
| 63 | { url = "https://files.pythonhosted.org/packages/1c/cd/9b5583936515d085a1bec32b45289ceb53b80d9ce1cea0fef4c782dc41a7/psycopg_binary-3.2.9-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:778588ca9897b6c6bab39b0d3034efff4c5438f5e3bd52fda3914175498202f9", size = 3411439, upload-time = "2025-05-13T16:08:47.321Z" }, | ||
| 64 | { url = "https://files.pythonhosted.org/packages/45/6b/6f1164ea1634c87956cdb6db759e0b8c5827f989ee3cdff0f5c70e8331f2/psycopg_binary-3.2.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f0d5b3af045a187aedbd7ed5fc513bd933a97aaff78e61c3745b330792c4345b", size = 3477477, upload-time = "2025-05-13T16:08:51.166Z" }, | ||
| 65 | { url = "https://files.pythonhosted.org/packages/7b/1d/bf54cfec79377929da600c16114f0da77a5f1670f45e0c3af9fcd36879bc/psycopg_binary-3.2.9-cp313-cp313-win_amd64.whl", hash = "sha256:2290bc146a1b6a9730350f695e8b670e1d1feb8446597bed0bbe7c3c30e0abcb", size = 2928009, upload-time = "2025-05-13T16:08:53.67Z" }, | ||
| 66 | ] | ||
| 67 | |||
| 68 | [[package]] | ||
| 69 | name = "psycopg-pool" | ||
| 70 | version = "3.2.6" | ||
| 71 | source = { registry = "https://pypi.org/simple" } | ||
| 72 | dependencies = [ | ||
| 73 | { name = "typing-extensions" }, | ||
| 74 | ] | ||
| 75 | sdist = { url = "https://files.pythonhosted.org/packages/cf/13/1e7850bb2c69a63267c3dbf37387d3f71a00fd0e2fa55c5db14d64ba1af4/psycopg_pool-3.2.6.tar.gz", hash = "sha256:0f92a7817719517212fbfe2fd58b8c35c1850cdd2a80d36b581ba2085d9148e5", size = 29770, upload-time = "2025-02-26T12:03:47.129Z" } | ||
| 76 | wheels = [ | ||
| 77 | { url = "https://files.pythonhosted.org/packages/47/fd/4feb52a55c1a4bd748f2acaed1903ab54a723c47f6d0242780f4d97104d4/psycopg_pool-3.2.6-py3-none-any.whl", hash = "sha256:5887318a9f6af906d041a0b1dc1c60f8f0dda8340c2572b74e10907b51ed5da7", size = 38252, upload-time = "2025-02-26T12:03:45.073Z" }, | ||
| 78 | ] | ||
| 79 | |||
| 80 | [[package]] | ||
| 81 | name = "sdnotify" | ||
| 82 | version = "0.3.2" | ||
| 83 | source = { registry = "https://pypi.org/simple" } | ||
| 84 | sdist = { url = "https://files.pythonhosted.org/packages/ce/d8/9fdc36b2a912bf78106de4b3f0de3891ff8f369e7a6f80be842b8b0b6bd5/sdnotify-0.3.2.tar.gz", hash = "sha256:73977fc746b36cc41184dd43c3fe81323e7b8b06c2bb0826c4f59a20c56bb9f1", size = 2459, upload-time = "2017-08-02T20:03:44.395Z" } | ||
| 85 | |||
| 86 | [[package]] | ||
| 87 | name = "systemd-python" | ||
| 88 | version = "235" | ||
| 89 | source = { registry = "https://pypi.org/simple" } | ||
| 90 | sdist = { url = "https://files.pythonhosted.org/packages/10/9e/ab4458e00367223bda2dd7ccf0849a72235ee3e29b36dce732685d9b7ad9/systemd-python-235.tar.gz", hash = "sha256:4e57f39797fd5d9e2d22b8806a252d7c0106c936039d1e71c8c6b8008e695c0a", size = 61677, upload-time = "2023-02-11T13:42:16.588Z" } | ||
| 91 | |||
| 92 | [[package]] | ||
| 93 | name = "systemd-socketserver" | ||
| 94 | version = "1.0" | ||
| 95 | source = { registry = "https://pypi.org/simple" } | ||
| 96 | dependencies = [ | ||
| 97 | { name = "systemd-python" }, | ||
| 98 | ] | ||
| 99 | wheels = [ | ||
| 100 | { url = "https://files.pythonhosted.org/packages/d8/4f/b28b7f08880120a26669b080ca74487c8c67e8b54dcb0467a8f0c9f38ed6/systemd_socketserver-1.0-py3-none-any.whl", hash = "sha256:987a8bfbf28d959e7c2966c742ad7bad482f05e121077defcf95bb38267db9a8", size = 3248, upload-time = "2020-04-26T05:26:40.661Z" }, | ||
| 101 | ] | ||
| 102 | |||
| 103 | [[package]] | ||
| 104 | name = "typing-extensions" | ||
| 105 | version = "4.13.2" | ||
| 106 | source = { registry = "https://pypi.org/simple" } | ||
| 107 | sdist = { url = "https://files.pythonhosted.org/packages/f6/37/23083fcd6e35492953e8d2aaaa68b860eb422b34627b13f2ce3eb6106061/typing_extensions-4.13.2.tar.gz", hash = "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef", size = 106967, upload-time = "2025-04-10T14:19:05.416Z" } | ||
| 108 | wheels = [ | ||
| 109 | { url = "https://files.pythonhosted.org/packages/8b/54/b1ae86c0973cc6f0210b53d508ca3641fb6d0c56823f288d108bc7ab3cc8/typing_extensions-4.13.2-py3-none-any.whl", hash = "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c", size = 45806, upload-time = "2025-04-10T14:19:03.967Z" }, | ||
| 110 | ] | ||
| 111 | |||
| 112 | [[package]] | ||
| 113 | name = "tzdata" | ||
| 114 | version = "2025.2" | ||
| 115 | source = { registry = "https://pypi.org/simple" } | ||
| 116 | sdist = { url = "https://files.pythonhosted.org/packages/95/32/1a225d6164441be760d75c2c42e2780dc0873fe382da3e98a2e1e48361e5/tzdata-2025.2.tar.gz", hash = "sha256:b60a638fcc0daffadf82fe0f57e53d06bdec2f36c4df66280ae79bce6bd6f2b9", size = 196380, upload-time = "2025-03-23T13:54:43.652Z" } | ||
| 117 | wheels = [ | ||
| 118 | { url = "https://files.pythonhosted.org/packages/5c/23/c7abc0ca0a1526a0774eca151daeb8de62ec457e77262b66b359c3c7679e/tzdata-2025.2-py2.py3-none-any.whl", hash = "sha256:1a403fada01ff9221ca8044d701868fa132215d84beb92242d9acd2147f667a8", size = 347839, upload-time = "2025-03-23T13:54:41.845Z" }, | ||
| 119 | ] | ||
