Commit Graph

3670 Commits

Author SHA1 Message Date
Kirill Ovchinnikov
85fdf7d2e6 Camouflage functionality
This adds a "camouflage" functionality (looking and acting like an ordinary web server),
to prevent OCserv installations from being automatically scanned or blocked with active probing techniques.

Signed-off-by: Kirill Ovchinnikov <kirill.ovchinn@gmail.com>
2023-06-09 15:08:25 +02:00
Nikos Mavrogiannopoulos
1ecdf35494 NEWS: added entry for 1.1.8 [ci skip]
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-06-06 14:41:15 +02:00
Nikos Mavrogiannopoulos
a8d5d3616e corrected typo
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-06-06 14:34:37 +02:00
Nikos Mavrogiannopoulos
cf2eba93e8 Merge branch 'checkpatch.pl' into 'master'
Pedantic suggestions by checkpatch.pl from Linux kernel

See merge request openconnect/ocserv!339
2023-06-06 11:20:04 +00:00
Dimitri Papadopoulos
8404920637 Macros with multiple statements should be enclosed in a do - while loop
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-04 17:55:59 +02:00
Dimitri Papadopoulos
44840a4f72 Unnecessary typecast of c90 int constant
- `(long)0` could be `0L`
- but then `0` is sufficient in a comparison

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-04 17:55:59 +02:00
Dimitri Papadopoulos
895b009c7d Statements should start on a tabstop
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-04 17:55:59 +02:00
Dimitri Papadopoulos
cea0fc2e3f return is not a function, parentheses are not required
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-04 17:55:59 +02:00
Dimitri Papadopoulos
b5380f2181 Macros starting with if should be enclosed by a do - while loop to avoid possible if/else logic defects
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-04 17:55:59 +02:00
Dimitri Papadopoulos
fa7f33d6f1 switch and case should be at the same indent
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-04 17:55:58 +02:00
Dimitri Papadopoulos
30fc4eb46d Prefer ARRAY_SIZE
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-04 17:55:50 +02:00
Dimitri Papadopoulos
d6d5680249 Bad function definition - int main() should be int main(void)
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-04 14:33:59 +02:00
Dimitri Papadopoulos
c221d901dc Avoid unnecessary line continuations
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-04 14:33:58 +02:00
Dimitri Papadopoulos
5e881697e7 void function return statements are not generally useful
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-04 14:33:58 +02:00
Dimitri Papadopoulos Orfanos
52e16650ec Merge branch 'http_parser' into 'master'
Update bundled http-parser one last time

See merge request openconnect/ocserv!325
2023-06-04 12:31:21 +00:00
Nikos Mavrogiannopoulos
e6ac970dbb Merge branch 'pcl' into 'master'
Revert previous fix to PCL

See merge request openconnect/ocserv!326
2023-06-04 09:06:19 +00:00
Nikos Mavrogiannopoulos
2a3066d97c Merge branch 'UNDER_TEST' into 'master'
Fix compiler warnings

See merge request openconnect/ocserv!336
2023-06-04 09:05:29 +00:00
Nikos Mavrogiannopoulos
3cd972df3d Merge branch 'liboauth-dev' into 'master'
Add missing optional dependency: liboath

Closes #508

See merge request openconnect/ocserv!335
2023-06-04 09:05:09 +00:00
Nikos Mavrogiannopoulos
719ccfcf27 Merge branch 'syslog' into 'master'
Improve ocserv man page

Closes #512

See merge request openconnect/ocserv!334
2023-06-04 09:04:52 +00:00
Dimitri Papadopoulos
a1294eadac Typos found by codespell
Re-apply 81df79a9.

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-03 10:02:07 +02:00
Dimitri Papadopoulos
1d30eda56e Update bundled http-parser one last time
The http-parser project is not actively maintained any more on GitHub,
it was archived on 6 November 2022:
        https://github.com/nodejs/http-parser

This partially reverts cosmetic change 2b899aaei, only for this vendored code.

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-03 10:02:07 +02:00
Dimitri Papadopoulos
28562d89c2 Revert previous fix to PCL
Partially revert !308 / 7b2cb883.

This brings us back to the latest version 1.12 of PCL, the Portable
Coroutine Library,  with important local fixes re-applied:
	http://www.xmailserver.org/libpcl.html

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-03 10:01:50 +02:00
Dimitri Papadopoulos
c35dda6e2a Improve ocserv man page
Searching "syslog daemon facility" will fetch more precise suggestions
on how to manage oscerv logs than a mere "daemon facility" which doesn't
mean anything by itself.

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-03 10:01:31 +02:00
Dimitri Papadopoulos
a12ec4a56b Add missing optional dependency: liboath
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-03 10:01:18 +02:00
Dimitri Papadopoulos
ce3d543569 Fix compiler warnings
In file included from cstp-recv.c:37:0:
../src/tlslib.c:440:13: warning: 'tls_log_func' defined but not used [-Wunused-function]
 static void tls_log_func(int level, const char *str)
             ^
../src/tlslib.c:460:12: warning: 'verify_certificate_cb' defined but not used [-Wunused-function]
 static int verify_certificate_cb(gnutls_session_t session)
            ^
../src/tlslib.c:580:13: warning: 'certificate_check' defined but not used [-Wunused-function]
 static void certificate_check(main_server_st *s, const char *vhostname, gnutls_pcert_st *pcert)
             ^
