Commit Graph

16380 Commits

Author SHA1 Message Date
Peter Wu
c3ea63fd12 [Minor] Debian: Expand Build-Depends line and sort it 2020-01-18 20:30:54 +00:00
Peter Wu
c4d6e5abe4 [Minor] Debian: remove unused cmake options
GD (off by default) and TORCH (on by default) were removed in 2.0, the
examples option (off by default) was removed in 2.2.
2020-01-18 19:56:15 +00:00
Peter Wu
1cff888387 [Minor] Debian: add missing sodium dependency
Required since rspamd 2.0. Even Debian Jessie ships 1.0.0, so add it
unconditionally.
2020-01-18 18:49:56 +00:00
Peter Wu
e5367bedeb [Minor] Debian: Enable Hyperscan and parallel builds
Debian 9 (Stretch) ships with Hyperscan 4.4.1, Ubuntu 18.04 ships with
Hyperscan 4.7.0. Follow rspamd's official recommendation and enable
support for these.

The --parallel option has been supported since 2009 and works perfectly
with CMake, so enable it by default.
2020-01-18 18:06:55 +00:00
Vsevolod Stakhov
fcf7825b58
Merge pull request #3224 from korgoth1/master
[Test] excluding external relay ip example from spf.conf
2020-01-17 16:18:15 +00:00
Vsevolod Stakhov
a9be4161d7
Merge pull request #3220 from cgzones/compiler_warnings
[Minor] Fix some compiler warnings
2020-01-17 16:05:43 +00:00
Vsevolod Stakhov
06baaa8ff2 [Minor] Another try to fix shifting 2020-01-17 15:00:54 +00:00
Vsevolod Stakhov
2beeda0d04 [Minor] Fix race condition in slow timer 2020-01-17 13:10:58 +00:00
Vsevolod Stakhov
f8b183d8e9 [Minor] Another try to fix urls shifting when decoding 2020-01-17 13:01:25 +00:00
Vsevolod Stakhov
fbf14aa0b0 [Minor] Reset slow flag on checks pause 2020-01-17 12:39:49 +00:00
korgoth1
e65d343822 [Test] excluding external relay ip example from spf.conf 2020-01-17 15:25:41 +03:00
Vsevolod Stakhov
c6ee414bf6 [Minor] Forgot in the previous commit 2020-01-17 11:32:44 +00:00
Vsevolod Stakhov
45e55eed1f
Merge pull request #3223 from moisseev/webui
[WebUI] Update favicon
2020-01-17 10:24:08 +00:00
Vsevolod Stakhov
72fbcb3056 [Minor] Postpone log closing unless we have opened a new one 2020-01-17 10:20:22 +00:00
Vsevolod Stakhov
dae6f5e3d3
Merge pull request #3215 from korgoth1/master
[Feature] SPF: Convert external IP to a map
2020-01-16 20:04:11 +00:00
Christian Göttsche
25d8df0b73 [Minor] do not pass invalid C warnings to C++ flags
cc1plus: warning: command line option ‘-Wno-pointer-sign’ is valid for C/ObjC but not for C++
cc1plus: warning: command line option ‘-Wstrict-prototypes’ is valid for C/ObjC but not for C++
2020-01-16 19:37:12 +01:00
Christian Göttsche
e98f08c797 [Minor] use modern name -Wextra instead of -W 2020-01-16 19:37:12 +01:00
Christian Göttsche
d1410ad779 [Minor] silence redefinition of macro
[74/340] Building C object contrib/lua-lpeg/CMakeFiles/rspamd-lpeg.dir/lpprint.c.o
In file included from ../contrib/lua-lpeg/lpprint.c:11:
../contrib/lua-lpeg/lptypes.h:15: warning: "NDEBUG" redefined
   15 | #define NDEBUG
      |
<command-line>: note: this is the location of the previous definition
[75/340] Building C object contrib/lua-lpeg/CMakeFiles/rspamd-lpeg.dir/lpcap.c.o
In file included from ../contrib/lua-lpeg/lpcap.h:9,
                 from ../contrib/lua-lpeg/lpcap.c:9:
../contrib/lua-lpeg/lptypes.h:15: warning: "NDEBUG" redefined
   15 | #define NDEBUG
      |
<command-line>: note: this is the location of the previous definition
[77/340] Building C object contrib/lua-lpeg/CMakeFiles/rspamd-lpeg.dir/lpvm.c.o
In file included from ../contrib/lua-lpeg/lpcap.h:9,
                 from ../contrib/lua-lpeg/lpvm.c:15:
