Skip to content
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.

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

LDAP changes to for AD flexibility #227

Merged
merged 2 commits into from Oct 23, 2017

Conversation

docwyatt2001
Copy link
Contributor

@docwyatt2001 docwyatt2001 commented Oct 16, 2017

As mentioned (and similar to PR1068 on bcosca/fatfree), changes made to make the LDAP auth work against and Active Directory environment ,with a few changes to keep it backwardly compatible to original code.

auth.php Outdated
user_error(self::E_LDAP,E_USER_ERROR);
$port=intval($this->args['port']?:389)
$this->args['filter']=$this->args['filter']?:"uid=".$id;
$filter=$this->args['filter']=$this->args['filter']?:"uid=".$id;
Copy link
Contributor

Choose a reason for hiding this comment

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

2nd assignment repeated from one line above

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Damn - missed that. :(
119 is the line to go.

@Rayne Rayne mentioned this pull request Oct 16, 2017
@ikkez
Copy link
Member

ikkez commented Oct 16, 2017

Looks fine 👍 Can someone please verify/test this change once more?!.. got no LDAP instance here atm.

@docwyatt2001
Copy link
Contributor Author

docwyatt2001 commented Oct 17, 2017

It works on the project I am using it currently for, but to play it safe, I can fire up a new LDAP server after work, and test it against that, if that's acceptable. Is there a test/design policy/standard that I should be following?

@Rayne
Copy link
Member

Rayne commented Oct 17, 2017

The test cases are in the fatfree/dev branch. The problem is, that there are no LDAP tests (or I found none). I found only a few tests for Auth.

@ikkez ikkez merged commit b2e66eb into f3-factory:master Oct 23, 2017
@jekabsmilbrets
Copy link

jekabsmilbrets commented Oct 27, 2017

there is missing semicol(;) at row 118 at lib/auth.php

ikkez added a commit that referenced this pull request Oct 27, 2017
@ikkez
Copy link
Member

ikkez commented Oct 27, 2017

fixed. thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants