Compare commits

...

14 Commits

Author SHA1 Message Date
missytake
3eae1657de fix lint 2024-06-19 14:42:27 +02:00
Christian Hagenest
736c67ac1f test commit 2024-06-19 14:40:58 +02:00
Christian Hagenest
295072e57b replace § with $ in doveauth 2024-06-19 14:40:58 +02:00
Christian Hagenest
dc17088517 lint 2024-06-19 14:40:58 +02:00
Christian Hagenest
514a063142 black 2024-06-19 14:40:58 +02:00
Christian Hagenest
2b96586e12 import passlib.hash 2024-06-19 14:40:58 +02:00
Christian Hagenest
8fde4d929d Update Changelog 2024-06-19 14:40:58 +02:00
Christian Hagenest
683aefa37c add passlib to the correct pyproject.toml 2024-06-19 14:40:58 +02:00
Christian Hagenest
b951ec12c5 replace crypt with passlib 2024-06-19 14:40:58 +02:00
Christian Hagenest
3d8ac6b598 add changelog 2024-06-19 14:40:57 +02:00
Christian Hagenest
9515a37687 update doveauth hashing 2024-06-19 14:35:19 +02:00
Christian Hagenest
b5d0b0ad9a try generating salt manually 2024-06-19 14:35:19 +02:00
Christian Hagenest
3f4989223d encode to bytes 2024-06-19 14:35:19 +02:00
Christian Hagenest
9be0408ab8 replace crypt with hashlib 2024-06-19 14:35:19 +02:00
4 changed files with 9 additions and 5 deletions

View File

@@ -2,6 +2,9 @@
## untagged
- replace crypt with passlib, as crypt will be deprecated in Python 3.13
([#319](https://github.com/deltachat/chatmail/pull/319))
- Reject DKIM signatures that do not cover the whole message body.
([#321](https://github.com/deltachat/chatmail/pull/321))

View File

@@ -12,6 +12,7 @@ dependencies = [
"deltachat-rpc-client",
"filelock",
"requests",
"passlib",
]
[tool.setuptools]

View File

@@ -1,4 +1,3 @@
import crypt
import json
import logging
import os
@@ -11,6 +10,8 @@ from socketserver import (
UnixStreamServer,
)
import passlib.hash
from .config import Config, read_config
from .database import Database
@@ -23,8 +24,9 @@ class UnknownCommand(ValueError):
def encrypt_password(password: str):
# https://doc.dovecot.org/configuration_manual/authentication/password_schemes/
passhash = crypt.crypt(password, crypt.METHOD_SHA512)
return "{SHA512-CRYPT}" + passhash
pw = passlib.hash.sha512_crypt.hash(password).split("$")
return "{SHA512-CRYPT}$" + pw[1] + "$" + pw[3] + "$" + pw[4]
def is_allowed_to_create(config: Config, user, cleartext_password) -> bool:

View File

@@ -649,5 +649,3 @@ def deploy_chatmail(config_path: Path) -> None:
name="Ensure cron is installed",
packages=["cron"],
)