X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstarttls.c;h=dd649f36fe6d8b52da7040273c518fa4ab9b24f7;hb=e841247c9086053d774d66e4fbb058d0ead706b2;hp=6cee1c2964527616f365aba3453c3f1e290d4d7f;hpb=0c8fdd5b20b40ae0fe9d23afc654b300f2898ce9;p=openldap
diff --git a/servers/slapd/starttls.c b/servers/slapd/starttls.c
index 6cee1c2964..dd649f36fe 100644
--- a/servers/slapd/starttls.c
+++ b/servers/slapd/starttls.c
@@ -1,68 +1,112 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1999 The OpenLDAP Foundation.
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2009 The OpenLDAP Foundation.
* All rights reserved.
*
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License. A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
#include
#include
+#include
#include "slap.h"
+#include "lber_pvt.h"
-#ifdef HAVE_TLS
+const struct berval slap_EXOP_START_TLS = BER_BVC(LDAP_EXOP_START_TLS);
+#ifdef HAVE_TLS
int
-starttls_extop (
- SLAP_EXTOP_CALLBACK_FN cb,
- Connection *conn,
- Operation *op,
- char * oid,
- struct berval * reqdata,
- struct berval ** rspdata,
- char ** text )
+starttls_extop ( Operation *op, SlapReply *rs )
{
- if ( reqdata != NULL ) {
+ int rc;
+
+ Statslog( LDAP_DEBUG_STATS, "%s STARTTLS\n",
+ op->o_log_prefix, 0, 0, 0, 0 );
+
+ if ( op->ore_reqdata != NULL ) {
/* no request data should be provided */
+ rs->sr_text = "no request data expected";
return LDAP_PROTOCOL_ERROR;
}
+ /* acquire connection lock */
+ ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
+
/* can't start TLS if it is already started */
- if (conn->c_is_tls != 0)
- return(LDAP_OPERATIONS_ERROR);
+ if (op->o_conn->c_is_tls != 0) {
+ rs->sr_text = "TLS already started";
+ rc = LDAP_OPERATIONS_ERROR;
+ goto done;
+ }
/* can't start TLS if there are other op's around */
- if (conn->c_ops != NULL) {
- if (conn->c_ops != op || op->o_next != NULL)
- return(LDAP_OPERATIONS_ERROR);
+ if (( !LDAP_STAILQ_EMPTY(&op->o_conn->c_ops) &&
+ (LDAP_STAILQ_FIRST(&op->o_conn->c_ops) != op ||
+ LDAP_STAILQ_NEXT(op, o_next) != NULL)) ||
+ ( !LDAP_STAILQ_EMPTY(&op->o_conn->c_pending_ops) ))
+ {
+ rs->sr_text = "cannot start TLS when operations are outstanding";
+ rc = LDAP_OPERATIONS_ERROR;
+ goto done;
+ }
+
+ if ( !( global_disallows & SLAP_DISALLOW_TLS_2_ANON ) &&
+ ( op->o_conn->c_dn.bv_len != 0 ) )
+ {
+ Statslog( LDAP_DEBUG_STATS,
+ "%s AUTHZ anonymous mech=starttls ssf=0\n",
+ op->o_log_prefix, 0, 0, 0, 0 );
+
+ /* force to anonymous */
+ connection2anonymous( op->o_conn );
}
- if (conn->c_pending_ops != NULL) {
- if (conn->c_pending_ops != op || op->o_next != NULL)
- return(LDAP_OPERATIONS_ERROR);
+
+ if ( ( global_disallows & SLAP_DISALLOW_TLS_AUTHC ) &&
+ ( op->o_conn->c_dn.bv_len != 0 ) )
+ {
+ rs->sr_text = "cannot start TLS after authentication";
+ rc = LDAP_OPERATIONS_ERROR;
+ goto done;
}
- /* here's some pseudo-code if HAVE_TLS is defined
- * but for some reason TLS is not available.
- */
- /*
- if (tls not really supported) {
- if (referral exists) {
- // caller will need to put the referral into the result
- return(LDAP_REFERRAL);
- }
- return(LDAP_UNAVAILABLE);
+ /* fail if TLS could not be initialized */
+ if ( slap_tls_ctx == NULL ) {
+ if (default_referral != NULL) {
+ /* caller will put the referral in the result */
+ rc = LDAP_REFERRAL;
+ goto done;
}
- */
- conn->c_is_tls = 1;
- conn->c_needs_tls_accept = 1;
- return(LDAP_SUCCESS);
+ rs->sr_text = "Could not initialize TLS";
+ rc = LDAP_UNAVAILABLE;
+ goto done;
+ }
+
+ op->o_conn->c_is_tls = 1;
+ op->o_conn->c_needs_tls_accept = 1;
+
+ rc = LDAP_SUCCESS;
+
+done:
+ /* give up connection lock */
+ ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+
+ /* FIXME: RACE CONDITION! we give up lock before sending result
+ * Should be resolved by reworking connection state, not
+ * by moving send here (so as to ensure proper TLS sequencing)
+ */
+
+ return rc;
}
#endif /* HAVE_TLS */