mirror of
https://gitlab.com/openconnect/ocserv.git
synced 2024-09-21 10:27:19 +00:00
Merge branch 'namespace' into 'master'
add basic namespace support for listen address See merge request openconnect/ocserv!189
This commit is contained in:
commit
d4824cc1fc
@ -281,7 +281,7 @@ noprocfs/Fedora:
|
||||
- chmod -R o-w tests/data/raddb
|
||||
- git submodule update --init
|
||||
- autoreconf -fvi
|
||||
- ac_cv_file_FILE__proc_self_exe=no ./configure --disable-maintainer-mode --without-docker-tests
|
||||
- ac_cv_file_FILE__proc_self_exe=no ./configure --disable-maintainer-mode --without-docker-tests --disable-namespaces
|
||||
- make -j$JOBS
|
||||
tags:
|
||||
- shared
|
||||
|
@ -426,6 +426,14 @@ AC_LIB_HAVE_LINKFLAGS(systemd,, [#include <systemd/sd-daemon.h>], [sd_listen_fds
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(namespaces,
|
||||
AS_HELP_STRING([--disable-namespaces], [disable namespaces support]),
|
||||
namespaces_enabled=$enableval, namespaces_enabled=yes)
|
||||
|
||||
if [ test "$namespaces_enabled" = "yes" ];then
|
||||
AC_DEFINE([LINUX_NAMESPACES], [], [Enable Linux namespaces])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(anyconnect-compat,
|
||||
AS_HELP_STRING([--disable-anyconnect-compat], [disable Anyconnect client compatibility (experimental)]),
|
||||
anyconnect_enabled=$enableval, anyconnect_enabled=yes)
|
||||
@ -694,6 +702,7 @@ Summary of build options:
|
||||
OIDC Auth backend: ${enable_oidc_auth}
|
||||
Anyconnect compat: ${anyconnect_enabled}
|
||||
TCP wrappers: ${libwrap_enabled}
|
||||
namespaces: ${namespaces_enabled}
|
||||
systemd: ${systemd_enabled}
|
||||
(socket activation)
|
||||
worker isolation: ${isolation}
|
||||
|
@ -86,6 +86,9 @@ auth = "plain[passwd=./sample.passwd]"
|
||||
# reconnects.
|
||||
#listen-host-is-dyndns = true
|
||||
|
||||
# move the listen socket within the specified network namespace
|
||||
# listen-netns = "foo"
|
||||
|
||||
# TCP and UDP port number
|
||||
tcp-port = 443
|
||||
udp-port = 443
|
||||
|
@ -28,7 +28,7 @@ ocserv_SOURCES = $(CORE_SOURCES) $(AUTH_SOURCES) $(ACCT_SOURCES) \
|
||||
proc-search.h route-add.c route-add.h sec-mod.c sec-mod.h sec-mod-acct.h \
|
||||
sec-mod-auth.c sec-mod-auth.h sec-mod-cookies.c sec-mod-db.c \
|
||||
sec-mod-resume.c sec-mod-resume.h sec-mod-sup-config.c sec-mod-sup-config.h \
|
||||
common/sockdiag.h common/sockdiag.c
|
||||
common/sockdiag.h common/sockdiag.c namespace.c
|
||||
|
||||
ocserv_LDADD = $(CORE_LDADD)
|
||||
|
||||
@ -62,7 +62,7 @@ CORE_SOURCES = $(CCAN_SOURCES) $(HTTP_PARSER_SOURCES) \
|
||||
script-list.h setproctitle.c setproctitle.h str.c str.h subconfig.c \
|
||||
sup-config/file.c sup-config/file.h sup-config/radius.c \
|
||||
sup-config/radius.h tlslib.c tlslib.h tun.c tun.h valid-hostname.c \
|
||||
vasprintf.c vasprintf.h vhost.h vpn.h
|
||||
vasprintf.c vasprintf.h vhost.h vpn.h namespace.h
|
||||
|
||||
if ENABLE_LATENCY_SUPPORT
|
||||
ocserv_worker_SOURCES += worker-latency.c worker-latency.h
|
||||
|
@ -743,6 +743,8 @@ static int cfg_ini_handler(void *_ctx, const char *section, const char *name, co
|
||||
} else if (strcmp(name, "listen-clear-file") == 0) {
|
||||
if (!PWARN_ON_VHOST_STRDUP(vhost->name, "listen-clear-file", unix_conn_file))
|
||||
PREAD_STRING(pool, vhost->perm_config.unix_conn_file);
|
||||
} else if (strcmp(name, "listen-netns") == 0) {
|
||||
vhost->perm_config.listen_netns_name = talloc_strdup(pool, value);
|
||||
} else if (strcmp(name, "tcp-port") == 0) {
|
||||
if (!PWARN_ON_VHOST(vhost->name, "tcp-port", port))
|
||||
READ_NUMERIC(vhost->perm_config.port);
|
||||
|
24
src/main.c
24
src/main.c
@ -67,6 +67,7 @@
|
||||
#include <snapshot.h>
|
||||
#include <isolate.h>
|
||||
#include <sockdiag.h>
|
||||
#include <namespace.h>
|
||||
|
||||
#ifdef HAVE_GSSAPI
|
||||
# include <libtasn1.h>
|
||||
@ -168,8 +169,8 @@ static void set_common_socket_options(int fd)
|
||||
}
|
||||
|
||||
static
|
||||
int _listen_ports(void *pool, struct perm_cfg_st* config,
|
||||
struct addrinfo *res, struct listen_list_st *list)
|
||||
int _listen_ports(void *pool, struct perm_cfg_st* config, struct addrinfo *res,
|
||||
struct listen_list_st *list, struct netns_fds *netns)
|
||||
{
|
||||
struct addrinfo *ptr;
|
||||
int s, y;
|
||||
@ -192,8 +193,8 @@ int _listen_ports(void *pool, struct perm_cfg_st* config,
|
||||
type, human_addr(ptr->ai_addr, ptr->ai_addrlen,
|
||||
buf, sizeof(buf)));
|
||||
|
||||
s = socket(ptr->ai_family, ptr->ai_socktype,
|
||||
ptr->ai_protocol);
|
||||
s = socket_netns(netns, ptr->ai_family, ptr->ai_socktype,
|
||||
ptr->ai_protocol);
|
||||
if (s < 0) {
|
||||
perror("socket() failed");
|
||||
continue;
|
||||
@ -312,6 +313,7 @@ listen_ports(void *pool, struct perm_cfg_st* config,
|
||||
struct listen_list_st *list)
|
||||
{
|
||||
struct addrinfo hints, *res;
|
||||
struct netns_fds netns = {-1, -1};
|
||||
char portname[6];
|
||||
int ret;
|
||||
#ifdef HAVE_LIBSYSTEMD
|
||||
@ -321,6 +323,11 @@ listen_ports(void *pool, struct perm_cfg_st* config,
|
||||
list_head_init(&list->head);
|
||||
list->total = 0;
|
||||
|
||||
if (config->listen_netns_name && open_namespaces(&netns, config) < 0) {
|
||||
fprintf(stderr, "cannot init listen namespaces\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifdef HAVE_LIBSYSTEMD
|
||||
/* Support for systemd socket-activatable service */
|
||||
if ((fds=sd_listen_fds(0)) > 0) {
|
||||
@ -414,7 +421,7 @@ listen_ports(void *pool, struct perm_cfg_st* config,
|
||||
return -1;
|
||||
}
|
||||
|
||||
ret = _listen_ports(pool, config, res, list);
|
||||
ret = _listen_ports(pool, config, res, list, &netns);
|
||||
freeaddrinfo(res);
|
||||
|
||||
if (ret < 0) {
|
||||
@ -451,7 +458,7 @@ listen_ports(void *pool, struct perm_cfg_st* config,
|
||||
return -1;
|
||||
}
|
||||
|
||||
ret = _listen_ports(pool, config, res, list);
|
||||
ret = _listen_ports(pool, config, res, list, &netns);
|
||||
if (ret < 0) {
|
||||
return -1;
|
||||
}
|
||||
@ -459,6 +466,11 @@ listen_ports(void *pool, struct perm_cfg_st* config,
|
||||
freeaddrinfo(res);
|
||||
}
|
||||
|
||||
if (config->listen_netns_name && close_namespaces(&netns) < 0) {
|
||||
fprintf(stderr, "cannot close listen namespaces\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
121
src/namespace.c
Normal file
121
src/namespace.c
Normal file
@ -0,0 +1,121 @@
|
||||
/*
|
||||
* Copyright (C) 2020 William Dauchy
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#if defined(LINUX_NAMESPACES)
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/stat.h>
|
||||
#include <limits.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <sched.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <common-config.h>
|
||||
#include <namespace.h>
|
||||
|
||||
/* get default namespace file descriptor to be able to place fd in a given
|
||||
* namespace
|
||||
*/
|
||||
static int init_default_namespace(void)
|
||||
{
|
||||
char netns_path[PATH_MAX];
|
||||
pid_t pid;
|
||||
int error;
|
||||
int fd;
|
||||
|
||||
pid = getpid();
|
||||
if (snprintf(netns_path, sizeof(netns_path), "/proc/%d/ns/net", pid) < 0)
|
||||
return -1;
|
||||
|
||||
fd = open(netns_path, O_RDONLY | O_CLOEXEC);
|
||||
if (fd < 0) {
|
||||
error = errno;
|
||||
fprintf(stderr, "could not open default namespace %s: %s\n",
|
||||
netns_path, strerror(error));
|
||||
}
|
||||
return fd;
|
||||
}
|
||||
|
||||
/* opens namespace for outside communication */
|
||||
static int init_listen_namespace(const char *ns_name)
|
||||
{
|
||||
char netns_path[PATH_MAX];
|
||||
int error;
|
||||
int fd;
|
||||
|
||||
if (snprintf(netns_path, sizeof(netns_path), "/var/run/netns/%s", ns_name) < 0)
|
||||
return -1;
|
||||
|
||||
fd = open(netns_path, O_RDONLY | O_CLOEXEC);
|
||||
if (fd < 0) {
|
||||
error = errno;
|
||||
fprintf(stderr, "could not open listen namespace %s: %s\n",
|
||||
netns_path, strerror(error));
|
||||
}
|
||||
return fd;
|
||||
}
|
||||
|
||||
/* open default and listen namespaces */
|
||||
int open_namespaces(struct netns_fds *netns, struct perm_cfg_st *config)
|
||||
{
|
||||
netns->default_fd = init_default_namespace();
|
||||
if (netns->default_fd < 0)
|
||||
return -1;
|
||||
netns->listen_fd = init_listen_namespace(config->listen_netns_name);
|
||||
if (netns->listen_fd < 0)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* close default and listen namespaces */
|
||||
int close_namespaces(struct netns_fds *netns)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
ret = close(netns->default_fd);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = close(netns->listen_fd);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* opens a socket in the namespace described by <nsfd> */
|
||||
int socket_netns(const struct netns_fds *fds, int domain, int type, int protocol)
|
||||
{
|
||||
int sock;
|
||||
|
||||
if (fds->default_fd >= 0 && fds->listen_fd && setns(fds->listen_fd, CLONE_NEWNET) == -1)
|
||||
return -1;
|
||||
|
||||
sock = socket(domain, type, protocol);
|
||||
|
||||
if (fds->default_fd >= 0 && fds->listen_fd && setns(fds->default_fd, CLONE_NEWNET) == -1) {
|
||||
if (sock >= 0)
|
||||
close(sock);
|
||||
return -1;
|
||||
}
|
||||
return sock;
|
||||
}
|
||||
|
||||
#endif /* LINUX_NAMESPACES */
|
47
src/namespace.h
Normal file
47
src/namespace.h
Normal file
@ -0,0 +1,47 @@
|
||||
/*
|
||||
* Copyright (C) 2020 William Dauchy
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef NAMESPACE_H
|
||||
# define NAMESPACE_H
|
||||
|
||||
#include <config.h>
|
||||
|
||||
struct netns_fds {
|
||||
int default_fd;
|
||||
int listen_fd;
|
||||
};
|
||||
|
||||
#if defined(LINUX_NAMESPACES)
|
||||
|
||||
int socket_netns(const struct netns_fds*, int domain, int type, int protocol);
|
||||
int open_namespaces(struct netns_fds *netns, struct perm_cfg_st *config);
|
||||
int close_namespaces(struct netns_fds *netns);
|
||||
|
||||
#else /* __linux__ */
|
||||
|
||||
#define open_namespaces(netns, config) (-1)
|
||||
#define close_namespaces(netns) (-1)
|
||||
|
||||
static inline int socket_netns(__attribute__((unused)) const struct netns_fds* fds,
|
||||
int domain, int type, int protocol)
|
||||
{
|
||||
return socket(domain, type, protocol);
|
||||
}
|
||||
|
||||
#endif /* __linux__ */
|
||||
|
||||
#endif
|
@ -393,6 +393,7 @@ struct perm_cfg_st {
|
||||
char *listen_host;
|
||||
char *udp_listen_host;
|
||||
char* unix_conn_file;
|
||||
char *listen_netns_name;
|
||||
unsigned int port;
|
||||
unsigned int udp_port;
|
||||
|
||||
|
@ -40,7 +40,7 @@ EXTRA_DIST = certs/ca-key.pem certs/ca.pem ns.sh common.sh certs/server-cert.pem
|
||||
connect-ios-script data/apple-ios.config certs/kerberos-cert.pem \
|
||||
data/kdc.conf data/krb5.conf data/k5.KERBEROS.TEST data/kadm5.acl \
|
||||
data/ipv6-iface.config data/no-route-default.config data/no-route-group.config \
|
||||
data/group-config/group1
|
||||
data/group-config/group1 data/test-namespace-listen.config
|
||||
|
||||
SUBDIRS = docker-ocserv
|
||||
|
||||
@ -65,7 +65,7 @@ dist_check_SCRIPTS += haproxy-connect test-iroute test-multi-cookie test-pass-sc
|
||||
test-cookie-timeout test-cookie-timeout-2 test-explicit-ip \
|
||||
test-cookie-invalidation test-user-config test-append-routes test-ban \
|
||||
multiple-routes json test-udp-listen-host test-max-same-1 test-script-multi-user \
|
||||
apple-ios ipv6-iface
|
||||
apple-ios ipv6-iface test-namespace-listen
|
||||
|
||||
if RADIUS_ENABLED
|
||||
dist_check_SCRIPTS += radius-group radius-otp
|
||||
|
@ -73,7 +73,8 @@ update_config() {
|
||||
-e 's|@ROUTE1@|'${ROUTE1}'|g' "$file.$$.tmp" \
|
||||
-e 's|@ROUTE2@|'${ROUTE2}'|g' "$file.$$.tmp" \
|
||||
-e 's|@MATCH_CIPHERS@|'${MATCH_CIPHERS}'|g' "$file.$$.tmp" \
|
||||
-e 's|@OCCTL_SOCKET@|'${OCCTL_SOCKET}'|g' "$file.$$.tmp"
|
||||
-e 's|@OCCTL_SOCKET@|'${OCCTL_SOCKET}'|g' "$file.$$.tmp" \
|
||||
-e 's|@LISTEN_NS@|'${LISTEN_NS}'|g' "$file.$$.tmp"
|
||||
CONFIG="$file.$$.tmp"
|
||||
}
|
||||
|
||||
|
195
tests/data/test-namespace-listen.config
Normal file
195
tests/data/test-namespace-listen.config
Normal file
@ -0,0 +1,195 @@
|
||||
# User authentication method. Could be set multiple times and in that case
|
||||
# all should succeed.
|
||||
# Options: certificate, pam.
|
||||
#auth = "certificate"
|
||||
auth = "plain[@SRCDIR@/data/test1.passwd]"
|
||||
#auth = "pam"
|
||||
|
||||
isolate-workers = @ISOLATE_WORKERS@
|
||||
|
||||
# A banner to be displayed on clients
|
||||
#banner = "Welcome"
|
||||
|
||||
# Use listen-host to limit to specific IPs or to the IPs of a provided hostname.
|
||||
#listen-host = @ADDRESS@
|
||||
|
||||
listen-netns = @LISTEN_NS@
|
||||
|
||||
use-dbus = no
|
||||
|
||||
# Limit the number of clients. Unset or set to zero for unlimited.
|
||||
#max-clients = 1024
|
||||
max-clients = 16
|
||||
|
||||
# Limit the number of client connections to one every X milliseconds
|
||||
# (X is the provided value). Set to zero for no limit.
|
||||
#rate-limit-ms = 100
|
||||
|
||||
# Limit the number of identical clients (i.e., users connecting multiple times)
|
||||
# Unset or set to zero for unlimited.
|
||||
max-same-clients = 2
|
||||
|
||||
# TCP and UDP port number
|
||||
tcp-port = @PORT@
|
||||
udp-port = @PORT@
|
||||
|
||||
# Keepalive in seconds
|
||||
keepalive = 32400
|
||||
|
||||
# Dead peer detection in seconds
|
||||
dpd = 440
|
||||
|
||||
# MTU discovery (DPD must be enabled)
|
||||
try-mtu-discovery = false
|
||||
|
||||
# The key and the certificates of the server
|
||||
# The key may be a file, or any URL supported by GnuTLS (e.g.,
|
||||
# tpmkey:uuid=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx;storage=user
|
||||
# or pkcs11:object=my-vpn-key;object-type=private)
|
||||
#
|
||||
# There may be multiple certificate and key pairs and each key
|
||||
# should correspond to the preceding certificate.
|
||||
server-cert = @SRCDIR@/certs/server-cert.pem
|
||||
server-key = @SRCDIR@/certs/server-key.pem
|
||||
|
||||
# Diffie-Hellman parameters. Only needed if you require support
|
||||
# for the DHE ciphersuites (by default this server supports ECDHE).
|
||||
# Can be generated using:
|
||||
# certtool --generate-dh-params --outfile /path/to/dh.pem
|
||||
#dh-params = /path/to/dh.pem
|
||||
|
||||
# If you have a certificate from a CA that provides an OCSP
|
||||
# service you may provide a fresh OCSP status response within
|
||||
# the TLS handshake. That will prevent the client from connecting
|
||||
# independently on the OCSP server.
|
||||
# You can update this response periodically using:
|
||||
# ocsptool --ask --load-cert=your_cert --load-issuer=your_ca --outfile response
|
||||
# Make sure that you replace the following file in an atomic way.
|
||||
#ocsp-response = /path/to/ocsp.der
|
||||
|
||||
# In case PKCS #11 or TPM keys are used the PINs should be available
|
||||
# in files. The srk-pin-file is applicable to TPM keys only (It's the storage
|
||||
# root key).
|
||||
#pin-file = /path/to/pin.txt
|
||||
#srk-pin-file = /path/to/srkpin.txt
|
||||
|
||||
# The Certificate Authority that will be used
|
||||
# to verify clients if certificate authentication
|
||||
# is set.
|
||||
#ca-cert = /path/to/ca.pem
|
||||
|
||||
# The object identifier that will be used to read the user ID in the client certificate.
|
||||
# The object identifier should be part of the certificate's DN
|
||||
# Useful OIDs are:
|
||||
# CN = 2.5.4.3, UID = 0.9.2342.19200300.100.1.1
|
||||
#cert-user-oid = 0.9.2342.19200300.100.1.1
|
||||
|
||||
# The object identifier that will be used to read the user group in the client
|
||||
# certificate. The object identifier should be part of the certificate's DN
|
||||
# Useful OIDs are:
|
||||
# OU (organizational unit) = 2.5.4.11
|
||||
#cert-group-oid = 2.5.4.11
|
||||
|
||||
# A revocation list of ca-cert is set
|
||||
#crl = /path/to/crl.pem
|
||||
|
||||
# GnuTLS priority string
|
||||
tls-priorities = "PERFORMANCE:%SERVER_PRECEDENCE:%COMPAT"
|
||||
|
||||
# To enforce perfect forward secrecy (PFS) on the main channel.
|
||||
#tls-priorities = "NORMAL:%SERVER_PRECEDENCE:%COMPAT:-RSA"
|
||||
|
||||
# The time (in seconds) that a client is allowed to stay connected prior
|
||||
# to authentication
|
||||
auth-timeout = 40
|
||||
|
||||
# The time (in seconds) that a client is not allowed to reconnect after
|
||||
# a failed authentication attempt.
|
||||
min-reauth-time = 20
|
||||
|
||||
max-ban-score = 50
|
||||
|
||||
# The time (in seconds) that all score kept for a client is reset.
|
||||
ban-reset-time = 10
|
||||
|
||||
# In case you'd like to change the default points.
|
||||
ban-points-wrong-password = 10
|
||||
ban-points-connection = 1
|
||||
ban-points-kkdcp = 1
|
||||
|
||||
|
||||
# Cookie timeout (in seconds)
|
||||
# Once a client is authenticated he's provided a cookie with
|
||||
# which he can reconnect. That cookie will be invalided if not
|
||||
# used within this timeout value. On a user disconnection, that
|
||||
# cookie will also be active for this time amount prior to be
|
||||
# invalid. That should allow a reasonable amount of time for roaming
|
||||
# between different networks.
|
||||
cookie-timeout = 30
|
||||
|
||||
# Script to call when a client connects and obtains an IP
|
||||
# Parameters are passed on the environment.
|
||||
# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client),
|
||||
# DEVICE, IP_REAL (the real IP of the client), IP_LOCAL (the local IP
|
||||
# in the P-t-P connection), IP_REMOTE (the VPN IP of the client). REASON
|
||||
# may be "connect" or "disconnect".
|
||||
#connect-script = /usr/bin/myscript
|
||||
#disconnect-script = /usr/bin/myscript
|
||||
|
||||
# UTMP
|
||||
use-utmp = true
|
||||
|
||||
# PID file
|
||||
pid-file = /var/run/ocserv.pid
|
||||
|
||||
# The default server directory. Does not require any devices present.
|
||||
#chroot-dir = /path/to/chroot
|
||||
|
||||
# socket file used for IPC, will be appended with .PID
|
||||
# It must be accessible within the chroot environment (if any)
|
||||
socket-file = /var/run/ocserv-socket
|
||||
|
||||
# The user the worker processes will be run as. It should be
|
||||
# unique (no other services run as this user).
|
||||
run-as-user = @USERNAME@
|
||||
run-as-group = @GROUP@
|
||||
|
||||
# Network settings
|
||||
|
||||
device = vpns
|
||||
|
||||
# The default domain to be advertised
|
||||
default-domain = example.com
|
||||
|
||||
ipv4-network = @VPNNET@
|
||||
ipv4-dns = 192.168.1.1
|
||||
|
||||
# Prior to leasing any IP from the pool ping it to verify that
|
||||
# it is not in use by another (unrelated to this server) host.
|
||||
ping-leases = false
|
||||
|
||||
# Leave empty to assign the default MTU of the device
|
||||
# mtu =
|
||||
|
||||
route = 192.168.1.0/255.255.255.0
|
||||
#route = 192.168.5.0/255.255.255.0
|
||||
|
||||
#
|
||||
# The following options are for (experimental) AnyConnect client
|
||||
# compatibility. They are only available if the server is built
|
||||
# with --enable-anyconnect
|
||||
#
|
||||
|
||||
# Client profile xml. A sample file exists in doc/profile.xml.
|
||||
# This file must be accessible from inside the worker's chroot.
|
||||
# The profile is ignored by the openconnect client.
|
||||
#user-profile = profile.xml
|
||||
|
||||
# Unless set to false it is required for clients to present their
|
||||
# certificate even if they are authenticating via a previously granted
|
||||
# cookie. Legacy CISCO clients do not do that, and thus this option
|
||||
# should be set for them.
|
||||
#always-require-cert = false
|
||||
|
||||
occtl-socket-file = @OCCTL_SOCKET@
|
||||
use-occtl = true
|
20
tests/ns.sh
20
tests/ns.sh
@ -75,19 +75,19 @@ ${IP} link add ${ETHNAME1} type veth peer name ${ETHNAME2}
|
||||
${IP} link set ${ETHNAME1} netns ${NSNAME1}
|
||||
${IP} link set ${ETHNAME2} netns ${NSNAME2}
|
||||
|
||||
${IP} netns exec ${NSNAME1} ip link set ${ETHNAME1} up
|
||||
${IP} netns exec ${NSNAME2} ip link set ${ETHNAME2} up
|
||||
${IP} netns exec ${NSNAME2} ip link set lo up
|
||||
${IP} -n ${NSNAME1} link set ${ETHNAME1} up
|
||||
${IP} -n ${NSNAME2} link set ${ETHNAME2} up
|
||||
${IP} -n ${NSNAME2} link set lo up
|
||||
|
||||
${IP} netns exec ${NSNAME1} ip addr add ${CLI_ADDRESS} dev ${ETHNAME1}
|
||||
${IP} netns exec ${NSNAME2} ip addr add ${ADDRESS} dev ${ETHNAME2}
|
||||
${IP} -n ${NSNAME1} addr add ${CLI_ADDRESS} dev ${ETHNAME1}
|
||||
${IP} -n ${NSNAME2} addr add ${ADDRESS} dev ${ETHNAME2}
|
||||
|
||||
${IP} netns exec ${NSNAME1} ip route add default via ${CLI_ADDRESS} dev ${ETHNAME1}
|
||||
${IP} netns exec ${NSNAME2} ip route add default via ${ADDRESS} dev ${ETHNAME2}
|
||||
${IP} -n ${NSNAME1} route add default via ${CLI_ADDRESS} dev ${ETHNAME1}
|
||||
${IP} -n ${NSNAME2} route add default via ${ADDRESS} dev ${ETHNAME2}
|
||||
|
||||
${IP} netns exec ${NSNAME2} ip addr
|
||||
${IP} netns exec ${NSNAME2} ip route
|
||||
${IP} netns exec ${NSNAME1} ip route
|
||||
${IP} -n ${NSNAME2} addr
|
||||
${IP} -n ${NSNAME2} route
|
||||
${IP} -n ${NSNAME1} route
|
||||
|
||||
${IP} netns exec ${NSNAME1} ping -c 1 ${ADDRESS} >/dev/null
|
||||
${IP} netns exec ${NSNAME2} ping -c 1 ${ADDRESS} >/dev/null
|
||||
|
67
tests/test-namespace-listen
Executable file
67
tests/test-namespace-listen
Executable file
@ -0,0 +1,67 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright (C) 2020 William Dauchy
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
SERV="${SERV:-../src/ocserv}"
|
||||
PIDFILE=ocserv-pid.$$.tmp
|
||||
srcdir=${srcdir:-.}
|
||||
PORT=4498
|
||||
LISTEN_NS="ocserv-listen-ns-tmp-$$"
|
||||
OUTFILE=lsof.$$.tmp
|
||||
SS=$(which ss)
|
||||
|
||||
ADDRESS=10.213.2.1
|
||||
CLI_ADDRESS=10.213.1.1
|
||||
VPNNET=172.17.215.0/24
|
||||
VPNADDR=172.17.215.1
|
||||
|
||||
function finish {
|
||||
set +e
|
||||
echo " * Cleaning up..."
|
||||
test -n "${PID}" && kill ${PID} >/dev/null 2>&1
|
||||
test -n "${PIDFILE}" && rm -f ${PIDFILE} >/dev/null 2>&1
|
||||
test -n "${CONFIG}" && rm -f ${CONFIG} >/dev/null 2>&1
|
||||
test -n "${LISTEN_NS}" && ${IP} netns delete ${LISTEN_NS} >/dev/null 2>&1
|
||||
test -n "${OUTFILE}" && rm -f ${OUTFILE} >/dev/null 2>&1
|
||||
}
|
||||
trap finish EXIT
|
||||
|
||||
. `dirname $0`/common.sh
|
||||
. `dirname $0`/ns.sh
|
||||
|
||||
update_config test-namespace-listen.config
|
||||
if test "$VERBOSE" = 1;then
|
||||
DEBUG="-d 3"
|
||||
fi
|
||||
|
||||
echo "Seting up listen namespace"
|
||||
${IP} netns add ${LISTEN_NS}
|
||||
|
||||
${CMDNS2} ${SERV} -p ${PIDFILE} -f -c ${CONFIG} ${DEBUG} & PID=$!
|
||||
|
||||
sleep 5
|
||||
|
||||
${IP} netns exec ${LISTEN_NS} ${SS} -tulwn>${OUTFILE}
|
||||
grep "LISTEN" ${OUTFILE}
|
||||
if test $? != 0; then
|
||||
echo "ocserv is not listening in the correct namespace!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
kill $PID
|
||||
wait
|
||||
|
||||
exit 0
|
Loading…
Reference in New Issue
Block a user