Skip to content

Commit

Permalink
fix: Ensure label is always a string
Browse files Browse the repository at this point in the history
Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
susnux committed Jan 26, 2025
1 parent 8981f32 commit 46ed78a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
5 changes: 4 additions & 1 deletion apps/files_sharing/lib/Controller/ShareAPIController.php
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,10 @@ public function createShare(
}

// If we have a label, use it
if (!empty($label)) {
if ($label !== '') {
if (strlen($label) > 255) {
throw new OCSBadRequestException("Maximum label length is 255");
}
$share->setLabel($label);
}

Expand Down
2 changes: 1 addition & 1 deletion apps/sharebymail/lib/ShareByMailProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@ protected function createShareObject(array $data): IShare {
$share->setPassword($data['password']);
$passwordExpirationTime = \DateTime::createFromFormat('Y-m-d H:i:s', $data['password_expiration_time'] ?? '');
$share->setPasswordExpirationTime($passwordExpirationTime !== false ? $passwordExpirationTime : null);
$share->setLabel($data['label']);
$share->setLabel($data['label'] ?? '');
$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
$share->setHideDownload((bool)$data['hide_download']);
$share->setReminderSent((bool)$data['reminder_sent']);
Expand Down
3 changes: 1 addition & 2 deletions lib/private/Share20/Share.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,13 @@ class Share implements IShare {
private $shareTime;
/** @var bool */
private $mailSend;
/** @var string */
private $label = '';
/** @var ICacheEntry|null */
private $nodeCacheEntry;
/** @var bool */
private $hideDownload = false;
private bool $reminderSent = false;

private string $label = '';
private bool $noExpirationDate = false;

public function __construct(
Expand Down

0 comments on commit 46ed78a

Please sign in to comment.