Skip to content

support OPT_X_TLS_PEERCERT #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
graingert wants to merge 1 commit into from
Closed

support OPT_X_TLS_PEERCERT #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Doc/reference/ldap.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ TLS options

.. py:data:: OPT_X_TLS_PEERCERT

Get peer's certificate as binary ASN.1 data structure (not supported)
Get peer's certificate as binary ASN.1 data structure

.. py:data:: OPT_X_TLS_PROTOCOL_MIN

Expand Down
17 changes: 16 additions & 1 deletion Modules/options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "LDAPObject.h"
#include "ldapcontrol.h"
#include "options.h"
#include "berval.h"

void
set_timeval_from_double(struct timeval *tv, double d)
Expand Down Expand Up @@ -235,6 +236,7 @@ LDAP_get_option(LDAPObject *self, int option)
{
int res;
int intval;
struct berval *bv;
struct timeval *tv;
LDAPAPIInfo apiinfo;
LDAPControl **lcs;
Expand Down Expand Up @@ -399,7 +401,20 @@ LDAP_get_option(LDAPObject *self, int option)
v = LDAPControls_to_List(lcs);
ldap_controls_free(lcs);
return v;

#ifdef LDAP_OPT_X_TLS_PEERCERT
case LDAP_OPT_X_TLS_PEERCERT:
Copy link
Contributor Author

@graingert graingert Feb 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah this is only in openldap >=2.5.0

#endif
/* Berval-valued options */
res = LDAP_int_get_option(self, option, &bv);
if (res != LDAP_OPT_SUCCESS)
return option_error(res, "ldap_get_option");
if (bv == NULL) {
Py_INCREF(Py_None);
return Py_None;
}
v = LDAPberval_to_object(bv);
ldap_memfree(bv);
return v;
default:
PyErr_Format(PyExc_ValueError, "unknown option %d", option);
return NULL;
Expand Down
1 change: 1 addition & 0 deletions Tests/t_ldapobject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ def test_multiple_starttls(self):
l.set_option(ldap.OPT_X_TLS_NEWCTX, 0)
l.start_tls_s()
l.simple_bind_s(self.server.root_dn, self.server.root_pw)
self.assertEqual(l.get_option(ldap.OPT_X_TLS_PEERCERT), b"eg")
self.assertEqual(l.whoami_s(), 'dn:' + self.server.root_dn)

def test_dse(self):
Expand Down