dirsrvtests/tests/tickets/ticket1347760_test.py | 23 +++++++++++ ldap/servers/slapd/bind.c | 49 +++++++++++------------- ldap/servers/slapd/saslbind.c | 4 - 3 files changed, 48 insertions(+), 28 deletions(-)
New commits: commit 06876946f77436f71013392becb0fb9d9e4111f6 Author: Noriko Hosoi nhosoi@redhat.com Date: Fri Jul 22 17:11:48 2016 -0700
Bug 1347760 - Additional CI test case
Description: Information disclosure via repeated use of LDAP ADD operation, etc. Case 1. When an account is inactivated, if a bind is successful (e.g., a correct password is given), it returns UNWILLING_TO_PERFORM. Case 2. When an account is inactivated, if a bind is not successful, it returns INVALID_CREDENTIALS.
diff --git a/dirsrvtests/tests/tickets/ticket1347760_test.py b/dirsrvtests/tests/tickets/ticket1347760_test.py index bf03563..a54aea1 100644 --- a/dirsrvtests/tests/tickets/ticket1347760_test.py +++ b/dirsrvtests/tests/tickets/ticket1347760_test.py @@ -12,6 +12,8 @@ import time import ldap import logging import pytest + +from subprocess import Popen from lib389 import DirSrv, Entry, tools, tasks from lib389.tools import DirSrvTools from lib389._constants import * @@ -434,6 +436,27 @@ def test_ticket1347760(topology): log.info('Delete case. the deleting entry does not exist, it should fail with %s' % rc.__name__) check_op_result(topology.standalone, 'delete', BOGUSDN, None, exists, rc)
+ log.info('Inactivate %s' % BINDDN) + nsinactivate = '%s/sbin/ns-inactivate.pl' % topology.standalone.prefix + p = Popen([nsinactivate, '-Z', 'standalone', '-D', DN_DM, '-w', PASSWORD, '-I', BINDDN]) + assert(p.wait() == 0) + + log.info('Bind as {%s,%s} which should fail with %s.' % (BINDDN, BUID, ldap.UNWILLING_TO_PERFORM.__name__)) + try: + topology.standalone.simple_bind_s(BINDDN, BUID) + except ldap.LDAPError as e: + log.info("Exception (expected): %s" % type(e).__name__) + log.info('Desc ' + e.message['desc']) + assert isinstance(e, ldap.UNWILLING_TO_PERFORM) + + log.info('Bind as {%s,%s} which should fail with %s.' % (BINDDN, 'bogus', ldap.INVALID_CREDENTIALS.__name__)) + try: + topology.standalone.simple_bind_s(BINDDN, 'bogus') + except ldap.LDAPError as e: + log.info("Exception (expected): %s" % type(e).__name__) + log.info('Desc ' + e.message['desc']) + assert isinstance(e, ldap.INVALID_CREDENTIALS) + log.info('SUCCESS')
commit b8767d510d11c7cbfede24daaae3348b9f028f47 Author: Noriko Hosoi nhosoi@redhat.com Date: Tue Jul 26 18:08:38 2016 -0700
Bug 1347760 - CVE-2016-4992 389-ds-base: Information disclosure via repeated use of LDAP ADD operation, etc.
Description: 1. When an account is inactivated, the error UNWILLING_TO_PERFORM with the inactivated message should be returned only when the bind is successful. 2. When SASL bind fails, instead of returning the cause of the failure directly to the client, but logging it in the access log.
https://bugzilla.redhat.com/show_bug.cgi?id=1347760
Reviewed by wibrown@redhat.com (Thank you, William!)
diff --git a/ldap/servers/slapd/bind.c b/ldap/servers/slapd/bind.c index 702d4c2..c271577 100644 --- a/ldap/servers/slapd/bind.c +++ b/ldap/servers/slapd/bind.c @@ -720,25 +720,6 @@ do_bind( Slapi_PBlock *pb ) } } } - - /* - * Is this account locked ? - * could be locked through the account inactivation - * or by the password policy - * - * rc=0: account not locked - * rc=1: account locked, can not bind, result has been sent - * rc!=0 and rc!=1: error. Result was not sent, lets be_bind - * deal with it. - * - */ - - /* get the entry now, so that we can give it to slapi_check_account_lock and reslimit_update_from_dn */ - if (! slapi_be_is_flag_set(be, SLAPI_BE_FLAG_REMOTE_DATA)) { - bind_target_entry = get_entry(pb, slapi_sdn_get_ndn(sdn)); - rc = slapi_check_account_lock ( pb, bind_target_entry, pw_response_requested, 1, 1); - } - slapi_pblock_set( pb, SLAPI_PLUGIN, be->be_database ); set_db_default_result_handlers(pb); if ( (rc != 1) && @@ -777,6 +758,28 @@ do_bind( Slapi_PBlock *pb )
if ( rc == SLAPI_BIND_SUCCESS ) { int myrc = 0; + /* + * The bind is successful. + * We can give it to slapi_check_account_lock and reslimit_update_from_dn. + */ + /* + * Is this account locked ? + * could be locked through the account inactivation + * or by the password policy + * + * rc=0: account not locked + * rc=1: account locked, can not bind, result has been sent + * rc!=0 and rc!=1: error. Result was not sent, lets be_bind + * deal with it. + * + */ + if (!slapi_be_is_flag_set(be, SLAPI_BE_FLAG_REMOTE_DATA)) { + bind_target_entry = get_entry(pb, slapi_sdn_get_ndn(sdn)); + rc = slapi_check_account_lock(pb, bind_target_entry, pw_response_requested, 1, 1); + if (1 == rc) { /* account is locked */ + goto account_locked; + } + } if (!auto_bind) { /* * There could be a race that bind_target_entry was not added @@ -787,13 +790,7 @@ do_bind( Slapi_PBlock *pb ) if (!slapi_be_is_flag_set(be, SLAPI_BE_FLAG_REMOTE_DATA) && !bind_target_entry) { bind_target_entry = get_entry(pb, slapi_sdn_get_ndn(sdn)); - if (bind_target_entry) { - myrc = slapi_check_account_lock(pb, bind_target_entry, - pw_response_requested, 1, 1); - if (1 == myrc) { /* account is locked */ - goto account_locked; - } - } else { + if (!bind_target_entry) { slapi_pblock_set(pb, SLAPI_PB_RESULT_TEXT, "No such entry"); send_ldap_result(pb, LDAP_INVALID_CREDENTIALS, NULL, "", 0, NULL); goto free_and_return; diff --git a/ldap/servers/slapd/saslbind.c b/ldap/servers/slapd/saslbind.c index 37175f4..742987e 100644 --- a/ldap/servers/slapd/saslbind.c +++ b/ldap/servers/slapd/saslbind.c @@ -1051,8 +1051,8 @@ sasl_check_result: errstr = sasl_errdetail(sasl_conn);
PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */ - send_ldap_result(pb, LDAP_INVALID_CREDENTIALS, NULL, - (char*)errstr, 0, NULL); + slapi_pblock_set(pb, SLAPI_PB_RESULT_TEXT, (void *)errstr); + send_ldap_result(pb, LDAP_INVALID_CREDENTIALS, NULL, NULL, 0, NULL); break; }
389-commits@lists.fedoraproject.org
-
Noriko Hosoi