0
0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-20 04:02:15 +02:00
Commit Graph

3018 Commits

Author SHA1 Message Date
Arne Schwabe
8bfdc2809b Implement various fixes to avoid copying argument related to appcontrol 2024-01-04 17:51:23 +01:00
Frank Lichtenheld
44aa9acab2
ClientProto::Session: fix coverity issue "declaration hides parameter"
CID 11873: (#12 of 12): Parse warning (PW.PARAMETER_HIDDEN)
parameter_hidden: declaration hides parameter "e"

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-12-20 23:18:33 +01:00
Frank Lichtenheld
185426c5e8
ServerProto::Session: fix coverity issue "declaration hides parameter"
CID 11809: (#2 of 3): Parse warning (PW.PARAMETER_HIDDEN)
parameter_hidden: declaration hides parameter "e"

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-12-20 23:18:33 +01:00
Frank Lichtenheld
b4082c93cb
WS::Client::HTTPCore: fix coverity issue "declaration hides parameter"
CID 11948: (#2 of 2): Parse warning (PW.PARAMETER_HIDDEN)
parameter_hidden: declaration hides parameter "error"

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-12-20 23:18:33 +01:00
Frank Lichtenheld
9524e33727
ClientOptions: fix coverity error "Structurally dead code"
CID 11851: (#1 of 1): Structurally dead code (UNREACHABLE)
unreachable: This code cannot be reached

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-12-20 23:18:32 +01:00
Mark Deric
5b3294202c Prefer special purpose accessor to public
Instead of exposing protected data to the global environment, provide
a special purpose accessor to satisfy AppControl needs.

Signed-off-by: Mark Deric <jmark@openvpn.net>
2023-12-20 08:29:55 -08:00
Arne Schwabe
c151efc908 Allow specifying different client and server reasons for disconnect
Currently PG only allows to either send or withhold the reason to the
client but there are certain circumstances where you want to have more
detailed internal reason but still want to send some reason to the
client.

Signed-off-by: Arne Schwabe <arne@openvpn.net>
2023-12-13 16:51:22 +01:00
Arne Schwabe
95b821a2fd Allow to string methods of IP::Addr to display mapped IPv4 as plain IPv4
Some systems like to see the mapped IPv4 addresses as real IP addresses.
This commit adds the ability to show IP addresses as such.

Signed-off-by: Arne Schwabe <arne@openvpn.net>
2023-12-13 16:51:22 +01:00
Arne Schwabe
f97c00fc72 Make IV_PROTO defines public
This allows other code to use the values without having to repeat
the values.

Signed-off-by: Arne Schwabe <arne@openvpn.net>
2023-12-13 16:51:22 +01:00
Arne Schwabe
9afc0b2310 Allow ovpn::string::join to work also with other contains than std::vector
Signed-off-by: Arne Schwabe <arne@openvpn.net>
2023-12-13 16:51:22 +01:00
Arne Schwabe
f1ac7e500f Allow a client to announce custom control channel support
Signed-off-by: Arne Schwabe <arne@openvpn.net>
2023-12-13 16:51:22 +01:00
Arne Schwabe
e9ade86de7 Implement logic to send and receive custom control channel messages
This adds the capability to implement a custom app level protocol
that support message passing over the OpenVPN control channel.
The protocol is agnostic to the data that is transported over it
and the message splitting/reassmbly is handled transparently by the
OpenVPN library itself.

Signed-off-by: Arne Schwabe <arne@openvpn.net>
2023-12-13 16:51:22 +01:00
Arne Schwabe
e4f22c5567 Remove feature to allow a client to send INFO message
This is an obscure and never used feature to trigger sending
the SSO web auth URL from the client instead of server.

Signed-off-by: Arne Schwabe <arne@openvpn.net>
2023-12-13 16:51:22 +01:00
Arne Schwabe
335daeb454 Ensure Link raw pointer constructor is only used with intrusive pointers
Using the raw pointer constructor only really works if the pointer is
intrusive. Ensure this with a static assert

Signed-off-by: Arne Schwabe <arne@openvpn.net>
2023-12-13 16:51:22 +01:00
Heiko Hund
c5d37c4184
add Doxygen comments to randapi.hpp
Document classes RandomAPI, StrongRandomAPI and WeakRandomAPI

Signed-off-by: Heiko Hund <heiko@openvpn.net>
2023-11-29 22:17:49 +01:00
Charlie Vigue
deaced48bd
Fixed call of virtual from DTOR issue
Removed virtual and changed the only overrider of the virtual to
do the special case

Signed-off-by: Charlie Vigue <charlie.vigue@openvpn.com>
2023-11-29 22:15:46 +01:00
James Yonan
a93d711927 Coverity 11892: in class Stop, address lock-free access to stop_called member
In class Stop, the stop_called member is safe to read
without locking, but make it volatile to document this.

Signed-off-by: James Yonan <james@openvpn.net>
2023-11-24 16:59:07 -07:00
Mark Deric
ecdf041d63
Fix psid cookie older client failure bug [PG-93]
Older clients, 2.5.x and below, send an ACK_V1 packet in response to
the server's HARD_RESET packet whereas 2.6.x clients send a CONTROL_V1
packet.  The code that checked the packet length of the client's
response failed to comprehend the fact the ACK_V1 packet does not
include a packet id field following the peer session id field.  So the
code rejected the ACK_V1 packet as being too short.

The fix was to require packet length only up to and including the peer
session id field.  This works to allow safe parsing for both the
ACK_V1 response and the CONTROL_V1 response.

Signed-off-by: Mark Deric <jmark@openvpn.net>
2023-11-24 21:09:26 +01:00
James Yonan
b928585086
Time: added hash() template method
hash() will return a hash of the raw time.  It's useful
for unordered map/set collections where the key is a tuple
that includes a Time object.

Because hash() is a template method, it doesn't introduce
any new dependencies for class Time.

Signed-off-by: James Yonan <james@openvpn.net>
2023-11-24 21:06:18 +01:00
James Yonan
13bae10df5
VPNServerNetblock::Netblock: added override_server_gw() method
By default, the Netblock constructor already sets the server
gateway to the .1 address of the subnet, but the new method
override_server_gw() can now be used to override that
setting.

Signed-off-by: James Yonan <james@openvpn.net>
2023-11-24 21:06:17 +01:00
Heiko Hund
dfe26892b9 remove now unused RandomAPI::is_crypto function
Signed-off-by: Heiko Hund <heiko@openvpn.net>
2023-11-22 16:29:46 +01:00
Heiko Hund
47795ea2d5 remove 'prng' argument from SSLLib::RandomAPI ctor
It was only supported by mbedTLS and is very easily used wrong since it
is just a boolean value. Other TLS stacks were using the regular strength
PRNG no matter what. Also we should not weaken a crypto strength PRNG,
now that we have the StrongRandomAPI type in place. It might give the
wrong sense of strength, when in reality we might reseed a hundred times
less often.

In places where prng was passed as true before, use MTRand now instead.

Signed-off-by: Heiko Hund <heiko@openvpn.net>
2023-11-22 04:49:31 +01:00
Heiko Hund
87d0933b7c require TLS session ticket names use a strong PRNG
RFC 5077 talks about the ticket key_names to be randomly generated to
avoid collision between servers. To enforce unpredictable randomness,
require a strong PRNG to construct such names.

This is a formality, since all users of the class already provide such a
strong randmon number source.

Signed-off-by: Heiko Hund <heiko@openvpn.net>
2023-11-22 04:49:31 +01:00
Heiko Hund
bf6d373c93 require a strong PRNG for temp filename generation
Since predictable names for temporary files can potentially cause a
security issue, require such filenames to be generated with
unpredictable randomness.

Signed-off-by: Heiko Hund <heiko@openvpn.net>
2023-11-22 04:49:31 +01:00
Heiko Hund
e484aceec9 require a strong PRNG for session id generation
Since session ids should always be truly random require a
cryptographically strong random number generator.

Since all places in the codes (besides tests) already pass a strong
random source, this is just a formality.

Signed-off-by: Heiko Hund <heiko@openvpn.net>
2023-11-22 04:49:31 +01:00
Heiko Hund
be3f20dc58 introduce base types for strong and weak RNGs
The need of having to call the assert_crypto() member function to ensure
that a cryptographically strong RNG is used where needed, was reported
as potentially insecure, since calling it manually can easily be missed.

In the commit the two new classes StrongRandomAPI and WeakRandomAPI are
introduced. They are to be used instead of just RandomAPI, unless it
doesn't matter what strength the RNG is.

All the places the assert_crypto() was called were converted to using
StrongRandomAPI instead. Also the RNGs for which assert_crypto() was not
throwing are now inheriting from StrongRandomAPI.

Variable names, which have the StrongRandomAPI type, but were called
prng, are changed to rng instead to follow the source code convention.

Signed-off-by: Heiko Hund <heiko@openvpn.net>
2023-11-22 04:49:31 +01:00
Frank Lichtenheld
dffd6036e0 RC: suppress compiler warnings with GCC 12 and 13
We're pretty sure that these warnings are false positives.
Both are related to destructing MultiCompleteType objects.

GCC 12 (thread_unsafe_refcount):
rc.hpp:322:18: pointer used after ‘void operator delete(void*, std::size_t)’
[-Wuse-after-free]

GCC 13 (thread_safe_refcount, only arm64):
inlined from ‘...thread_safe_refcount::operator--()’ at .../rc.hpp:404:39
atomic_base.h:645:34: ‘long unsigned int __atomic_sub_fetch_8(...)’ writing
8 bytes into a region of size 0 overflows the destination
[-Werror=stringop-overflow=]

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-15 16:58:06 +01:00
Charlie Vigue
cc58225888
Replace call of virtual in CTOR w/ non-virtual
Refactors the call of a virtual member function in the CTOR
by adding a private _impl function, which is non-virtual and
which both the CTOR and the original virtual function
delegate to.

Signed-off-by: Charlie Vigue <charlie.vigue@openvpn.com>
2023-11-10 16:05:46 +01:00
Charlie Vigue
3927b61b33
Changed virtual override to final
It's possible that someone might try to derive from and override
here, and if so the result will be perhaps not as expected. This
change will make it slightly harder to produce an unexpected
call to the wrong vtable dispatch from the ctor.

Signed-off-by: Charlie Vigue <charlie.vigue@openvpn.com>
2023-11-10 16:05:27 +01:00
Frank Lichtenheld
22ba196429
SITNL: revert change of sitnl_send return type, return int
This was changed in commit
ae663c573a ("Using new numeric
conversion tools") to avoid some conversion warnings. But
after understanding the workings of the function better, the
change turns out to have been wrong. Instead the function was
changed to use different intermediate variables for different
purposes.

This change ripples through the whole Netlink/SITNL interface.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-10 15:45:41 +01:00
Frank Lichtenheld
3b945e62e6
SITNL: document interface and code of sitnl_send function
Past changes make it clear that the interface was not well
understood.

While here, clean up the code to make it easier to understand.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-10 15:45:40 +01:00
Frank Lichtenheld
1e135e4f05
GeNL: add explicit casts in nl interface
To allow compiling the code with -Wconversion.

Also remove one line of unused code.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-10 15:45:29 +01:00
David Sommerseth
01a37cea97
Merge OpenVPN 3 Core Library release v3.8.3 to master
Signed-off-by: David Sommerseth <davids@openvpn.net>
2023-11-08 22:04:21 +01:00
Frank Lichtenheld
2413ad0b53
OpenSSLPKI::x509_get_serial: Handle NULL result from BN_bn2dec
The BN_bn2dec() can return NULL if the input is not parseable.
This would cause the conversion of char* to std::string to throw
an exception. Instead check the result and return an empty string
on errors.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-08 21:27:50 +01:00
Charlie Vigue
e2f3f7509a
numeric_util: Add missing cstdint include
Signed-off-by: Charlie Vigue <charlie.vigue@openvpn.com>
2023-11-08 21:23:31 +01:00
Frank Lichtenheld
f00c816a0f
cryptodc: remove stray ';'
This causes only warnings with -Wpedantic, which we don't
intend to use. But doesn't hurt to fix anyway.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-08 21:10:22 +01:00
Frank Lichtenheld
cb06f9e330
SplitLines/UserPass: Review fixes
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-08 21:05:06 +01:00
Frank Lichtenheld
1cf9556fe0
SplitLines: Add doxygen documentation
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-08 21:05:06 +01:00
Frank Lichtenheld
4620b1f8cd
SplitLines: throw on error
Except in the next() interface which allows for more
fine-grained error control.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-08 21:05:04 +01:00
Frank Lichtenheld
34c06c2f7a
UserPass: add doxygen documentation
Based on the understanding from the unittest.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-08 21:05:03 +01:00
Frank Lichtenheld
3eaac582d0
HTTPProxyTransport: Simplify parsing of http-proxy-user-pass
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-08 21:05:02 +01:00
Frank Lichtenheld
079fb4dd4d
UserPass: Add unittest
Fixed one issue while at it, with parse() not clearing
the username and password arguments.

The general issue that overflow doesn't throw is reflected in
a disabled test. This will need to be fixed in SplitLines,
probably.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-08 21:05:01 +01:00
Frank Lichtenheld
185182e1be
UserPass: rename one overload of parse to parse_file
This really has very different implications than the
others overloads. So make it distinct.

I would also rename the others to parse_opt, but feel
that causes too much churn in the code. parse_file has
only one use in our own code base.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-11-08 21:04:41 +01:00
David Sommerseth
7b145649c7
Release: OpenVPN 3 Core Library, version 3.8.3
Signed-off-by: David Sommerseth <davids@openvpn.net>
2023-11-08 12:59:24 +01:00
Lev Stipakov
97b3c0a594 Add route tables manipulation functionality
This adds two routines:

  AWS::Route::create_route_table

This creates route table in given VPC and
assigns "Name" tag to it with provided value.

  AWS::Route::get_route_table_by_name

This searches for route table with given "Name"
tag and either returns route table id or empty string
if route table doesn't exist.

These routines are used by Linux client AWS addon.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
2023-10-26 12:12:58 +00:00
Mark Deric
ef74a5b059 Improve psid cookie unit tests [OVPN3-1069]
-- Instantiate the PsidCookieImpl and spot check it's correctness
-- Check for client replies within and outside of the allowable time
   window

Signed-off-by: Mark Deric <jmark@openvpn.net>
2023-10-25 09:10:40 -07:00
Frank Lichtenheld
8713c7463e SITNL: Fix conversion warning related to route table id
For some reason the enum is much bigger than the field
in the API.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
2023-10-24 15:29:31 +02:00
Mark Deric
3296f369f4 Fix Wconversion issues; improve comments
Conversion fixes:
-- use the protocol op field as a byte, not an int

-- fix the valid time hmac component calculation to avoid implicit
   64-to-32 narrowing.

Signed-off-by: Mark Deric <jmark@openvpn.net>
2023-10-22 11:51:10 -07:00
Mark Deric
50293847c4 Fix session_id_time calculation bug
The intent of the offset argument to the calculate_session_id_hmac()
function was to allow the server to accept hmac values calculated for
the previous time interval even as the server's clock moved into a new
time interval.

The bug was that the implementation checked for a match with the
server's current time interval and its _future_ time interval, and not
it's immediate past time interval.

This bug was pointed out during code review by Frank Lichtenheld.  The
code review subject was numeric conversions, in this case signed vs
unsigned. This author changed the offset to unsigned, arguing that the
code would never need to check the client hmac cookie based on both
sides of the server's current time.  The check only needed to be in
one direction, hence unsigned was the solution to the conversion
warning.  That was when Frank pointed out that implementation with the
"+ offset" snippet checked to see if the client provided a psid from
the future time interval and what was needed was to check for the past
interval, i.e., "- offset".

Hence, the change implements the unsigned offset, change add to
subtract from the time range computed for the server's currrent time
window.

Signed-off-by: Mark Deric <jmark@openvpn.net>
2023-10-21 17:02:38 -07:00
Arne Schwabe
34a1faf162 Fix logic of INFO_PRE and INFO substring replacment swapped
The refactoring introduced a logic error were the two options are
swapped.
2023-10-12 18:18:48 +02:00