Skip to content

Support LDAP dns longer than 255 characters #29523

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

Merged
skjnldsv merged 10 commits into from
Dec 9, 2021
Merged

Support LDAP dns longer than 255 characters #29523

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
662e324
Support LDAP dns longer than 255 characters
come-nc Nov 2, 2021
31a503b
Change column names to ldap_dn and ldap_dn_hash and add migration
come-nc Nov 4, 2021
9a1df9d
Fix variable names
nickvergessen Nov 4, 2021
ce5192a
Fixed migration step for user_ldap
come-nc Nov 4, 2021
d4c49a3
Put back length check to have a clear error
come-nc Nov 4, 2021
c4d8bd9
Fixes in migration step
come-nc Nov 4, 2021
14f0020
Add the columns and alter the index in Version1010Date20200630192842
come-nc Nov 18, 2021
df25a6d
Make sure that hash function returns a string
come-nc Nov 18, 2021
5143249
Add an index for directory_uuid as well
come-nc Nov 18, 2021
a359047
Use clearer names for variables
come-nc Nov 18, 2021
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
Prev Previous commit
Next Next commit
Add an index for directory_uuid as well 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Nov 23, 2021
commit 514324916b33bbaa4972e05abf9e87924cd637e1
2 changes: 2 additions & 0 deletions apps/user_ldap/lib/Migration/Version1010Date20200630192842.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
]);
$table->setPrimaryKey(['owncloud_name']);
$table->addUniqueIndex(['ldap_dn_hash'], 'ldap_user_dn_hashes');
$table->addUniqueIndex(['directory_uuid'], 'ldap_user_directory_uuid');
}

if (!$schema->hasTable('ldap_group_mapping')) {
Expand All @@ -91,6 +92,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
]);
$table->setPrimaryKey(['owncloud_name']);
$table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes');
$table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid');
}

if (!$schema->hasTable('ldap_group_members')) {
Expand Down
8 changes: 8 additions & 0 deletions apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
$table->addUniqueIndex(['ldap_dn_hash'], 'ldap_user_dn_hashes');
$changeSchema = true;
}
if (!$table->hasIndex('ldap_user_directory_uuid')) {
$table->addUniqueIndex(['directory_uuid'], 'ldap_user_directory_uuid');
$changeSchema = true;
}
} else {
if ($table->hasIndex('owncloud_name_groups')) {
$table->dropIndex('owncloud_name_groups');
Expand All @@ -73,6 +77,10 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
$table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes');
$changeSchema = true;
}
if (!$table->hasIndex('ldap_group_directory_uuid')) {
$table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid');
$changeSchema = true;
}
if (!$table->hasPrimaryKey() || ($table->getPrimaryKeyColumns() !== ['owncloud_name'])) {
$table->dropPrimaryKey();
$table->setPrimaryKey(['owncloud_name']);
Expand Down