Skip to content

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

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
come-nc merged 13 commits into from
Dec 16, 2021
Merged

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

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
071a58a
Support LDAP dns longer than 255 characters
come-nc Nov 2, 2021
8904c51
Change column names to ldap_dn and ldap_dn_hash and add migration
come-nc Nov 4, 2021
c90f9b5
Fix variable names
nickvergessen Nov 4, 2021
dd8d909
Fixed migration step for user_ldap
come-nc Nov 4, 2021
8367bda
Put back length check to have a clear error
come-nc Nov 4, 2021
94b5b21
Fixes in migration step
come-nc Nov 4, 2021
d826369
Add the columns and alter the index in Version1010Date20200630192842
come-nc Nov 18, 2021
41e365a
Make sure that hash function returns a string
come-nc Nov 18, 2021
44fe945
Add an index for directory_uuid as well
come-nc Nov 18, 2021
ded493d
Use clearer names for variables
come-nc Nov 18, 2021
5e345f8
Add missing copyright headers in migration steps
come-nc Dec 9, 2021
774636e
Bump user_ldap version to make sure the migration runs
come-nc Dec 9, 2021
f3632cf
Adapt execute function name for stable21
come-nc Dec 14, 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
Fixes in migration step 
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 <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Dec 14, 2021
commit 94b5b21e8c7afd6aeb56c489c29b9faf1dbd3e5c
5 changes: 2 additions & 3 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 @@ -45,9 +45,8 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
$table = $schema->getTable($tableName);
if (!$table->hasColumn('ldap_dn_hash')) {
$table->addColumn('ldap_dn_hash', Types::STRING, [
'notnull' => true,
'notnull' => false,
'length' => 64,
'default' => '',
]);
$changeSchema = true;
}
Expand All @@ -74,7 +73,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
$table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes');
$changeSchema = true;
}
if ($table->getPrimaryKeyColumns() !== ['owncloud_name']) {
if (!$table->hasPrimaryKey() || ($table->getPrimaryKeyColumns() !== ['owncloud_name'])) {
$table->dropPrimaryKey();
$table->setPrimaryKey(['owncloud_name']);
$changeSchema = true;
Expand Down