Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c99296c6 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

fix: patch-029 

we've disabled patch-029 before because from nc29, we have new config
`allow_user_to_change_email` which can disable the main address
modification. But that doesn't block user to set `additional_email`. So
we have fix the patch file & enable it again, to match our requirements.
parent 654e252f

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i $ 
RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/025-optimize-get-by-email.patch

RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PATCH_DIR}/027-displayname-user-leak-dav.patch

RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch

# RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.php -i ${TMP_PATCH_DIR}/029-restrict-user-to-change-primary-email.patch

RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.php -i ${TMP_PATCH_DIR}/029-restrict-user-to-change-primary-email.patch

RUN patch -u ${BASE_DIR}/lib/private/Security/VerificationToken/VerificationToken.php -i ${TMP_PATCH_DIR}/033-verification-token-private.patch

RUN patch -u ${BASE_DIR}/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php -i ${TMP_PATCH_DIR}/034-oidc-bearer-token-auth.patch

patches/029-restrict-user-to-change-primary-email.patch

+11 −16
Original line number Diff line number Diff line 
--- ./apps/provisioning_api/lib/Controller/UsersController.php	2023-10-03 07:14:02

+++ ./apps/provisioning_api/lib/Controller/UsersController-new.php	2023-10-11 05:34:04

@@ -613,10 +613,7 @@

 			) {

 				$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;

--- ./apps/provisioning_api/lib/Controller/UsersController.php	2025-06-10 18:21:13.822570507 +0600

+++ ./apps/provisioning_api/lib/Controller/UsersController-new.php	2025-06-16 17:59:16.102922745 +0600

@@ -721,7 +721,7 @@

 			$permittedFields[] = IAccountManager::PROPERTY_EMAIL;

 		}

-			$permittedFields[] = IAccountManager::PROPERTY_EMAIL;

 		}

-

 

-		$permittedFields[] = IAccountManager::COLLECTION_EMAIL;

+		//$permittedFields[] = IAccountManager::COLLECTION_EMAIL;

 		$permittedFields[] = IAccountManager::PROPERTY_PHONE;

 		$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;

 		$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;

@@ -756,14 +753,9 @@

 					$permittedFields[] = self::USER_FIELD_DISPLAYNAME;

 					$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;

 				}

-				$permittedFields[] = IAccountManager::PROPERTY_EMAIL;

@@ -879,9 +879,9 @@

 			}

 

 			$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX;

-			$permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX;

-

+			//$permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX;

 

-			$permittedFields[] = IAccountManager::COLLECTION_EMAIL;

-

+			//$permittedFields[] = IAccountManager::COLLECTION_EMAIL;

 

 			$permittedFields[] = self::USER_FIELD_PASSWORD;

 			$permittedFields[] = self::USER_FIELD_NOTIFICATION_EMAIL;
 
 			if (