Extract new password in passwd_s (#246) #299

mistotebe · 2019-08-20T09:47:27Z

Care has been taken to preserve backwards compatibility for the regular case of no password being requested too.

codecov · 2019-08-20T10:00:11Z

Codecov Report

Merging #299 into master will increase coverage by 2.09%.
The diff coverage is 90.90%.

@@            Coverage Diff             @@
##           master     #299      +/-   ##
==========================================
+ Coverage   71.46%   73.55%   +2.09%     
==========================================
  Files          49       40       -9     
  Lines        4714     3192    -1522     
  Branches      785      486     -299     
==========================================
- Hits         3369     2348    -1021     
+ Misses       1025      715     -310     
+ Partials      320      129     -191

Impacted Files	Coverage Δ
Lib/ldap/ldapobject.py	`80.07% <77.77%> (+1.77%)`	⬆️
Lib/ldap/extop/__init__.py	`68.42% <100.00%> (+12.86%)`	⬆️
Lib/ldap/extop/passwd.py	`100.00% <100.00%> (ø)`
Lib/ldap/cidict.py	`69.23% <0.00%> (-30.77%)`	⬇️
Lib/ldap/schema/tokenizer.py	`97.87% <0.00%> (-0.05%)`	⬇️
Modules/common.c
Modules/constants.c
Modules/ldapcontrol.c
Modules/functions.c
Modules/constants_generated.h
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c803bfc...2550717. Read the comment docs.

tiran

The change modifies the return value of passwd_s for newpw=None. This could break existing software that relies on the return value. I would prefer a solution that keeps the existing semantic. For example you could introduce a new method or a marker object like passwd_s(dn, oldpw, newpw=ldap.PASSWORD_NEW).

Lib/ldap/extop/passwd.py

tiran · 2019-08-20T09:54:43Z

Lib/ldap/ldapobject.py

@@ -658,7 +658,12 @@ def passwd(self,user,oldpw,newpw,serverctrls=None,clientctrls=None):

  def passwd_s(self,user,oldpw,newpw,serverctrls=None,clientctrls=None):
    msgid = self.passwd(user,oldpw,newpw,serverctrls,clientctrls)
-    return self.extop_result(msgid,all=1,timeout=self.timeout)
+    respoid, respvalue = self.extop_result(msgid, all=1, timeout=self.timeout)
+    if respoid != PasswordModifyResponse.responseName:


PasswordModifyResponse.responseName is set to None. Does the password control always return no OID?

Lib/ldap/ldapobject.py

mistotebe · 2019-08-20T10:20:42Z

So you want me to add a PASSWD_NEW = object() into ldap.py?

Yes, RFC 3062 says so. Also, there is some confusion on the OPTIONAL status of genPasswd in the ASN.1 spec vs. text spec but I replicated the more permissive version for better interoperability.

mistotebe · 2019-08-20T10:22:49Z

@tiran Updated merge request, just the new_pw handling to resolve then?

mistotebe · 2019-08-20T10:33:33Z

Wouldn't your suggestion make it impossible to ever deprecate the old behaviour?

mistotebe · 2019-08-20T10:57:04Z

@tiran Ok, this might be better? If it is, feel free to squash the relevant commits before merging.

encukou · 2020-01-29T15:18:11Z

@tiran, do you want to finish the review?

encukou · 2020-04-29T23:52:19Z

My review will be sub-par, but it looks like I'll need to do it to move this forward. I'll dedicate a day next week to python-ldap.

Addressed.

encukou · 2020-05-06T14:07:36Z

@mistotebe Overall, this looks good to me!
I've rebased so tests can pass, and made a few nitpicks directly in your branch. Does that look OK?

The extract_newpw flag is not ideal API, but it should work for now. When #61 is implemented, it can be deprecated.

mistotebe · 2020-05-06T14:47:34Z

Thanks for the changes. I agree the result API needs a complete overhaul, couldn't do that here and frankly, the exception work is a prerequisite to that anyway.

tiran

Some minor style nit picks.

Tests/t_ldapobject.py

Lib/ldap/extop/__init__.py

Style nitpicks are addressed.

encukou

This looks good to me.

encukou

I rebased to solve a trivial conflict with newly added tests.

For some reason, Travis CI is not reporting results. But the build for 2550717 passed: https://travis-ci.org/github/python-ldap/python-ldap/builds/695146612

quanah · 2020-06-05T18:38:17Z

For some reason, Travis CI is not reporting results.

You may wish to see if the discussion here is of help: https://mta.openssl.org/pipermail/openssl-project/2020-June/002033.html

mistotebe force-pushed the passwd_s branch from 4f6002d to f69df7d Compare August 20, 2019 10:00

tiran previously requested changes Aug 20, 2019

View reviewed changes

mistotebe force-pushed the passwd_s branch from f69df7d to 1138bd8 Compare August 20, 2019 10:08

mistotebe force-pushed the passwd_s branch from 1138bd8 to 593cc70 Compare August 20, 2019 10:21

mistotebe force-pushed the passwd_s branch from 593cc70 to b060d33 Compare August 20, 2019 10:50

mistotebe force-pushed the passwd_s branch from b060d33 to 4cae9c9 Compare April 30, 2020 08:07

encukou force-pushed the passwd_s branch from 4cae9c9 to 1f875f5 Compare May 6, 2020 13:57

encukou previously approved these changes May 6, 2020

View reviewed changes

tiran previously requested changes May 26, 2020

View reviewed changes

Tests/t_ldapobject.py Outdated Show resolved Hide resolved

Tests/t_ldapobject.py Outdated Show resolved Hide resolved

Lib/ldap/extop/__init__.py Outdated Show resolved Hide resolved

mistotebe dismissed encukou’s stale review via 90a9d79 May 27, 2020 07:56

mistotebe force-pushed the passwd_s branch from 1f875f5 to 90a9d79 Compare May 27, 2020 07:56

encukou previously approved these changes Jun 5, 2020

View reviewed changes

mistotebe added 4 commits June 5, 2020 19:42

Extract new password in passwd_s (python-ldap#246)

efb60e4

Update documentation

c812258

Doc for extract_newpw

f6dac66

Impl for extract_newpw

2550717

encukou dismissed their stale review via 2550717 June 5, 2020 18:10

encukou force-pushed the passwd_s branch from 90a9d79 to 2550717 Compare June 5, 2020 18:10

encukou approved these changes Jun 5, 2020

View reviewed changes

encukou merged commit 9a91bbd into python-ldap:master Jun 5, 2020

tiran added this to the 3.3 milestone Jun 5, 2020

Extract new password in passwd_s (#246) #299

Extract new password in passwd_s (#246) #299

Uh oh!

Conversation

mistotebe commented Aug 20, 2019

Uh oh!

codecov bot commented Aug 20, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

tiran left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tiran Aug 20, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mistotebe commented Aug 20, 2019

Uh oh!

mistotebe commented Aug 20, 2019

Uh oh!

mistotebe commented Aug 20, 2019

Uh oh!

mistotebe commented Aug 20, 2019

Uh oh!

encukou commented Jan 29, 2020

Uh oh!

encukou commented Apr 29, 2020

Uh oh!

encukou commented May 6, 2020

Uh oh!

mistotebe commented May 6, 2020

Uh oh!

tiran left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

encukou left a comment

Choose a reason for hiding this comment

Uh oh!

encukou left a comment

Choose a reason for hiding this comment

Uh oh!

quanah commented Jun 5, 2020

Uh oh!

Uh oh!

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

codecov bot commented Aug 20, 2019 •

edited

Loading