Alexander Graf
4b9886b139
Merge remote-tracking branch 'upstream/master' into import-export
2021-02-16 16:24:30 +01:00
Alexander Graf
10435114ec
updated remarks and docs
2021-02-16 15:36:01 +01:00
Alexander Graf
1e2b5f26ab
don't handle nested lists
2021-02-16 13:34:02 +01:00
Alexander Graf
70a1c79f81
handle prune and delete for lists and backrefs
2021-02-15 22:57:37 +01:00
Alexander Graf
8929912dea
remove OrderedDict - not necessary in python>=3.7
2021-02-15 21:56:58 +01:00
Alexander Graf
3937986e76
Convert OrderedDict to dict for output
2021-02-15 10:01:35 +01:00
Alexander Graf
68caf50154
new import/export using marshmallow
2021-02-15 00:46:59 +01:00
lub
88f992de16
show flash messages again
...
This basically restores the behaviour, that got removed in
ecdf0c25b3d9bbaa028bdc46cb721d2fb406dde2 during refactoring.
2021-02-13 13:36:05 +01:00
Florent Daigniere
2e749abe61
DNS records for client autoconfiguration (RFC6186)
2021-02-07 18:50:26 +01:00
Florent Daigniere
b49554bec1
merge artifact
2021-02-07 18:12:00 +01:00
Florent Daigniere
ef637f51b7
derive the SSO keys from a KDF
2021-02-07 17:58:19 +01:00
Florent Daigniere
906a051925
Make rainloop use internal auth
2021-02-07 17:50:17 +01:00
Alexander Graf
902b398127
next step for import/export yaml & json
2021-01-24 19:07:48 +01:00
Mordi Sacks
f56af3053a
Removed email address
2021-01-17 01:28:25 +02:00
Alexander Graf
65b1ad46d9
order yaml data and allow callback on import
...
- in yaml the primary key is now always first
- calling a function on import allows import to be more verbose
- skip "fetches" when empty
2021-01-15 13:57:20 +01:00
Alexander Graf
8213d044b2
added docstrings, use f-strings, cleanup
...
- idna.encode does not encode upper-case letters,
so .lower() has to be called on value not on result
- split email-address on '@' only once
- converted '*'.format(*) to f-strings
- added docstrings
- removed from_dict method
- code cleanup/style (list concat, exceptions, return&else, line-length)
- added TODO comments on possible future changes
2021-01-15 13:53:47 +01:00
Alexander Graf
31a903f959
revived & renamed config-fns. cosmetics.
...
- revived original config-update function for backwards compability
- renamed config-dump to config-export to be in line with config-import
- converted '*'.format(*) to f-strings
- converted string-concatenation to f-strings
2021-01-15 13:45:36 +01:00
Alexander Graf
c24bff1c1b
added config_import using marshmallow
2021-01-14 01:11:04 +01:00
Alexander Graf
7413f9b7b4
config_dump now using marshmallow
2021-01-13 00:05:43 +01:00
Alexander Graf
dc42d375e2
added filtering of keys and default value
2021-01-08 14:22:59 +01:00
Alexander Graf
82cf0d843f
fix sqlalchemy column definitions
2021-01-08 14:22:11 +01:00
Alexander Graf
b3f8dacdad
add docstrings and make linter happy
2021-01-08 14:17:28 +01:00
Alexander Graf
6629aa3ff8
first try at api using flask-restx & marshmallow
2021-01-06 17:05:21 +01:00
Alexander Graf
4c258f5a6b
cosmetic changes & make linter happy
...
renamed single letter variables (m => match)
renamed classmethod arguments to cls (model)
removed shadowing of variables (hash, context)
shortened unneeded lambda functions (id)
converted type ... is to isinstance(...)
removed unneded imports (flask)
2021-01-06 16:45:55 +01:00
Alexander Graf
7229c89de1
ConfigManager should not replace app.config
...
Updated ConfigManager to only modify app.config and not replace it.
Swagger does not play well, when app.config is not a real dict and
it is not necessary to keep ConfigManager around after init.
Also added "API" flag to config (default: disabled).
2021-01-06 16:31:03 +01:00
Alexander Graf
3b35180b41
cosmetic changes
2020-12-20 23:50:26 +01:00
Alexander Graf
815f47667b
update dkim-key on commit only
2020-12-20 23:49:42 +01:00
Alexander Graf
0a594aaa2c
cosmetic changes
2020-12-20 23:45:27 +01:00
Alexander Graf
3064a1dcff
removed call to (undefined) cli
2020-12-20 23:38:55 +01:00
Alexander Graf
0051b93077
removed unused variable
2020-12-16 22:39:50 +01:00
Alexander Graf
63176f4878
Merge remote-tracking branch 'upstream/master' into import-export
2020-11-30 22:03:10 +01:00
Alexander Graf
adc9c70c3e
added dump option to dump dns data of domains
2020-10-24 22:31:32 +02:00
Alexander Graf
2a5c46c890
Allow to dump only selected sections
2020-10-24 22:31:31 +02:00
Alexander Graf
500967b2f5
ignore dkim_publickey when updating config
2020-10-24 22:31:29 +02:00
Alexander Graf
c46f9328f7
also dump dkim_publickey. allow key generation.
2020-10-24 22:31:26 +02:00
Alexander Graf
acc728109b
validate dkim keys and allow removal
2020-10-24 22:31:13 +02:00
cbachert
72a9ec5b7c
Fix extract_host_port port separation
...
Regex quantifier should be lazy to make port separation work.
2020-10-24 00:25:53 +01:00
Alexander Graf
dfc34b2165
Merge remote-tracking branch 'upstream/master' into import-export
2020-10-23 16:16:29 +02:00
Dimitri Huisman
78890a97ff
Preparations for 1.8 release.
2020-10-01 20:32:05 +02:00
Alexander Graf
8e14aa80ee
documented options and added help text
2020-09-04 12:57:40 +02:00
Alexander Graf
9d2327b0f1
add space for more human readable indentation
...
add a newline before main sections
add some spaces to indent
2020-09-04 12:32:51 +02:00
lub
05e2af1802
fix small typo in Auth-SSL
2020-09-02 15:16:10 +02:00
lub
f0f873ffe7
add option to enforce inbound starttls
2020-09-01 21:48:09 +02:00
lub
02cfe326d3
support using files for SECRET_KEY and DB_PW
...
this enables usage of e.g. docker swarm secrets instead of exposing the
passwords directly via environment variables
just use DB_PW_FILE and SECRET_KEY_FILE instead of DB_PW and SECRET_KEY
2020-08-30 01:04:36 +02:00
Alexander Graf
69ccf791d2
fixed data import via from_dict
...
- stabilized CommaSeparatedList by sorting values
- CommaSeparatedList can now handle list and set input
- from_dict now handles mapped keys
- from_dict now handles null values
- class Domain: handle dkim-key None correctly
- class User: delete obsolete keys after converting
- class Alias: now uses Email._dict_input
2020-08-26 23:16:37 +02:00
Alexander Graf
190e7a709b
renamed config-dump option --verbose to --full
2020-08-26 23:14:27 +02:00
Alexander Graf
5c0efe82cf
implemented config_update and config_dump
...
enhanced data model with to_dict and from_dict methods
added config_dump function to manage command
config_update now uses new data model methods
2020-08-26 11:27:38 +02:00
Alexander Graf
c26ddd3c68
fixed user's destination property
...
self.forward_destination is a list (and not string)
2020-08-26 11:19:01 +02:00
Alexander Graf
5dfccdafe9
fixed some minor typos, removed unused variable
2020-08-26 11:11:23 +02:00
Brian Maloney
6bd14506c0
Explicitly define ProxyFix options
...
Even though these seem to be the defaults, since 1.7 x_proto was not being honored (see #1309 ), this fixes this issue for me.
2020-06-28 17:27:45 -04:00