feat(core): Add URL encryption for GDPR compliancy

Alinto · Dec 22, 2023 · 10d789f · 10d789f
1 parent d505b87
commit 10d789f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc
@@ -826,20 +826,17 @@ specified as an array of dictionaries.
 |D |SOGoCreateIdentitiesDisabled
 |Disable identity creation for users in preferences. If `YES`, users won't be able to add new identities and will allow to change only full name, signature and default identity. Default value is `NO`. Note : If this settings is set to `YES`, it will not be possible to crete auxiliary mail accounts.
 
-<<<<<<< HEAD
 |S |SOGoURLEncryptionEnabled
-|Enable URL encryption to make SOGo GDPR compatible. Setting this parameter to `YES` will encrypt username in URL. The encryption data are cached to avoid high cpu usage. If the encryption is enabled, the DAV url will change. Default value is `NO`.
-||||||| 65f833625
-=======
+|Enable URL encryption to make SOGo GDPR compatible. Setting this parameter to `YES` will encrypt username in URL. The encryption data are cached to avoid high cpu usage, ig the value of thie parameter is changed, memcached server needs to be restarted. If the encryption is enabled, the DAV url will change. Default value is `NO`.
+
+|S |SOGoURLEncryptionPassphrase
+|Passphrase for `SOGoURLEncryptionEnabled`. The string must be 128 bits (16 characters). If this settings change, the cache server must be restarted, and the DAV url will change. Default value is `SOGoSuperSecret0`.
+
 |S |SOGoGlobalAddressBookFirstEntries
 |Display first entries in Global Address Book. Default value is `NO`. If source is LDAP, the LDAP overlay `sssvlv` must be enabled on the system for server side sorting.
 
 |S |SOGoGlobalAddressBookFirstEntriesCount
 |Number of entries displayed when `SOGoGlobalAddressBookFirstEntries` is enabled. Default value is `100`.
->>>>>>> master
-
-|S |SOGoURLEncryptionPassphrase
-|Passphrase for `SOGoURLEncryptionEnabled`. The string must be 128 bits (16 characters). If this settings change, the cache server must be restarted, and the DAV url will change. Default value is `SOGoSuperSecret0`.
 
 |=======================================================================
 

diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
@@ -47,7 +47,7 @@
 
 #import "SOGoUser.h"
 
-static const NSString *kEncryptedUserNamePrefix = @"uenc-";
+static const NSString *kEncryptedUserNamePrefix = @"uenc";
 
 @implementation SoUser (SOGoExtension)
 
@@ -1213,11 +1213,13 @@ + (NSString *) getEncryptedUsernameIfNeeded:(NSString *)username withContext:(WO
 
   request = [context request];
   cache = [SOGoCache sharedCache];
-  cacheKey = [NSString stringWithFormat: @"%@%@%@", kEncryptedUserNamePrefix, username, [request requestHandlerKey]];
+  cacheKey = [NSString stringWithFormat: @"%@_%@_%@", kEncryptedUserNamePrefix, username, [request requestHandlerKey]];
+
   exception = nil;
   tmp = nil;
 
   tmp = [cache valueForKey: cacheKey];
+  NSLog(@"DKEY %@ - %@", cacheKey, tmp);
   if (tmp) {
     return tmp;
   } else {
@@ -1249,7 +1251,7 @@ + (NSString *) getDecryptedUsernameIfNeeded:(NSString *)username withContext:(WO
 
   request = [context request];
   cache = [SOGoCache sharedCache];
-  cacheKey = [NSString stringWithFormat: @"%@%@%@", kEncryptedUserNamePrefix, username, [request requestHandlerKey]];
+  cacheKey = [NSString stringWithFormat: @"%@_%@_%@", kEncryptedUserNamePrefix, username, [request requestHandlerKey]];
   exception = nil;
   tmp = nil;