Merge pull request #1433 from nextcloud/enh/1423/unprefixed-base64-avatar

julien-nc · web-flow · commit 219044bed3c7 · 2026-04-29T12:16:55.000+02:00
Add a fallback case when parsing the avatar attribute
diff --git a/lib/Service/ProvisioningService.php b/lib/Service/ProvisioningService.php
@@ -529,6 +529,13 @@ private function setUserAvatar(string $userId, string $avatarAttribute): void {
 				$this->logger->warning('Failed to decode base64 JPEG avatar for user ' . $userId, ['avatar_attribute' => $avatarAttribute]);
 				return;
 			}
+		} else {
+			// fallback if it's not a URL and does not have a base64 data prefix: try to decode it as base64
+			$avatarContent = base64_decode($avatarAttribute);
+			if ($avatarContent === false) {
+				$this->logger->warning('Failed to decode base64 unprefixed avatar for user ' . $userId, ['avatar_attribute' => $avatarAttribute]);
+				return;
+			}
 		}
 
 		if ($avatarContent === null || $avatarContent === '') {

Original file line number	Diff line number	Diff line change
`@@ -529,6 +529,13 @@ private function setUserAvatar(string $userId, string $avatarAttribute): void {`
`529`	`529`	`$this->logger->warning('Failed to decode base64 JPEG avatar for user ' . $userId, ['avatar_attribute' => $avatarAttribute]);`
`530`	`530`	`return;`
`531`	`531`	`}`
	`532`	`+ } else {`
	`533`	`+ // fallback if it's not a URL and does not have a base64 data prefix: try to decode it as base64`
	`534`	`+ $avatarContent = base64_decode($avatarAttribute);`
	`535`	`+ if ($avatarContent === false) {`
	`536`	`+ $this->logger->warning('Failed to decode base64 unprefixed avatar for user ' . $userId, ['avatar_attribute' => $avatarAttribute]);`
	`537`	`+ return;`
	`538`	`+ }`
`532`	`539`	`}`
`533`	`540`
`534`	`541`	`if ($avatarContent === null \|\| $avatarContent === '') {`