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.

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

Jump to bottom

[stable21] Support LDAP dns longer than 255 characters #30261

Merged
merged 13 commits into from
Dec 16, 2021
Merged

[stable21] Support LDAP dns longer than 255 characters #30261

merged 13 commits into from
Dec 16, 2021

Conversation

come-nc
Copy link
Contributor

@come-nc come-nc commented Dec 14, 2021 •
edited
Loading

Backport #29523

  • Migration had to be adapted, should be tested against 21 to make sure it works.

come-nc and others added 13 commits December 14, 2021 10:57
@come-nc
Support LDAP dns longer than 255 characters
071a58a 
Adds an ldap_full_dn column to store the dn, and only store a sha256
 hash in the ldap_dn which is shorter and can be indexed without
 trouble.
Migration still needs to be implemented.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Change column names to ldap_dn and ldap_dn_hash and add migration
8904c51 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@nickvergessen @come-nc
Fix variable names
c90f9b5 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@come-nc
Fixed migration step for user_ldap
dd8d909 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Put back length check to have a clear error
8367bda 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Fixes in migration step
94b5b21 
We cannot set ldap_dn_hash column as notnull because it is empty for
 existing users before postSchemaChange is called

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Add the columns and alter the index in Version1010Date20200630192842
d826369 
This is to ensure new installations do not need to go through migration
 history.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Make sure that hash function returns a string
41e365a 
The documentation says it can return false, and even if that is highly
 unlikely for sha256, better safe than sorry.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Add an index for directory_uuid as well
44fe945 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Use clearer names for variables
ded493d 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Add missing copyright headers in migration steps
5e345f8 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Bump user_ldap version to make sure the migration runs
774636e 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Adapt execute function name for stable21
f3632cf 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc self-assigned this Dec 14, 2021
@come-nc come-nc requested review from a team, nickvergessen, ArtificialOwl and skjnldsv and removed request for a team December 14, 2021 10:06
@come-nc come-nc changed the title Backport/29523/stable21 [stable21] Support LDAP dns longer than 255 characters Dec 14, 2021
@come-nc come-nc added the 3. to review Waiting for reviews label Dec 14, 2021
@come-nc
Copy link
Contributor Author

come-nc commented Dec 14, 2021

Tested migration on 21, works fine.

@nickvergessen nickvergessen removed their request for review December 15, 2021 08:44
@come-nc come-nc added this to the Nextcloud 21.0.8 milestone Dec 16, 2021
@come-nc come-nc added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 16, 2021
@come-nc come-nc merged commit c5a8610 into stable21 Dec 16, 2021
@come-nc come-nc deleted the backport/29523/stable21 branch December 16, 2021 08:06
This was referenced Jan 7, 2022
Merged
Merged
This was referenced Jan 20, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skjnldsv skjnldsv skjnldsv approved these changes

@CarlSchwan CarlSchwan CarlSchwan approved these changes

@ArtificialOwl ArtificialOwl Awaiting requested review from ArtificialOwl

Assignees

@come-nc come-nc

Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Milestone
Nextcloud 21.0.8
Development

Successfully merging this pull request may close these issues.
4 participants
@come-nc @skjnldsv @CarlSchwan @nickvergessen