diff options
| author | Simon Hauser <simon.hauser@helsinki-systems.de> | 2023-08-04 16:12:01 +0200 |
|---|---|---|
| committer | Simon Hauser <simon.hauser@helsinki-systems.de> | 2023-08-04 16:30:05 +0200 |
| commit | c04808c938e2a3deb0e9b43e3ae0af915d1d561d (patch) | |
| tree | 8de52e7eb387fb9dbc00733b6b16616d92640cc3 /src | |
| parent | 04c2886544ca562a0b9154974ecc491d14e0fba6 (diff) | |
| download | rspamd-c04808c938e2a3deb0e9b43e3ae0af915d1d561d.tar.gz rspamd-c04808c938e2a3deb0e9b43e3ae0af915d1d561d.zip | |
fix: redis schema parsing
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/lua/bimi.lua | 6 | ||||
| -rw-r--r-- | src/plugins/lua/history_redis.lua | 4 | ||||
| -rw-r--r-- | src/plugins/lua/reputation.lua | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/lua/bimi.lua b/src/plugins/lua/bimi.lua index bcf5a823d..e90a4e3b9 100644 --- a/src/plugins/lua/bimi.lua +++ b/src/plugins/lua/bimi.lua @@ -34,7 +34,7 @@ local settings = { } local redis_params -local settings_schema = ts.shape({ +local settings_schema = lua_redis.generate_schema({ helper_url = ts.string, helper_timeout = ts.number + ts.string / lua_util.parse_time_interval, helper_sync = ts.boolean, @@ -42,7 +42,7 @@ local settings_schema = ts.shape({ redis_min_expiry = ts.number + ts.string / lua_util.parse_time_interval, redis_prefix = ts.string, enabled = ts.boolean:is_optional(), -}, {extra_fields = lua_redis.config_schema}) +}) local function check_dmarc_policy(task) local dmarc_sym = task:get_symbol('DMARC_POLICY_ALLOW') @@ -378,4 +378,4 @@ if redis_params then rspamd_config:register_dependency('BIMI_CHECK', 'DMARC_CHECK') else lua_util.disable_module(N, "redis") -end
\ No newline at end of file +end diff --git a/src/plugins/lua/history_redis.lua b/src/plugins/lua/history_redis.lua index d4ee71cd1..cfedfeac3 100644 --- a/src/plugins/lua/history_redis.lua +++ b/src/plugins/lua/history_redis.lua @@ -65,7 +65,7 @@ local settings = { subject_privacy_length = 16, -- cut the length of the hash } -local settings_schema = ts.shape({ +local settings_schema = lua_redis.generate_schema({ key_prefix = ts.string, expire = (ts.number + ts.string / lua_util.parse_time_interval):is_optional(), nrows = ts.number, @@ -74,7 +74,7 @@ local settings_schema = ts.shape({ subject_privacy_alg = ts.string:is_optional(), subject_privacy_prefix = ts.string:is_optional(), subject_privacy_length = ts.number:is_optional(), -}, {extra_fields = lua_redis.config_schema}) +}) local function process_addr(addr) if addr then diff --git a/src/plugins/lua/reputation.lua b/src/plugins/lua/reputation.lua index 19e7085ef..e0530a42e 100644 --- a/src/plugins/lua/reputation.lua +++ b/src/plugins/lua/reputation.lua @@ -1064,7 +1064,7 @@ end --]] local backends = { redis = { - schema = ts.shape({ + schema = lua_redis.generate_schema({ prefix = ts.string, expiry = ts.number + ts.string / lua_util.parse_time_interval, buckets = ts.array_of(ts.shape{ @@ -1072,7 +1072,7 @@ local backends = { name = ts.string, mult = ts.number + ts.string / tonumber }), - }, {extra_fields = lua_redis.config_schema}), + }), config = { expiry = default_expiry, prefix = default_prefix, |