../contrib/lua-lpeg/lptypes.h:15: warning: "NDEBUG" redefined
   15 | #define NDEBUG
      |
<command-line>: note: this is the location of the previous definition
[79/340] Building C object contrib/lua-lpeg/CMakeFiles/rspamd-lpeg.dir/lpcode.c.o
In file included from ../contrib/lua-lpeg/lpcode.c:12:
../contrib/lua-lpeg/lptypes.h:15: warning: "NDEBUG" redefined
   15 | #define NDEBUG
      |
<command-line>: note: this is the location of the previous definition
[81/340] Building C object contrib/lua-lpeg/CMakeFiles/rspamd-lpeg.dir/lptree.c.o
In file included from ../contrib/lua-lpeg/lptree.c:15:
../contrib/lua-lpeg/lptypes.h:15: warning: "NDEBUG" redefined
   15 | #define NDEBUG
      |
<command-line>: note: this is the location of the previous definition
2020-01-16 19:37:12 +01:00
Christian Göttsche
aa13e41e5f [Minor] silence -Wmisleading-indentation in contrib/snowball/
../contrib/snowball/compiler/analyser.c: In function ‘check_name_type’:
../contrib/snowball/compiler/analyser.c:210:19: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
  210 |         case 'r': if (p->type == t_routine ||
      |                   ^~
../contrib/snowball/compiler/analyser.c:211:54: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
  211 |                       p->type == t_external) return; break;
      |                                                      ^~~~~
../contrib/snowball/compiler/analyser.c: In function ‘read_program’:
../contrib/snowball/compiler/analyser.c:859:21: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
  859 |                     if (q->used && q->definition == 0) error4(a, q); break;
      |                     ^~
../contrib/snowball/compiler/analyser.c:859:70: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
  859 |                     if (q->used && q->definition == 0) error4(a, q); break;
      |                                                                      ^~~~~
../contrib/snowball/compiler/analyser.c:861:21: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
  861 |                     if (q->used && q->grouping == 0) error4(a, q); break;
      |                     ^~
../contrib/snowball/compiler/analyser.c:861:68: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
  861 |                     if (q->used && q->grouping == 0) error4(a, q); break;
      |                                                                    ^~~~~
2020-01-16 19:37:12 +01:00
korgoth1
a34ac243e8 [Test] SPF external IP map 2020-01-16 21:35:21 +03:00
moisseev
36efb3c7e0 [WebUI] Update favicon
Issue #3207
2020-01-16 21:09:17 +03:00
Vsevolod Stakhov
f88b044583 [Minor] Lua_task: Remove unused crap
Issue: #3220
2020-01-16 17:21:11 +00:00
Vsevolod Stakhov
1dec277e05
Merge pull request #3219 from cgzones/interface_cruft
[Minor] remove cruft files from webui
2020-01-16 15:54:32 +00:00
Vsevolod Stakhov
dc312fb597
Merge pull request #3218 from cgzones/no_replxx
[Minor] fix compilation without replxx
2020-01-16 15:53:59 +00:00
Vsevolod Stakhov
d6a20981d8
Merge pull request #3217 from cgzones/exampledir
[Minor] remove unused examplesdir
2020-01-16 15:53:21 +00:00
Vsevolod Stakhov
2ccd791dda
Merge pull request #3216 from cgzones/spellings
[Minor] fix spelling
2020-01-16 15:52:21 +00:00
Christian Göttsche
3b5628dc30 [Minor] fix spelling 2020-01-16 16:05:48 +01:00
Christian Göttsche
1a7a4a3d89 [Minor] remove unused examplesdir 2020-01-16 16:02:58 +01:00
Christian Göttsche
351861788d [Minor] fix compilation without replxx
../src/rspamadm/lua_repl.c: In function ‘rspamadm_lua_run_repl’:
../src/rspamadm/lua_repl.c:615:8: warning: unused variable ‘i’ [-Wunused-variable]
  615 |  gsize i;
      |        ^
../src/rspamadm/lua_repl.c:614:11: warning: unused variable ‘tb’ [-Wunused-variable]
  614 |  GString *tb = NULL;
      |           ^~
../src/rspamadm/lua_repl.c:613:11: warning: unused variable ‘is_multiline’ [-Wunused-variable]
  613 |  gboolean is_multiline = FALSE;
      |           ^~~~~~~~~~~~
../src/rspamadm/lua_repl.c: In function ‘rspamadm_lua’:
../src/rspamadm/lua_repl.c:1007:3: warning: implicit declaration of function ‘replxx_set_max_history_size’ [-Wimplicit-function-declaration]
 1007 |   replxx_set_max_history_size (rx_instance, max_history);
      |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~
