Skip to content

#4612: Improve sanitizing column headers and description for datastore import #4613

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

Open
stefan-korn wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

#4612: Improve sanitizing column headers and description for datastore import #4613

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions modules/datastore/src/Plugin/QueueWorker/ImportJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,16 @@ protected function __construct(string $identifier, $storage, ?array $config = NU
}

/**
* Transform possible multiline string to single line for description.
* Sanitize column description (sanitize multiline and binary string)
*
* @param string $column
* Column name.
*
* @return string
* Column name on single line.
* sanitized column name on single line.
*/
public static function sanitizeDescription(string $column) {
$column = preg_replace('~[^\x20-\x7E\t\r\n]~', '_', $column);
Copy link
Copy Markdown
Member

@janette janette Feb 27, 2026

Choose a reason for hiding this comment

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

@stefan-korn seems like it would be better to just remove the BOM rather than replace it with an underscore.

$trimmed = array_filter(array_map('trim', explode("\n", $column)));
return implode(" ", $trimmed);
}
Expand Down Expand Up @@ -159,6 +160,10 @@ public static function sanitizeHeader(string $column): string {
$column = '_' . $column;
}

if (empty($column)) {
$column = 'empty_col_name';
}

return $column;
}

Expand Down