Skip to content

[stable28] fix(dav): Restrict properties allowed object classes #55855

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
nickvergessen merged 4 commits into from
Oct 20, 2025
Merged

[stable28] fix(dav): Restrict properties allowed object classes #55855

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50ae7e4
fix(dav): Restrict properties allowed object classes
come-nc Oct 14, 2025
5aaef3a
fix(dav): Allow arrays (of scalars) in property values
come-nc Oct 14, 2025
5452b73
fix(dav): Allow array of array of scalars, and fix error message
come-nc Oct 16, 2025
d00917d
fix(dav): Adapt changes to stable28 code
come-nc Oct 20, 2025
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
fix(dav): Adapt changes to stable28 code 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Oct 20, 2025
commit d00917d339a5a446412adcbcf13b544a23424ef3
5 changes: 3 additions & 2 deletions apps/dav/lib/DAV/CustomPropertiesBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\IUser;
use Sabre\DAV\Exception as DavException;
use Sabre\DAV\PropertyStorage\Backend\BackendInterface;
use Sabre\DAV\PropFind;
use Sabre\DAV\PropPatch;
Expand Down Expand Up @@ -393,7 +394,7 @@ private function updateProperties(string $path, array $properties): bool {
->executeStatement();
}
} else {
[$value, $valueType] = $this->encodeValueForDatabase($propertyValue);
[$value, $valueType] = $this->encodeValueForDatabase($propertyName, $propertyValue);
$dbParameters['propertyValue'] = $value;
$dbParameters['valueType'] = $valueType;

Expand Down Expand Up @@ -451,7 +452,7 @@ private static function checkIsArrayOfScalar(string $name, array $array): void {
* @param mixed $value
* @return array
*/
private function encodeValueForDatabase($value): array {
private function encodeValueForDatabase(string $name, $value): array {
if (is_scalar($value)) {
$valueType = self::PROPERTY_TYPE_STRING;
} elseif ($value instanceof Complex) {
Expand Down
Loading