../src/rspamadm/lua_repl.c:1007:32: error: ‘rx_instance’ undeclared (first use in this function)
 1007 |   replxx_set_max_history_size (rx_instance, max_history);
      |                                ^~~~~~~~~~~
../src/rspamadm/lua_repl.c:1007:32: note: each undeclared identifier is reported only once for each function it appears in
../src/rspamadm/lua_repl.c:1008:3: warning: implicit declaration of function ‘replxx_history_load’ [-Wimplicit-function-declaration]
 1008 |   replxx_history_load (rx_instance, histfile);
      |   ^~~~~~~~~~~~~~~~~~~
../src/rspamadm/lua_repl.c:1010:3: warning: implicit declaration of function ‘replxx_history_save’ [-Wimplicit-function-declaration]
 1010 |   replxx_history_save (rx_instance, histfile);
      |   ^~~~~~~~~~~~~~~~~~~
2020-01-16 15:57:46 +01:00
Christian Göttsche
c9c299def4 [Minor] remove cruft files from webui 2020-01-16 15:53:28 +01:00
korgoth1
70bea4abb4 [Test] SPF external IP map 2020-01-16 15:59:23 +03:00
Vsevolod Stakhov
7e0bf487c3 [Minor] Check string length to avoid OOB reading 2020-01-16 12:55:46 +00:00
Vsevolod Stakhov
cfc7ee6d68
Merge pull request #3153 from resec/smembers
[Minor] Eliminate redis SMEMBERS usage
2020-01-16 12:30:16 +00:00
Vsevolod Stakhov
2f1cad9993
Merge pull request #3214 from Lekensteyn/fix-dkim-policy-check
[Minor] Dkim_signing: correct is_skip_sign logic
2020-01-16 12:24:35 +00:00
Vsevolod Stakhov
e7bc102cd4 [Project] Lua_content: Add preliminary fonts handling 2020-01-16 12:23:44 +00:00
Vsevolod Stakhov
f4afd62f24 [Minor] Try to fix slow timer race condition 2020-01-16 12:13:35 +00:00
korgoth1
7fde195538 [Test] SPF external IP map 2020-01-16 15:06:54 +03:00
Peter Wu
845b8c00dc [Minor] Dkim_signing: correct is_skip_sign logic
If any of "sign_networks", "auth_only", or "sign_local" are disabled,
then it should not automatically proceed with signing if the enabled
conditions all fail. For example, if only the auth_only setting is
enabled, and is_authed is false, then signing should be skipped.

An earlier check luckily prevents this correctness issue from being
exploitable ("ignoring unauthenticated mail"), but fix the logic anyway.
2020-01-16 01:30:56 +00:00
korgoth1
32be5d6037 [Test] SPF external IP map 2020-01-15 23:39:24 +03:00
korgoth1
a134799ddd [Test] SPF external IP map 2020-01-15 23:35:46 +03:00
Vsevolod Stakhov
092fa9c148 [Fix] Fix urls shifting when doing decode to include separators 2020-01-15 11:21:56 +00:00
Vsevolod Stakhov
5d6f92884a
Merge pull request #3213 from citrin/url-frag-test
[Test] Add a test case for URL parsing
2020-01-15 10:55:23 +00:00
Vsevolod Stakhov
905507145a [Minor] Just another try to avoid race 2020-01-15 10:21:48 +00:00
Anton Yuzhaninov
f40aecdce7 [Test] Add a test case for URL parsing
Currently it fails because fragment is not extracted correctly.
2020-01-14 16:31:38 +00:00
Vsevolod Stakhov
3833eb8c8f [Project] Lua_content: Implement url's extraction from PDF files 2020-01-14 16:16:39 +00:00
Vsevolod Stakhov
5f4002b2cf [Project] Lua_content: Implement ObjStm decoding 2020-01-14 15:02:01 +00:00
Vsevolod Stakhov
4018c7ae84
Merge pull request #3212 from moisseev/patch-1
[Minor] bayes_expiry: Fix type check (https://github.com/antirez/redis/issues/3231)
2020-01-14 10:26:15 +00:00
Alexander Moisseev
e48f717e0b
[Minor] bayes_expiry: Fix type check 2020-01-14 11:13:08 +03:00
Vsevolod Stakhov
d9e1e67ad7 [Project] Lua_content: Add preliminary support of compound objects 2020-01-13 21:50:25 +00:00
Vsevolod Stakhov
68dc1090ae [Minor] Lua_text: Set class properly 2020-01-13 21:37:59 +00:00