Merge branch '135-sync-issues-when-using-altnames-to-login' into 'master'

Get users email address from the store to be used with nsp_getuserinfo().

Closes #135

See merge request grommunio/grommunio-sync!105

Author: grammmike

lib/core/sharedfolders.php

@@ -1,7 +1,8 @@
 <?php
+
 /*
  * SPDX-License-Identifier: AGPL-3.0-only
- * SPDX-FileCopyrightText: Copyright 2022 grommunio GmbH
+ * SPDX-FileCopyrightText: Copyright 2022-2025 grommunio GmbH
  *
  * Cache shared public folder hierarchy information.
  */
@@ -29,7 +30,7 @@ public function __construct() {
 		$this->allocate = 0;
 		$this->localpart = "undefined";
 		$this->mainDomain = "undefined";
-		if (preg_match('/^([*+!.&#$|\'\\%\/0-9a-z^_`{}=?~:-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})$/i', nsp_getuserinfo(Request::GetUser())['primary_email'], $matches)) {
+		if (preg_match('/^([*+!.&#$|\'\%\/0-9a-z^_`{}=?~:-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})$/i', nsp_getuserinfo(Request::GetUserIdentifier())['primary_email'], $matches)) {
 			$this->localpart = $matches[1];
 			$this->mainDomain = $matches[2];
 		}

lib/grommunio/grommunio.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
  * SPDX-License-Identifier: AGPL-3.0-only
  * SPDX-FileCopyrightText: Copyright 2007-2016 Zarafa Deutschland GmbH
- * SPDX-FileCopyrightText: Copyright 2020-2024 grommunio GmbH
+ * SPDX-FileCopyrightText: Copyright 2020-2025 grommunio GmbH
  *
  * This is a backend for grommunio. It is an implementation of IBackend and also
  * implements ISearchProvider to search in the grommunio system. The backend
@@ -2207,6 +2208,17 @@ private function openMessageStore($user) {
 				$this->storeCache[$user] = $store;
 			}
 
+			// g-sync135: always use SMTP address (issue with altnames)
+			if (!$return_public) {
+				$addressbook = $this->getAddressbook();
+				$storeProps = mapi_getprops($store, [PR_MAILBOX_OWNER_ENTRYID]);
+				$mailuser = mapi_ab_openentry($addressbook, $storeProps[PR_MAILBOX_OWNER_ENTRYID]);
+				$smtpProps = mapi_getprops($mailuser, [PR_SMTP_ADDRESS]);
+				if (isset($smtpProps[PR_SMTP_ADDRESS])) {
+					Request::SetUserIdentifier($smtpProps[PR_SMTP_ADDRESS]);
+				}
+			}
+
 			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->openMessageStore('%s'): Found '%s' store: '%s'", $user, ($return_public) ? 'PUBLIC' : 'DEFAULT', $store));
 
 			return $store;
@@ -2396,7 +2408,7 @@ private function settingsUserInformation(&$userinformation) {
 
 			return false;
 		}
-		$user = nsp_getuserinfo($this->mainUser);
+		$user = nsp_getuserinfo(Request::GetUserIdentifier());
 		if ($user != false) {
 			$userinformation->Status = SYNC_SETTINGSSTATUS_USERINFO_SUCCESS;
 			if (Request::GetProtocolVersion() >= 14.1) {
@@ -3015,19 +3027,16 @@ private function getAddressbook() {
 	}
 
 	/**
-	 * Returns the adressbook dir entry
-	 *
-	 * @access private
+	 * Returns the adressbook dir entry.
 	 *
 	 * @return mixed addressbook dir entry or false on error
 	 */
 	private function getAddressbookDir() {
 		try {
 			$addrbook = $this->getAddressbook();
 			$ab_entryid = mapi_ab_getdefaultdir($addrbook);
-			$ab_dir = mapi_ab_openentry($addrbook, $ab_entryid);
 
-			return $ab_dir;
+			return mapi_ab_openentry($addrbook, $ab_entryid);
 		}
 		catch (MAPIException $e) {
 			SLog::Write(LOGLEVEL_ERROR, sprintf("Grommunio->getAddressbookDir(): Unable to open addressbook: %s", $e));

lib/grommunio/mapiprovider.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
  * SPDX-License-Identifier: AGPL-3.0-only
  * SPDX-FileCopyrightText: Copyright 2007-2016 Zarafa Deutschland GmbH
- * SPDX-FileCopyrightText: Copyright 2020-2024 grommunio GmbH
+ * SPDX-FileCopyrightText: Copyright 2020-2025 grommunio GmbH
  */
 
 class MAPIProvider {
@@ -306,7 +307,7 @@ private function getAppointment($mapimessage, $contentparameters) {
 				SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->getAppointment: adding ourself as an attendee for iOS6 workaround"));
 				$attendee = new SyncAttendee();
 
-				$meinfo = nsp_getuserinfo(Request::GetUser());
+				$meinfo = nsp_getuserinfo(Request::GetUserIdentifier());
 
 				if (is_array($meinfo)) {
 					$attendee->email = $meinfo["primary_email"];
@@ -322,7 +323,7 @@ private function getAppointment($mapimessage, $contentparameters) {
 		// If it's an appointment which doesn't have any attendees, we have to make sure that
 		// the user is the owner or it will not work properly with android devices
 		if (isset($messageprops[$appointmentprops["meetingstatus"]]) && $messageprops[$appointmentprops["meetingstatus"]] == olNonMeeting && empty($message->attendees)) {
-			$meinfo = nsp_getuserinfo(Request::GetUser());
+			$meinfo = nsp_getuserinfo(Request::GetUserIdentifier());
 
 			if (is_array($meinfo)) {
 				$message->organizeremail = $meinfo["primary_email"];
@@ -805,7 +806,7 @@ private function getEmail($mapimessage, $contentparameters) {
 			// do it so that the attendee status is updated on the mobile
 			if (!isset($messageprops[$emailproperties["processed"]])) {
 				// check if we are not sending the MR so we can process it
-				$cuser = GSync::GetBackend()->GetUserDetails(GSync::GetBackend()->GetCurrentUsername());
+				$cuser = GSync::GetBackend()->GetUserDetails(Request::GetUserIdentifier());
 				if (isset($cuser["emailaddress"]) && $cuser["emailaddress"] != $fromaddr) {
 					if (!isset($req)) {
 						$req = new Meetingrequest($this->store, $mapimessage, $this->session);
@@ -1025,7 +1026,8 @@ public function GetFolder($folderprops) {
 
 		// ignore certain undesired folders, like "RSS Feeds", "Suggested contacts" and Journal
 		if ((isset($folderprops[PR_CONTAINER_CLASS]) && (
-			$folderprops[PR_CONTAINER_CLASS] == "IPF.Note.OutlookHomepage" || $folderprops[PR_CONTAINER_CLASS] == "IPF.Journal")) ||
+			$folderprops[PR_CONTAINER_CLASS] == "IPF.Note.OutlookHomepage" || $folderprops[PR_CONTAINER_CLASS] == "IPF.Journal"
+		)) ||
 			in_array($folderprops[PR_ENTRYID], $this->getSpecialFoldersData())
 		) {
 			SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->GetFolder(): folder '%s' should not be synchronized", $folderprops[PR_DISPLAY_NAME]));
@@ -2142,7 +2144,7 @@ private function setTask($mapimessage, $task) {
 		$p = [$taskprops["owner"]];
 		$owner = $this->getProps($mapimessage, $p);
 		if (!isset($owner[$taskprops["owner"]])) {
-			$userinfo = nsp_getuserinfo(Request::GetUser());
+			$userinfo = nsp_getuserinfo(Request::GetUserIdentifier());
 			if (mapi_last_hresult() == NOERROR && isset($userinfo["fullname"])) {
 				$props[$taskprops["owner"]] = $userinfo["fullname"];
 			}

lib/request/request.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
  * SPDX-License-Identifier: AGPL-3.0-only
  * SPDX-FileCopyrightText: Copyright 2007-2016 Zarafa Deutschland GmbH
- * SPDX-FileCopyrightText: Copyright 2020-2024 grommunio GmbH
+ * SPDX-FileCopyrightText: Copyright 2020-2025 grommunio GmbH
  *
  * This class checks and processes all incoming data of the request.
  */
@@ -54,6 +55,7 @@ class Request {
 	private static $authDomain;
 	private static $authPassword;
 	private static $impersonatedUser;
+	private static $userIdentifier;
 	private static $asProtocolVersion;
 	private static $policykey;
 	private static $useragent;
@@ -692,6 +694,24 @@ public static function IsRequestMemoryLimitReached() {
 		return memory_get_peak_usage(true) >= self::$memoryLimit;
 	}
 
+	/**
+	 * Returns a user identifier coming from the logged user store, mostly an email address.
+	 *
+	 * @return string
+	 */
+	public static function GetUserIdentifier() {
+		return self::$userIdentifier;
+	}
+
+	/**
+	 * Sets a user identifier coming from the logged user store.
+	 *
+	 * @param string $userIdentifier
+	 */
+	public static function SetUserIdentifier($userIdentifier) {
+		self::$userIdentifier = $userIdentifier;
+	}
+
 	/*----------------------------------------------------------------------------------------------------------
 	 * Private stuff
 	 */