Ldap contextSource base property populating in EmbeddedLdapAutoConfig

[pavelda2]

Fix issue #10443

[pivotal-issuemaster]

@pavelda2 Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.

[pivotal-issuemaster]

@pavelda2 Thank you for signing the Contributor License Agreement!

[snicoll]

Merged, thank you!

[snicoll]

This broke Spring Data's integration tests and, looking at the error, this change is way more invasive than I thought. Perhaps you could provide a solution that is opt-in instead?

[pavelda2]

The problem is in integration test. Somebody set the spring.ldap.base=dc=springframework,dc=org property in test application.properties, but this property should have no effect before my improvement.

1. It makes no sense to set whole ldap name uid=bob,ou=people,dc=springframework,dc=org in PersonRepositoryIntegrationTests.java when spring.ldap.base is set.
   (fix of findOneByName test)

2. It makes no sense to set base in both - spring.ldap.base in application.properties and in the Person entity.
   (fix of the rest of tests)

From my point of view the test should be repaired.

Possible solutions:

• Integration tests without base specified:
  • Remove base spring.ldap.base from application.properties
• Integration tests with base specified:
  • Remove base from Person entity and update index attribute value in the Person's uid field annotation @DnAttribute.
  • Remove hardcoded base in PersonRepositoryIntegrationTests.java findOneByName.

[snicoll]

@pavelda2 thanks for the feedback. Also paging @olivergierke that raised the regression in those tests.

It makes no sense to set whole ldap name uid=bob,ou=people,dc=springframework,dc=org in PersonRepositoryIntegrationTests.java when spring.ldap.base is set.

That's arguable I suppose, I wonder if there is a clear way to detect such use case. The error I saw was not very informative.

[vdubus]

I would suggest to use the value from spring.ldap.embedded.base-dn to set correctly the base information from LdapContextSource.