Commit Graph

3684 Commits

Author SHA1 Message Date
Nikos Mavrogiannopoulos
0fac0efc14 .gitlab-ci.yml: added almalinux9
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-06-13 16:51:38 +02:00
Nikos Mavrogiannopoulos
f41a07c7c1 occtl: removed dead code
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-06-13 16:51:38 +02:00
Nikos Mavrogiannopoulos
39e6eb7d2c .gitlab-ci.yml: added almalinux8 build
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-06-13 16:51:38 +02:00
Nikos Mavrogiannopoulos
cb48bc8f7f .gitlab-ci.yml: use fedora38 image
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-06-13 16:51:38 +02:00
Dimitri Papadopoulos Orfanos
359a137d1b Merge branch 'asprintf' into 'master'
Check the return value of asprintf()

Closes #515

See merge request openconnect/ocserv!347
2023-06-13 12:11:14 +00:00
Nikos Mavrogiannopoulos
92da630c37 Merge branch 'ocserv/ocserv' into 'master'
https://gitlab.com/ocserv/ocserv → openconnect/ocserv

See merge request openconnect/ocserv!346
2023-06-13 11:36:45 +00:00
Nikos Mavrogiannopoulos
210da435f4 sec-mod: simplified load_keys()
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-06-13 11:49:30 +02:00
Dimitri Papadopoulos
e57b36e112 Check the return value of asprintf()
The value of the pointer to the string printed to might be undefined.
In case of error, set to NULL, as we do with strdup() calls.

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-12 20:41:42 +02:00
Dimitri Papadopoulos
d2fef9f08f https://gitlab.com/ocserv/ocserv → openconnect/ocserv
Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-12 17:25:59 +02:00
Nikos Mavrogiannopoulos
59ba4a63be Merge branch 'dtls_pull' into 'master'
Fix function defined but not used (in some cases)

See merge request openconnect/ocserv!344
2023-06-12 12:24:10 +00:00
Dimitri Papadopoulos
abebe4553c Fix function defined but not used (in some cases)
worker-vpn.c:170:9: warning: 'dtls_pull' defined but not used [-Wunused-function]
  170 | ssize_t dtls_pull(gnutls_transport_ptr_t ptr, void *data, size_t size)
      |         ^~~~~~~~~

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
2023-06-12 13:53:34 +02:00
Nikos Mavrogiannopoulos
5c253125c8 doc update
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2023-06-11 13:07:38 +02:00
Dimitri Papadopoulos Orfanos
0bd957350a Merge branch 'ignore-querystring-of-post' into 'master'
ignore querystring of post while dispatching

See merge request openconnect/ocserv!337
2023-06-10 12:01:16 +00:00
johnson
eadebbbd71 ignore querystring while dispatching
Signed-off-by: johnson <10619522-OnFIs@users.noreply.gitlab.com>
2023-06-10 16:21:34 +08:00
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