diff options
| author | Mohammad Arshad <arshad@apache.org> | 2020-10-20 19:41:38 -0700 |
|---|---|---|
| committer | Michael Han <hanm@apache.org> | 2020-10-20 19:41:38 -0700 |
| commit | 1af3dcc633d4829864da74ca6b030428448fcc16 (patch) | |
| tree | d2b387302b31638e9a4850492f90230e6656c729 /zookeeper-client | |
| parent | eeb1ceb6f82b67b8b46d5ff9481908f7ec943f19 (diff) | |
| download | zookeeper-1af3dcc633d4829864da74ca6b030428448fcc16.tar.gz | |
ZOOKEEPER-3561: Generalize target authentication scheme for ZooKeeper authentication enforcement.
Added enforce.auth.enabled and enforce.auth.scheme to enforce any authentication scheme.
Author: Mohammad Arshad <arshad@apache.org>
Reviewers: Michael Han <hanm@apache.org>, Damien Diederen <dd@crosstwine.com>, Enrico Olivelli <eolivelli@gmail.com>, Andor Molnár <andor@apache.org>
Closes #1500 from arshadmohammad/ZOOKEEPER-3561-master
Diffstat (limited to 'zookeeper-client')
| -rw-r--r-- | zookeeper-client/zookeeper-client-c/include/zookeeper.h | 2 | ||||
| -rwxr-xr-x | zookeeper-client/zookeeper-client-c/tests/zkServer.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/zookeeper-client/zookeeper-client-c/include/zookeeper.h b/zookeeper-client/zookeeper-client-c/include/zookeeper.h index 8bd1d95db..467a857ea 100644 --- a/zookeeper-client/zookeeper-client-c/include/zookeeper.h +++ b/zookeeper-client/zookeeper-client-c/include/zookeeper.h @@ -140,7 +140,7 @@ enum ZOO_ERRORS { ZEPHEMERALONLOCALSESSION = -120, /*!< Attempt to create ephemeral node on a local session */ ZNOWATCHER = -121, /*!< The watcher couldn't be found */ ZRECONFIGDISABLED = -123, /*!< Attempts to perform a reconfiguration operation when reconfiguration feature is disabled */ - ZSESSIONCLOSEDREQUIRESASLAUTH = -124, /*!< The session has been closed by server because server requires client to do SASL authentication, but client is not configured with SASL authentication or configuted with SASL but failed (i.e. wrong credential used.). */ + ZSESSIONCLOSEDREQUIRESASLAUTH = -124, /*!< The session has been closed by server because server requires client to do authentication via configured authentication scheme at server, but client is not configured with required authentication scheme or configured but failed (i.e. wrong credential used.). */ ZTHROTTLEDOP = -127 /*!< Operation was throttled and not executed at all. please, retry! */ /* when adding/changing values here also update zerror(int) to return correct error message */ diff --git a/zookeeper-client/zookeeper-client-c/tests/zkServer.sh b/zookeeper-client/zookeeper-client-c/tests/zkServer.sh index 99b716a21..f98b4058c 100755 --- a/zookeeper-client/zookeeper-client-c/tests/zkServer.sh +++ b/zookeeper-client/zookeeper-client-c/tests/zkServer.sh @@ -128,9 +128,9 @@ PROPERTIES="$EXTRA_JVM_ARGS -Dzookeeper.extendedTypesEnabled=true -Dznode.contai if [ "x$1" == "xstartRequireSASLAuth" ] then PROPERTIES="-Dzookeeper.sessionRequireClientSASLAuth=true $PROPERTIES" + PROPERTIES="$PROPERTIES -Dzookeeper.authProvider.1=org.apache.zookeeper.server.auth.SASLAuthenticationProvider" if [ "x$2" != "x" ] then - PROPERTIES="$PROPERTIES -Dzookeeper.authProvider.1=org.apache.zookeeper.server.auth.SASLAuthenticationProvider" PROPERTIES="$PROPERTIES -Djava.security.auth.login.config=$2" fi if [ "x$3" != "x" ] |