mirrors/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-04-05 14:17:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Adjustment: option [auth] htpasswd_encryption change default from "md5" to "autodetect"

Browse source
This commit is contained in:
Peter Bieringer 2024-09-01 17:19:53 +02:00
parent b1ce69882c
commit c63dee71ec
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -2,6 +2,8 @@
## 3.dev ## 3.dev
* Adjustment: option [auth] htpasswd_encryption change default from "md5" to "autodetect"
## 3.2.3 ## 3.2.3
* Add: support for Python 3.13 * Add: support for Python 3.13
* Fix: Using icalendar's tzinfo on created datetime to fix issue with icalendar * Fix: Using icalendar's tzinfo on created datetime to fix issue with icalendar

17
DOCUMENTATION.md
View file

@ -122,12 +122,12 @@ The `users` file can be created and managed with
[htpasswd](https://httpd.apache.org/docs/current/programs/htpasswd.html): [htpasswd](https://httpd.apache.org/docs/current/programs/htpasswd.html):
```bash ```bash
# Create a new htpasswd file with the user "user1" # Create a new htpasswd file with the user "user1" using SHA-512 as hash method
$ htpasswd -c /path/to/users user1 $ htpasswd -5 -c /path/to/users user1
New password: New password:
Re-type new password: Re-type new password:
# Add another user # Add another user
$ htpasswd /path/to/users user2 $ htpasswd -5 /path/to/users user2
New password: New password:
Re-type new password: Re-type new password:
``` ```
@ -138,8 +138,7 @@ Authentication can be enabled with the following configuration:
[auth] [auth]
type = htpasswd type = htpasswd
htpasswd_filename = /path/to/users htpasswd_filename = /path/to/users
# encryption method used in the htpasswd file htpasswd_encryption = autodetect
htpasswd_encryption = md5
``` ```
##### The simple but insecure way ##### The simple but insecure way
@ -623,7 +622,7 @@ hosts = 0.0.0.0:5232, [::]:5232
[auth] [auth]
type = htpasswd type = htpasswd
htpasswd_filename = ~/.config/radicale/users htpasswd_filename = ~/.config/radicale/users
htpasswd_encryption = md5 htpasswd_encryption = autodetect
[storage] [storage]
filesystem_folder = ~/.var/lib/radicale/collections filesystem_folder = ~/.var/lib/radicale/collections
@ -641,7 +640,7 @@ The same example configuration via command line arguments looks like:
```bash ```bash
python3 -m radicale --server-hosts 0.0.0.0:5232,[::]:5232 \ python3 -m radicale --server-hosts 0.0.0.0:5232,[::]:5232 \
--auth-type htpasswd --auth-htpasswd-filename ~/.config/radicale/users \ --auth-type htpasswd --auth-htpasswd-filename ~/.config/radicale/users \
--auth-htpasswd-encryption md5 --auth-htpasswd-encryption autodetect
``` ```
Add the argument `--config ""` to stop Radicale from loading the default Add the argument `--config ""` to stop Radicale from loading the default
@ -775,7 +774,7 @@ Available methods:
The installation of **bcrypt** is required for this. The installation of **bcrypt** is required for this.
`md5` `md5`
: This uses an iterated MD5 digest of the password with a salt. : This uses an iterated MD5 digest of the password with a salt (nowadays insecure).
`sha256` `sha256`
: This uses an iterated SHA-256 digest of the password with a salt. : This uses an iterated SHA-256 digest of the password with a salt.
@ -786,7 +785,7 @@ Available methods:
`autodetect` `autodetect`
: This selects autodetection of method per entry. : This selects autodetection of method per entry.
Default: `md5` Default: `autodetect`
##### delay ##### delay

2
config
View file

@ -62,7 +62,7 @@
# Htpasswd encryption method # Htpasswd encryption method
# Value: plain | bcrypt | md5 | sha256 | sha512 | autodetect # Value: plain | bcrypt | md5 | sha256 | sha512 | autodetect
# bcrypt requires the installation of 'bcrypt' module. # bcrypt requires the installation of 'bcrypt' module.
#htpasswd_encryption = md5 #htpasswd_encryption = autodetect
# Incorrect authentication delay (seconds) # Incorrect authentication delay (seconds)
#delay = 1 #delay = 1

2
radicale/config.py
View file

@ -180,7 +180,7 @@ DEFAULT_CONFIG_SCHEMA: types.CONFIG_SCHEMA = OrderedDict([
"help": "htpasswd filename", "help": "htpasswd filename",
"type": filepath}), "type": filepath}),
("htpasswd_encryption", { ("htpasswd_encryption", {
"value": "md5", "value": "autodetect",
"help": "htpasswd encryption method", "help": "htpasswd encryption method",
"type": str}), "type": str}),
("realm", { ("realm", {