../src/tlslib.c:646:13: warning: 'set_dh_params' defined but not used [-Wunused-function]
 static void set_dh_params(main_server_st* s, struct vhost_cfg_st *vhost)
             ^

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-03 10:00:36 +02:00
Dimitri Papadopoulos Orfanos
fb0906c21f Merge branch 'tmp-new-certs' into 'master'
Update certificates to avoid expiration dates

Closes #513

See merge request openconnect/ocserv!341
2023-06-03 07:58:51 +00:00
Nikos Mavrogiannopoulos
a7c3c4f1bc Regenerated expired certificates and updated scripts for new ones
Also added rules and templates to regenerate certificates when
needed.

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-06-02 06:15:45 +02:00
Nikos Mavrogiannopoulos
f828f8d5bb use modern libtasn1 definitions
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-06-01 19:47:41 +02:00
Nikos Mavrogiannopoulos
d98a06e143 Fixed operation of make distcheck
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-05-08 09:43:16 +02:00
Nikos Mavrogiannopoulos
3610b9f4f8 .gitlab-ci.yml: moved distcheck to noprocfs
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-05-07 14:40:50 +02:00
Nikos Mavrogiannopoulos
fb31fb4740 .gitlab-ci.yml: test distcheck not just dist
This will detect issues that show up on release time.

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-05-07 14:25:48 +02:00
Nikos Mavrogiannopoulos
2bdbf7927c Revert "Update CCAN code snippets"
This reverts commit d78f57994a.

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
1.1.7
2023-05-07 14:23:33 +02:00
Nikos Mavrogiannopoulos
1bc33ad612 released 1.1.7
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-05-07 14:07:55 +02:00
Nikos Mavrogiannopoulos
fa099bb2b4 Merge branch 'codespell' into 'master'
Fix new typo found by codespell

See merge request openconnect/ocserv!333
2023-04-12 17:08:37 +00:00
Nikos Mavrogiannopoulos
b3d6f714f2 Merge branch 'message_name' into 'master'
Full name for message types in sequence diagrams

Closes #500

See merge request openconnect/ocserv!330
2023-04-12 17:01:14 +00:00
Dimitri Papadopoulos
b43d4ce174 Fix new typo found by codespell
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-04-11 22:53:34 +02:00
Dimitri Papadopoulos Orfanos
5e89efa5c7 Merge branch 'master' into 'master'
Add AnyLink Agent

See merge request openconnect/ocserv!331
2023-04-11 20:25:13 +00:00
Xinjun Ma
cc97e3a6de Add AnyLink Agent
Signed-off-by: Xinjun Ma <xinjun.ma@qq.com>
2023-04-09 14:20:21 +08:00
Dimitri Papadopoulos
4cd41e0ccf Full name for message types in sequence diagrams
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-03-03 13:30:08 +01:00
Dimitri Papadopoulos Orfanos
1f635a6560 Merge branch 'this_file_is_part_of' into 'master'
Consistent header files

See merge request openconnect/ocserv!329
2023-02-28 08:50:31 +00:00
Dimitri Papadopoulos Orfanos
e627dc55fb Merge branch 'hex' into 'master'
CCAN hex: src/occtl/ → src/ccan/str/hex/

See merge request openconnect/ocserv!327
2023-02-28 08:03:08 +00:00
Dimitri Papadopoulos
f6aa55071b Consistent include guards in header files
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-02-23 22:04:10 +01:00
Dimitri Papadopoulos
92bf45edcb Add missing include guard
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-02-23 21:55:13 +01:00
Dimitri Papadopoulos
25b85eadb3 This file is part of GnuTLS → ocserv.
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-02-23 21:51:37 +01:00
Dimitri Papadopoulos
87e69fbfb7 CCAN hex: src/occtl/ → src/ccan/str/
Make clear hex.c and hex.h are vendored files from CCAN:
	https://github.com/rustyrussell/ccan

At the same time, update to commit ba79e21 committed on 9 January 2023,
for consistency with the rest of CCAN vendored files.

Additionally, by including <ccan/str/hex/hex.h> instead of "hex.h",
this fixes my Ubuntu 22.04 build, where including "hex.h" would include
the system Kerberos file /usr/include/heimdal/hex.h instead of
our local CCAN file hex.h.

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-01-29 19:32:46 +01:00
Dimitri Papadopoulos Orfanos
f77b86415e Merge branch 'ccan' into 'master'
Update CCAN code snippets

See merge request openconnect/ocserv!316
2023-01-28 17:50:22 +00:00
Dimitri Papadopoulos Orfanos
7ee60df243 Merge branch 'OpenIDConnect' into 'master'
doc: missing whitespace

See merge request openconnect/ocserv!323
2023-01-28 17:04:18 +00:00
Dimitri Papadopoulos
70ec3f2d01 doc: missing whitespace
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-01-28 10:05:19 +01:00
Dimitri Papadopoulos
49c5251dcd Local change to CCAN: #include <config.h>
Re-apply changes from 08efccdf

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-01-22 12:20:49 +01:00
Dimitri Papadopoulos
ecd0971a85 Local change to CCAN: detect endianness
Re-apply changes from 10d9b144.

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-01-22 12:20:49 +01:00