GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-10-14 02:22:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

optional-certificate was renamed to certificate[optional]

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-09-25 10:36:46 +02:00
parent accdb24050
commit bdcd27d13e
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+1 -1
View File
@@ -7,7 +7,7 @@
- Added the unix-conn-file configuration option. That allows obtaining - Added the unix-conn-file configuration option. That allows obtaining
plaintext HTTP sessions through a unix domain socket. That is useful plaintext HTTP sessions through a unix domain socket. That is useful
when combined with a forwarder HTTPS server like nginx, nxweb or haproxy. when combined with a forwarder HTTPS server like nginx, nxweb or haproxy.
- Added the optional-certificate auth configuration option. That option - Added the certificate[optional] auth configuration option. That option
allows to require certificate authentication in a subset of users. allows to require certificate authentication in a subset of users.
- Reverted license to GPLv2. - Reverted license to GPLv2.
src/config.c
+1 -1
View File
@@ -389,7 +389,7 @@ unsigned force_cert_auth;
config->auth_types |= AUTH_TYPE_PLAIN; config->auth_types |= AUTH_TYPE_PLAIN;
} else if (c_strcasecmp(auth[j], "certificate") == 0) { } else if (c_strcasecmp(auth[j], "certificate") == 0) {
config->auth_types |= AUTH_TYPE_CERTIFICATE; config->auth_types |= AUTH_TYPE_CERTIFICATE;
} else if (c_strcasecmp(auth[j], "optional-certificate") == 0) { } else if (c_strcasecmp(auth[j], "certificate[optional]") == 0) {
config->auth_types |= AUTH_TYPE_CERTIFICATE_OPT; config->auth_types |= AUTH_TYPE_CERTIFICATE_OPT;
} else { } else {
fprintf(stderr, "Unknown auth method: %s\n", auth[j]); fprintf(stderr, "Unknown auth method: %s\n", auth[j]);
src/ocserv-args.def
+6 -2
View File
@@ -78,9 +78,13 @@ An example configuration file follows.
# multiple auth directives. Available options: certificate, optional-certificate, # multiple auth directives. Available options: certificate, optional-certificate,
# plain, pam. # plain, pam.
#auth = "certificate" #auth = "certificate"
#auth = "optional-certificate"
#auth = "pam" #auth = "pam"
# This indicates that a user may present a certificate. When that option
# is set, individual users or user groups can be forced to present a valid
# certificate by using "require-cert=true".
#auth = "certificate[optional]"
# The gid-min option is used by auto-select-group option, in order to # The gid-min option is used by auto-select-group option, in order to
# select the minimum valid group ID. # select the minimum valid group ID.
#auth = "pam[gid-min=1000]" #auth = "pam[gid-min=1000]"
@@ -416,7 +420,7 @@ route = 192.168.5.0/255.255.255.0
#default-group-config = /etc/ocserv/defaults/group.conf #default-group-config = /etc/ocserv/defaults/group.conf
# This option is only valid in a user/group configuration file. If the # This option is only valid in a user/group configuration file. If the
# auth mode is optional-certificate, it requires a certificate for this # auth mode is certificate[optional], it requires a certificate for this
# particular user or group. # particular user or group.
#require-cert = true #require-cert = true
tests/Makefile.am
+2 -2
View File
@@ -9,11 +9,11 @@ SUBDIRS = docker-ocserv
dist_check_SCRIPTS = test-pass test-pass-cert test-cert test-iroute test-pass-script \ dist_check_SCRIPTS = test-pass test-pass-cert test-cert test-iroute test-pass-script \
test-multi-cookie test-pam test-stress full-test test-group-pass test-pass-group-cert \ test-multi-cookie test-pam test-stress full-test test-group-pass test-pass-group-cert \
ocpasswd-test test-pass-group-cert-no-pass unix-test ocpasswd-test test-pass-group-cert-no-pass unix-test test-pass-opt-cert
TESTS = test-pass test-pass-cert test-cert test-iroute test-pass-script \ TESTS = test-pass test-pass-cert test-cert test-iroute test-pass-script \
test-multi-cookie full-test test-group-pass test-pass-group-cert \ test-multi-cookie full-test test-group-pass test-pass-group-cert \
ocpasswd-test test-pass-group-cert-no-pass unix-test ocpasswd-test test-pass-group-cert-no-pass unix-test test-pass-opt-cert
TESTS_ENVIRONMENT = srcdir="$(srcdir)" \ TESTS_ENVIRONMENT = srcdir="$(srcdir)" \
top_builddir="$(top_builddir)" top_builddir="$(top_builddir)"
tests/test-pass-opt-cert.config
+1 -1
View File
@@ -1,7 +1,7 @@
# User authentication method. Could be set multiple times and in that case # User authentication method. Could be set multiple times and in that case
# all should succeed. # all should succeed.
# Options: certificate, pam. # Options: certificate, pam.
auth = "optional-certificate" auth = "certificate[optional]"
auth = "plain[./test1.passwd]" auth = "plain[./test1.passwd]"
#auth = "pam" #auth = "pam"