6.4.10 (#1380)

- Don't accept forbidden control characters as chat input 
- Update ssdp implementation to version 0.4
- Fix some more bugs

Author: tmolitor-stud-tu

.github/workflows/beta.build-push.yml

@@ -9,6 +9,8 @@ on:
 
   workflow_dispatch:
 
+permissions: {}
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
@@ -27,6 +29,9 @@ jobs:
       EXPORT_OPTIONS_CATALYST_APPSTORE: "../scripts/exportOptions/Stable_Catalyst_ExportOptions.plist"
       EXPORT_OPTIONS_CATALYST_APP_EXPORT: "../scripts/exportOptions/Beta_Catalyst_ExportOptions.plist"
       EXPORT_OPTIONS_IOS: "../scripts/exportOptions/Beta_iOS_ExportOptions.plist"
+    permissions:
+      actions: write # needed to upload artifacts
+      contents: write # needed for git push
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v4
@@ -250,6 +255,8 @@ jobs:
       APP_NAME: "Monal"
       APP_DIR: "Monal.app"
       BUILD_TYPE: "Beta"
+    permissions:
+      contents: write # needed for git push in updateLocalization
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v4

.github/workflows/create-stable-pr.yml

@@ -5,9 +5,13 @@ on:
     branches: [ beta ]
   workflow_dispatch:
 
+permissions: {}
+
 jobs:
   create-pull-request:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
       - name: Checkout Beta Branch
         uses: actions/checkout@v4

.github/workflows/develop-push.yml

@@ -9,6 +9,8 @@ on:
 
   workflow_dispatch:
 
+permissions: {}
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
@@ -27,6 +29,8 @@ jobs:
       ALPHA_UPLOAD_SECRET: ${{ secrets.ALPHA_UPLOAD_SECRET }}
       EXPORT_OPTIONS_CATALYST_APP_EXPORT: "../scripts/exportOptions/Alpha_Catalyst_ExportOptions.plist"
       EXPORT_OPTIONS_IOS: "../scripts/exportOptions/Alpha_iOS_ExportOptions.plist"
+    permissions:
+      actions: write # needed to upload artifacts
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v4

.github/workflows/pr-semver-title.yml

@@ -13,6 +13,8 @@ on:
         required: true
         type: number
 
+permissions: {}
+
 jobs:
   check-pr-semver-title:
     runs-on: ubuntu-latest

.github/workflows/publish-quicksy-release.yml

@@ -2,6 +2,7 @@ name: Publish Quicksy release
 on:
   repository_dispatch:
     types: [quicksy_release]
+permissions: {}
 jobs:
   extractChangelog:
     runs-on: self-hosted

.github/workflows/publish-stable-release.yml

@@ -2,6 +2,7 @@ name: Publish release
 on:
   repository_dispatch:
     types: [monal_release]
+permissions: {}
 jobs:
   extractChangelog:
     runs-on: self-hosted
@@ -34,6 +35,8 @@ jobs:
     name: Promote draft release to live release
     runs-on: ubuntu-latest
     needs: [extractChangelog]
+    permissions:
+      contents: write
     steps:
       - name: Promote draft release to live release
         run: |

.github/workflows/quicksy.build-push.yml

@@ -9,6 +9,8 @@ on:
 
   workflow_dispatch:
 
+permissions: {}
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
@@ -20,6 +22,9 @@ jobs:
       BUILD_SCHEME: "Quicksy"
       BUILD_TYPE: "AppStore-Quicksy"
       EXPORT_OPTIONS_IOS: "../scripts/exportOptions/Quicksy_Stable_iOS_ExportOptions.plist"
+    permissions:
+      actions: write # needed to upload artifacts
+      contents: write # needed for git push
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v4

.github/workflows/stable.build-push.yml

@@ -9,6 +9,8 @@ on:
 
   workflow_dispatch:
 
+permissions: {}
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
@@ -23,6 +25,9 @@ jobs:
       EXPORT_OPTIONS_CATALYST_APPSTORE: "../scripts/exportOptions/Stable_Catalyst_ExportOptions.plist"
       EXPORT_OPTIONS_CATALYST_APP_EXPORT: "../scripts/exportOptions/Beta_Catalyst_ExportOptions.plist"
       EXPORT_OPTIONS_IOS: "../scripts/exportOptions/Stable_iOS_ExportOptions.plist"
+    permissions:
+      actions: write # needed to upload artifacts
+      contents: write # needed for git push
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v4

.github/workflows/update-translations.yml

@@ -5,6 +5,8 @@ name: update-translations
 on:
   workflow_dispatch:
 
+permissions: {}
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
@@ -18,6 +20,8 @@ jobs:
       EXPORT_OPTIONS_CATALYST_APPSTORE: "../scripts/exportOptions/Stable_Catalyst_ExportOptions.plist"
       EXPORT_OPTIONS_CATALYST_APP_EXPORT: "../scripts/exportOptions/Beta_Catalyst_ExportOptions.plist"
       EXPORT_OPTIONS_IOS: "../scripts/exportOptions/Beta_iOS_ExportOptions.plist"
+    permissions:
+      contents: write # needed for git push in updateLocalization
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v4

Monal/Classes/DebugView.swift

@@ -144,6 +144,10 @@ struct CrashTestingView: View {
                     Toggle(isOn: $defaultDB.hasCompletedOnboarding) {
                         Text("Don't show onboarding")
                     }
+
+                    Button("Reset the state of all accounts") {
+                        MLXMPPManager.sharedInstance().resetAllAccountStates()
+                    }
                 }
 
                 Text("The following buttons allow you to forcefully crash the app using several different methods to test the crash handling.")

Monal/Classes/HelperTools.h

@@ -203,6 +203,7 @@ void swizzle(Class c, SEL orig, SEL new);
 +(NSNumber*) currentTimestampInSeconds;
 +(NSNumber*) dateToNSNumberSeconds:(NSDate*) date;
 
++(NSString*) removeInvalidXMLCharactersFromString:(NSString*) inputString;
 +(BOOL) constantTimeCompareAttackerString:(NSString* _Nonnull) str1 withKnownString:(NSString* _Nonnull) str2;
 
 +(BOOL) isIP:(NSString*) host;

Monal/Classes/HelperTools.m

@@ -93,6 +93,7 @@ -(void) swizzled_queueLogMessage:(DDLogMessage*) logMessage asynchronously:(BOOL
 static NSObject* _suspensionHandling_lock = nil;
 static BOOL _suspensionHandling_isSuspended = NO;
 static NSMutableDictionary* _versionInfoCache;
+static NSCharacterSet* _invalidXMLCharacters;
 static MLStreamRedirect* _stdoutRedirector = nil;
 static MLStreamRedirect* _stderrRedirector = nil;
 static volatile void (*_oldExceptionHandler)(NSException*) = NULL;
@@ -378,6 +379,25 @@ +(void) initialize
     u_int32_t i = arc4random();
     _processID = [self hexadecimalString:[NSData dataWithBytes:&i length:sizeof(i)]];
 
+    //values taken from https://www.w3.org/TR/2008/REC-xml-20081126/#charsets
+    NSMutableCharacterSet* validXMLCharacters = [NSMutableCharacterSet characterSetWithCharactersInString:@"\t\n\r"]; // #x9, #xA, #xD
+    [validXMLCharacters formUnionWithCharacterSet:[NSCharacterSet characterSetWithRange:NSMakeRange(0x20, 0xD7FF - 0x20 + 1)]];
+    [validXMLCharacters formUnionWithCharacterSet:[NSCharacterSet characterSetWithRange:NSMakeRange(0xE000, 0xFFFD - 0xE000 + 1)]];
+    [validXMLCharacters formUnionWithCharacterSet:[NSCharacterSet characterSetWithRange:NSMakeRange(0x10000, 0x10FFFF - 0x10000 + 1)]];
+
+    NSMutableString* notRecommendedXMLCharacters = [NSMutableString new];
+    for(unichar i = 0x007F; i <= 0x0084; i++)
+        [notRecommendedXMLCharacters appendFormat:@"%C", i];
+
+    for(unichar i = 0x0086; i <= 0x009F; i++)
+        [notRecommendedXMLCharacters appendFormat:@"%C", i];
+
+    for(unichar i = 0xFDD0; i <= 0xFDEF; i++)
+        [notRecommendedXMLCharacters appendFormat:@"%C", i];
+
+    [validXMLCharacters removeCharactersInString:notRecommendedXMLCharacters];
+    _invalidXMLCharacters = [validXMLCharacters invertedSet];
+
     //shamelessly stolen from utils.ip in conversations source
     IPV4 = [NSRegularExpression regularExpressionWithPattern:@"\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z" options:0 error:nil];
     IPV6_HEX4DECCOMPRESSED = [NSRegularExpression regularExpressionWithPattern:@"\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::((?:[0-9A-Fa-f]{1,4}:)*)(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z" options:0 error:nil];
@@ -2913,6 +2933,11 @@ +(NSArray*) splitString:(NSString*) string withSeparator:(NSString*) separator a
     return result;
 }
 
++(NSString*) removeInvalidXMLCharactersFromString:(NSString*) inputString
+{
+    return [[inputString componentsSeparatedByCharactersInSet:_invalidXMLCharacters] componentsJoinedByString:@""];
+}
+
 //see https://nachtimwald.com/2017/04/02/constant-time-string-comparison-in-c/
 +(BOOL) constantTimeCompareAttackerString:(NSString* _Nonnull) str1 withKnownString:(NSString* _Nonnull) str2
 {

Monal/Classes/MLConstants.h

@@ -88,19 +88,19 @@ typedef NS_ENUM(NSUInteger, MLAudioState) {
 //some useful macros
 #define weakify(var)                        __weak __typeof__(var) AHKWeak_##var = var
 #define strongify(var)                      _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wshadow\"") __strong __typeof__(var) var = AHKWeak_##var; _Pragma("clang diagnostic pop")
-#define nilWrapper(var)                     (var == nil ? (id)[NSNull null] : (id)var)
-#define nilExtractor(var)                   ((id)var == [NSNull null] ? nil : var)
-#define nilDefault(var, def)                (var == nil || (id)var == [NSNull null] ? def : var)
+#define nilWrapper(var)                     ({id _var=(id)(var); _var == nil ? [NSNull null] : _var;})
+#define nilExtractor(var)                   ({id _var=(id)(var); _var == [NSNull null] ? nil : _var;})
+#define nilDefault(var, def)                ({id _var=(id)(var); _var == nil || _var == [NSNull null] ? (id)(def) : _var;})
 #define nilDefaultEnum(var, def)            (((NSNumber*)nilDefault(var, def)).integerValue)
 #define nilDefaultBool(var, def)            (((NSNumber*)nilDefault(var, def)).boolValue)
 #define nilDefaultInt(var, def)             (((NSNumber*)nilDefault(var, def)).intValue)
 #define nilDefaultDouble(var, def)          (((NSNumber*)nilDefault(var, def)).doubleValue)
-#define emptyDefault(var, eq, def)          (var == nil || (id)var == [NSNull null] || [var isEqual:eq] ? def : var)
-#define updateIfIdNotEqual(a, b)            if(a != b && ![a isEqual:b]) a = b
-#define updateIfPrimitiveNotEqual(a, b)     if(a != b) a = b
+#define emptyDefault(var, eq, def)          ({id _var=(id)(var); _var == nil || _var == [NSNull null] || [_var isEqual:(eq)] ? (def) : _var;})
+#define updateIfIdNotEqual(a, b)            if((a) != (b) && ![(a) isEqual:(b)]) (a) = (b)
+#define updateIfPrimitiveNotEqual(a, b)     if((a) != (b)) (a) = (b)
 #define var                                 __auto_type 
 #define let                                 const __auto_type
-#define bool2str(b)                         (b ? @"YES" : @"NO")
+#define bool2str(b)                         ((b) ? @"YES" : @"NO")
 
 #define min(a, b) \
     ({ __typeof__ (a) _a = (a); \

Monal/Classes/MLXMPPManager.h

@@ -48,6 +48,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 -(void) connectAccount:(NSNumber*) accountNo;
 
+/**
+ does a full reset for every account, as if they were freshly created
+*/
+-(void) resetAllAccountStates;
+
 #pragma mark XMPP commands
 /**
  Remove a contact from an account

Monal/Classes/MLXMPPManager.m

@@ -615,6 +615,22 @@ -(void) disconnectAll
     DDLogVerbose(@"manager disconnecAll done");
 }
 
+-(void) resetAllAccountStates
+{
+    //make sure now account transitions from enabled to disabled while resetting everything
+    //(accounts transitioned, will still be present in connectedXMPP and thus resetted by [xmppAccount resetAccountState], too)
+    @synchronized(_connectedXMPP) {
+        //reset disabled accounts
+        NSMutableDictionary* newState = [xmpp invalidateState:nil];
+        for(NSDictionary* account in [[DataLayer sharedInstance] accountList])
+            if(![account[kEnabled] boolValue])
+                [[DataLayer sharedInstance] persistState:newState forAccount:account[kAccountID]];
+        
+        //reset enabled accounts
+        for(xmpp* xmppAccount in [self connectedXMPP])
+            [xmppAccount resetAccountState];
+    }
+}
 -(void) connectIfNecessary
 {
     DDLogVerbose(@"manager connectIfNecessary");

Monal/Classes/SCRAM.m

@@ -69,11 +69,11 @@ -(void) setSSDPMechanisms:(NSArray<NSString*>*) mechanisms andChannelBindingType
     MLAssert(!_serverFirstMessageParsed, @"SCRAM handler already parsed server-first-message!");
     DDLogVerbose(@"Creating SDDP string: %@\n%@", mechanisms, cbTypes);
     NSMutableString* ssdpString = [NSMutableString new];
-    [ssdpString appendString:[[mechanisms sortedArrayUsingSelector:@selector(compare:)] componentsJoinedByString:@","]];
+    [ssdpString appendString:[[mechanisms sortedArrayUsingSelector:@selector(compare:)] componentsJoinedByString:@"\x1e"]];
     if(cbTypes != nil)
     {
-        [ssdpString appendString:@"|"];
-        [ssdpString appendString:[[cbTypes sortedArrayUsingSelector:@selector(compare:)] componentsJoinedByString:@","]];
+        [ssdpString appendString:@"\x1f"];
+        [ssdpString appendString:[[cbTypes sortedArrayUsingSelector:@selector(compare:)] componentsJoinedByString:@"\x1e"]];
     }
     _ssdpString = [ssdpString copy];
     DDLogVerbose(@"SDDP string is now: %@", _ssdpString);
@@ -112,12 +112,12 @@ -(MLScramStatus) parseServerFirstMessage:(NSString*) str
     _salt = [HelperTools dataWithBase64EncodedString:msg[@"s"]];
     _iterationCount = (uint32_t)[msg[@"i"] integerValue];
     //check if SSDP downgrade protection triggered, if provided
-    if(msg[@"d"] != nil && _ssdpString != nil)
+    if(msg[@"h"] != nil && _ssdpString != nil)
     {
         _ssdpSupported = YES;
         //calculate base64 encoded SSDP hash and compare it to server sent value
         NSString* ssdpHash =[HelperTools encodeBase64WithData:[self hash:[_ssdpString dataUsingEncoding:NSUTF8StringEncoding]]];
-        if(![HelperTools constantTimeCompareAttackerString:msg[@"d"] withKnownString:ssdpHash])
+        if(![HelperTools constantTimeCompareAttackerString:msg[@"h"] withKnownString:ssdpHash])
             return MLScramStatusSSDPTriggered;
     }
     if(_iterationCount < 4096)

Monal/Classes/chatViewController.m

@@ -1144,6 +1144,8 @@ -(void) resignTextView
 
     // Trim leading spaces
     NSString* cleanString = [self.chatInput.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+    cleanString = [HelperTools removeInvalidXMLCharactersFromString:cleanString];
+
     // Only send msg that have at least one character
     if(cleanString.length > 0)
     {

Monal/Classes/xmpp.h

@@ -116,6 +116,7 @@ typedef void (^monal_iq_handler_t)(XMPPIQ* _Nullable);
 -(void) disconnect:(BOOL) explicitLogout;
 -(void) reconnect;
 -(void) reconnect:(double) wait;
+-(void) resetAccountState;
 
 -(void) setPubSubNotificationsForNodes:(NSArray* _Nonnull) nodes persistState:(BOOL) persistState;
 
@@ -235,7 +236,7 @@ typedef void (^monal_iq_handler_t)(XMPPIQ* _Nullable);
 -(void) publishStatusMessage:(NSString*) message;
 -(void) delayIncomingMessageStanzasForArchiveJid:(NSString*) archiveJid;
 
-+(NSMutableDictionary*) invalidateState:(NSDictionary*) dic;
++(NSMutableDictionary*) invalidateState:(NSDictionary* _Nullable) dic;
 -(void) updateIqHandlerTimeouts;
 
 -(void) addReconnectionHandler:(MLHandler*) handler;

Monal/Classes/xmpp.m

@@ -1306,6 +1306,24 @@ -(void) reconnectWithStreamError:(MLXMLNode* _Nullable) streamError andWaitingTi
     }];
 }
 
+-(void) resetAccountState
+{
+    NSMutableDictionary* newState = [xmpp invalidateState:nil];
+    if([[DataLayer sharedInstance] isAccountEnabled:self.accountNo])
+    {
+        [self dispatchAsyncOnReceiveQueue: ^{
+            [self disconnect:YES];      //make sure we are in a safe state before resetting our state
+            [[DataLayer sharedInstance] persistState:newState forAccount:self.accountNo];
+            [self connect];             //this will reread persisted state saved above
+        }];
+    }
+    else
+    {
+        [[DataLayer sharedInstance] persistState:newState forAccount:self.accountNo];
+        [self readState];               //better safe than sorry
+    }
+}
+
 #pragma mark XMPP
 
 -(void) prepareXMPPParser