From 9ef49bb56fcd13f4850c1bbbb5ba074b9b85060b Mon Sep 17 00:00:00 2001 From: smizrahi Date: Wed, 18 Oct 2023 16:37:08 +0200 Subject: [PATCH] feat(core): Add URL encryption for GDPR compliancy (fix some dav issues) --- SoObjects/SOGo/SOGoGCSFolder.m | 2 +- SoObjects/SOGo/SOGoPublicBaseFolder.m | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index 9ff8db637..9842705f1 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -533,7 +533,7 @@ static NSArray *childRecordFields = nil; publicParticle = @""; path = [NSString stringWithFormat: @"/%@/dav%@/%@/%@/%@/", appName, publicParticle, - [[self ownerInContext: nil] stringByEscapingURL], + [[SOGoUser getEncryptedUsernameIfNeeded:[self ownerInContext: nil] withContext: context] stringByEscapingURL], [[container nameInContainer] stringByEscapingURL], [[self realNameInContainer] stringByEscapingURL]]; currentDavURL = [self davURL]; diff --git a/SoObjects/SOGo/SOGoPublicBaseFolder.m b/SoObjects/SOGo/SOGoPublicBaseFolder.m index b26969a62..2e7f7fab7 100644 --- a/SoObjects/SOGo/SOGoPublicBaseFolder.m +++ b/SoObjects/SOGo/SOGoPublicBaseFolder.m @@ -32,9 +32,11 @@ acquire: (BOOL) acquire { id userFolder; + NSString *login; - if ([key length] > 0 && [SOGoUser userWithLogin: key roles: nil]) - userFolder = [SOGoUserFolder objectWithName: key inContainer: self]; + login = [SOGoUser getDecryptedUsernameIfNeeded: key withContext: localContext]; + if ([key length] > 0 && [SOGoUser userWithLogin: login roles: nil]) + userFolder = [SOGoUserFolder objectWithName: login inContainer: self]; else userFolder = nil;