From HEAD

[openldap] / servers / slapd / starttls.c

diff --git a/servers/slapd/starttls.c b/servers/slapd/starttls.c
index bd12f32c73d0be0c140d9c0b4cd10dad23ce2ef5..11f2c0c917ead5a5a2eae31681d2fcb14c265508 100644 (file)
--- a/servers/slapd/starttls.c
+++ b/servers/slapd/starttls.c
@@ -1,12 +1,16 @@
 /* $OpenLDAP$ */
-/* 
- * Copyright 1999-2000 The OpenLDAP Foundation.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -14,74 +18,85 @@
 #include <stdio.h>
 #include <ac/socket.h>
 
+#include <ldap_pvt.h>
+
 #include "slap.h"
 
 #ifdef HAVE_TLS
 
 int
-starttls_extop (
-       Connection *conn,
-       Operation *op,
-       const char * reqoid,
-       struct berval * reqdata,
-       char ** rspoid,
-       struct berval ** rspdata,
-       LDAPControl ***rspctrls,
-       const char ** text,
-       struct berval *** refs )
+starttls_extop ( Operation *op, SlapReply *rs )
 {
        void *ctx;
        int rc;
 
-       if ( reqdata != NULL ) {
+       if ( op->ore_reqdata != NULL ) {
                /* no request data should be provided */
-               *text = "no request data expected";
+               rs->sr_text = "no request data expected";
                return LDAP_PROTOCOL_ERROR;
        }
 
        /* acquire connection lock */
-       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+       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) {
-               *text = "TLS already started";
+       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 &&
-                       (conn->c_ops != op || op->o_next != NULL)) ||
-               ( conn->c_pending_ops != NULL))
+       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) ))
        {
-               *text = "cannot start TLS when operations our outstanding";
+               rs->sr_text = "cannot start TLS when operations are outstanding";
                rc = LDAP_OPERATIONS_ERROR;
                goto done;
        }
 
-       /* fail if TLS could not be initialized */
-       if (ldap_pvt_tls_get_option(NULL, LDAP_OPT_X_TLS_CERT, &ctx) != 0
-               || ctx == NULL)
+       if ( !( global_disallows & SLAP_DISALLOW_TLS_2_ANON ) &&
+               ( op->o_conn->c_dn.bv_len != 0 ) )
        {
+               Statslog( LDAP_DEBUG_STATS,
+                       "conn=%lu op=%lu AUTHZ anonymous mech=starttls ssf=0\n",
+                       op->o_connid, op->o_opid, 0, 0, 0 );
+
+               /* force to anonymous */
+               connection2anonymous( op->o_conn );
+       }
+
+       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;
+       }
+
+       /* 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;
                }
 
-               *text = "Could not initialize TLS";
+               rs->sr_text = "Could not initialize TLS";
                rc = LDAP_UNAVAILABLE;
                goto done;
        }
 
-    conn->c_is_tls = 1;
-    conn->c_needs_tls_accept = 1;
+    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( &conn->c_mutex );
+       ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 
        /*
         * RACE CONDITION: we give up lock before sending result