add discovered stun / turn servers to ServerDetails UI

Also switch from green/yellow/red to blue/orange/red

Monal/Classes/MLServerDetails.m

@@ -13,6 +13,7 @@
 @interface MLServerDetails ()
 
 @property (nonatomic, strong) NSMutableArray* serverCaps;
+@property (nonatomic, strong) NSMutableArray* stunTurnServers;
 @property (nonatomic, strong) NSMutableArray* srvRecords;
 @property (nonatomic, strong) NSMutableArray* tlsVersions;
 @property (nonatomic, strong) NSMutableArray* saslMethods;
@@ -24,21 +25,28 @@ @implementation MLServerDetails
 
 enum MLServerDetailsSections {
     SUPPORTED_SERVER_XEPS_SECTION,
+    VOIP_SECTION,
     SRV_RECORS_SECTION,
     TLS_SECTION,
     SASL_SECTION,
     CB_SECTION,
     ML_SERVER_DETAILS_SECTIONS_CNT
 };
 
-- (void)viewDidLoad {
+#define SERVER_DETAILS_COLOR_OK @"Blue"
+#define SERVER_DETAILS_COLOR_NON_IDEAL @"Orange"
+#define SERVER_DETAILS_COLOR_ERROR @"Red"
+
+- (void) viewDidLoad
+{
     [super viewDidLoad];
 }
 
--(void) viewWillAppear:(BOOL)animated
+-(void) viewWillAppear:(BOOL) animated
 {
     [super viewWillAppear:animated];
     self.serverCaps = [NSMutableArray new];
+    self.stunTurnServers = [NSMutableArray new];
     self.srvRecords = [NSMutableArray new];
     self.tlsVersions = [NSMutableArray new];
     self.saslMethods = [NSMutableArray new];
@@ -52,6 +60,8 @@ -(void) viewWillAppear:(BOOL)animated
     [self checkTLSVersions:self.xmppAccount.connectionProperties];
     [self checkSASLMethods:self.xmppAccount.connectionProperties];
     [self checkChannelBindingTypes:self.xmppAccount.connectionProperties];
+
+    [self checkStunServers:self.xmppAccount.connectionProperties.discoveredStunTurnServers];
 }
 
 - (void)didReceiveMemoryWarning {
@@ -65,102 +75,127 @@ -(void) checkServerCaps:(MLXMPPConnection*) connection
         // see MLIQProcessor.m multiple xep required for pubsub
         @"Title":NSLocalizedString(@"XEP-0163 Personal Eventing Protocol", @""),
         @"Description":NSLocalizedString(@"This specification defines semantics for using the XMPP publish-subscribe protocol to broadcast state change events associated with an instant messaging and presence account.", @""),
-        @"Color": connection.supportsPubSub ? (connection.supportsModernPubSub ? @"Green" : @"Yellow") : @"Red"
+        @"Color": connection.supportsPubSub ? (connection.supportsModernPubSub ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_NON_IDEAL) : SERVER_DETAILS_COLOR_ERROR
     }];
 
     // supportsBlocking
     [self.serverCaps addObject:@{
         @"Title":NSLocalizedString(@"XEP-0191: Blocking Command", @""),
         @"Description":NSLocalizedString(@"XMPP protocol extension for communications blocking.", @""),
-        @"Color": connection.supportsBlocking ? @"Green" : @"Red"
+        @"Color": connection.supportsBlocking ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_ERROR
     }];
 
     // supportsSM3
     [self.serverCaps addObject:@{
         @"Title":NSLocalizedString(@"XEP-0198: Stream Management", @""),
         @"Description":NSLocalizedString(@"Resume a stream when disconnected. Results in faster reconnect and saves battery life.", @""),
-        @"Color": connection.supportsSM3 ? @"Green" : @"Red"
+        @"Color": connection.supportsSM3 ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_ERROR
     }];
 
     // supportsPing
     [self.serverCaps addObject:@{
         @"Title":NSLocalizedString(@"XEP-0199: XMPP Ping", @""),
         @"Description":NSLocalizedString(@"XMPP protocol extension for sending application-level pings over XML streams.", @""),
-        @"Color": connection.supportsPing ? @"Green" : @"Red"
+        @"Color": connection.supportsPing ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_ERROR
     }];
 
     // supportsExternalServiceDiscovery
     [self.serverCaps addObject:@{
         @"Title":NSLocalizedString(@"XEP-0215: External Service Discovery", @""),
         @"Description":NSLocalizedString(@"XMPP protocol extension for discovering services external to the XMPP network, like STUN or TURN servers needed for A/V calls.", @""),
-        @"Color": connection.supportsExternalServiceDiscovery ? @"Green" : @"Red"
+        @"Color": connection.supportsExternalServiceDiscovery ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_ERROR
     }];
 
     // supportsRosterVersion
     [self.serverCaps addObject:@{
         @"Title":NSLocalizedString(@"XEP-0237: Roster Versioning", @""),
         @"Description":NSLocalizedString(@"Defines a proposed modification to the XMPP roster protocol that enables versioning of rosters such that the server will not send the roster to the client if the roster has not been modified.", @""),
-        @"Color": connection.supportsRosterVersion ? @"Green" : @"Red"
+        @"Color": connection.supportsRosterVersion ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_ERROR
     }];
 
     // usingCarbons2
     [self.serverCaps addObject:@{
         @"Title":NSLocalizedString(@"XEP-0280: Message Carbons", @""),
         @"Description":NSLocalizedString(@"Synchronize your messages on all loggedin devices.", @""),
-        @"Color": connection.usingCarbons2 ? @"Green" : @"Red"
+        @"Color": connection.usingCarbons2 ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_ERROR
     }];
 
     // supportsMam2
     [self.serverCaps addObject:@{
         @"Title":NSLocalizedString(@"XEP-0313: Message Archive Management", @""),
         @"Description":NSLocalizedString(@"Access message archives on the server.", @""),
-        @"Color": connection.supportsMam2 ? @"Green" : @"Red"
+        @"Color": connection.supportsMam2 ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_ERROR
     }];
 
     // supportsClientState
     [self.serverCaps addObject:@{
         @"Title":NSLocalizedString(@"XEP-0352: Client State Indication", @""),
         @"Description":NSLocalizedString(@"Indicate when a particular device is active or inactive. Saves battery.", @""),
-        @"Color": connection.supportsClientState ? @"Green" : @"Red"
+        @"Color": connection.supportsClientState ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_ERROR
     }];
 
     // supportsPush / pushEnabled
     [self.serverCaps addObject:@{
         @"Title":NSLocalizedString(@"XEP-0357: Push Notifications", @""),
         @"Description":NSLocalizedString(@"Receive push notifications via Apple even when disconnected. Vastly improves reliability.", @""),
-        @"Color": connection.supportsPush ? (connection.pushEnabled ? @"Green" : @"Yellow") : @"Red"
+        @"Color": connection.supportsPush ? (connection.pushEnabled ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_NON_IDEAL) : SERVER_DETAILS_COLOR_ERROR
     }];
 
     // supportsHTTPUpload
     [self.serverCaps addObject:@{
         @"Title":NSLocalizedString(@"XEP-0363: HTTP File Upload", @""),
         @"Description":[NSString stringWithFormat:NSLocalizedString(@"Upload files to the server to share with others. (Maximum allowed size of files reported by the server: %@)", @""), [HelperTools bytesToHuman:connection.uploadSize]],
-        @"Color": connection.supportsHTTPUpload ? @"Green" : @"Red"
+        @"Color": connection.supportsHTTPUpload ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_ERROR
     }];
 
     // supportsRosterPreApproval
     [self.serverCaps addObject:@{
         @"Title":NSLocalizedString(@"XEP-0379: Pre-Authenticated Roster Subscription", @""),
         @"Description":NSLocalizedString(@"Defines a protocol and URI scheme for pre-authenticated roster links that allow a third party to automatically obtain the user's presence subscription.", @""),
-        @"Color": connection.supportsRosterPreApproval ? @"Green" : @"Red"
+        @"Color": connection.supportsRosterPreApproval ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_ERROR
     }];
 
     // supportsSSDP
     [self.serverCaps addObject:@{
         // see MLIQProcessor.m multiple xep required for pubsub
         @"Title":NSLocalizedString(@"XEP-0474: SASL SCRAM Downgrade Protection", @""),
         @"Description":NSLocalizedString(@"This specification provides a way to secure the SASL and SASL2 handshakes against method and channel-binding downgrades.", @""),
-        @"Color": connection.supportsSSDP ? @"Green" : @"Red"
+        @"Color": connection.supportsSSDP ? SERVER_DETAILS_COLOR_OK : SERVER_DETAILS_COLOR_ERROR
     }];
 }
 
+-(void) checkStunServers:(NSMutableArray<NSDictionary*>*) stunTurnServers
+{
+    for(NSDictionary* service in stunTurnServers)
+    {
+        NSString* color;
+        if(service[@"type"] && ([service[@"type"] isEqualToString:@"stun"] || [service[@"type"] isEqualToString:@"turn"]))
+        {
+            color = SERVER_DETAILS_COLOR_OK;
+        }
+        else if(service[@"type"] && ([service[@"type"] isEqualToString:@"stuns"] || [service[@"type"] isEqualToString:@"turns"]))
+        {
+            color = SERVER_DETAILS_COLOR_OK;
+        }
+        else
+        {
+            color = SERVER_DETAILS_COLOR_ERROR;
+        }
+        [self.stunTurnServers addObject:@{
+            @"Title": service[@"type"],
+            @"Description": [NSString stringWithFormat:@"%@:%@", service[@"host"], service[@"port"]],
+            @"Color": color
+        }];
+    }
+}
+
 -(void) convertSRVRecordsToReadable
 {
     BOOL foundCurrentConn = NO;
 
     if(self.xmppAccount.discoveredServersList == nil || self.xmppAccount.discoveredServersList.count == 0)
     {
-        [self.srvRecords addObject:@{@"Title": NSLocalizedString(@"None", @""), @"Description":NSLocalizedString(@"This server does not have any SRV records in DNS.", @""), @"Color":@"Red"}];
+        [self.srvRecords addObject:@{@"Title": NSLocalizedString(@"None", @""), @"Description":NSLocalizedString(@"This server does not have any SRV records in DNS.", @""), @"Color":SERVER_DETAILS_COLOR_ERROR}];
             return;
     }
 
@@ -177,14 +212,14 @@ -(void) convertSRVRecordsToReadable
            self.xmppAccount.connectionProperties.server.connectPort == port &&
            self.xmppAccount.connectionProperties.server.isDirectTLS == [[srvEntry objectForKey:@"isSecure"] boolValue])
         {
-            entryColor = @"Green";
+            entryColor = SERVER_DETAILS_COLOR_OK;
             foundCurrentConn = YES;
         }
         else if(!foundCurrentConn)
         {
             // Set the color of all connections entries that failed to red
             // discoveredServersList is sorted. Therfore all entries before foundCurrentConn == YES have failed
-            entryColor = @"Red";
+            entryColor = SERVER_DETAILS_COLOR_ERROR;
         }
 
         [self.srvRecords addObject:@{@"Title": [NSString stringWithFormat:NSLocalizedString(@"Server: %@", @""), hostname], @"Description": [NSString stringWithFormat:NSLocalizedString(@"Port: %@, Direct TLS: %@, Priority: %@", @""), port, isSecure, prio], @"Color": entryColor}];
@@ -194,8 +229,8 @@ -(void) convertSRVRecordsToReadable
 -(void) checkTLSVersions:(MLXMPPConnection*) connection
 {
     DDLogVerbose(@"connection uses tls version: %@", connection.tlsVersion);
-    [self.tlsVersions addObject:@{@"Title": NSLocalizedString(@"TLS 1.2", @""), @"Description":NSLocalizedString(@"Older, slower, but still secure TLS version", @""), @"Color":([@"1.2" isEqualToString:connection.tlsVersion] ? @"Green" : @"None")}];
-    [self.tlsVersions addObject:@{@"Title": NSLocalizedString(@"TLS 1.3", @""), @"Description":NSLocalizedString(@"Newest TLS version which is faster than TLS 1.2", @""), @"Color":([@"1.3" isEqualToString:connection.tlsVersion] ? @"Green" : @"None")}];
+    [self.tlsVersions addObject:@{@"Title": NSLocalizedString(@"TLS 1.2", @""), @"Description":NSLocalizedString(@"Older, slower, but still secure TLS version", @""), @"Color":([@"1.2" isEqualToString:connection.tlsVersion] ? SERVER_DETAILS_COLOR_OK : @"None")}];
+    [self.tlsVersions addObject:@{@"Title": NSLocalizedString(@"TLS 1.3", @""), @"Description":NSLocalizedString(@"Newest TLS version which is faster than TLS 1.2", @""), @"Color":([@"1.3" isEqualToString:connection.tlsVersion] ? SERVER_DETAILS_COLOR_OK : @"None")}];
     DDLogVerbose(@"tls versions: %@", self.tlsVersions);
 }
 
@@ -204,7 +239,7 @@ -(void) checkSASLMethods:(MLXMPPConnection*) connection
     DDLogVerbose(@"saslMethods: %@", connection.saslMethods);
     if(connection.saslMethods == nil || connection.saslMethods.count == 0)
     {
-        [self.saslMethods addObject:@{@"Title": NSLocalizedString(@"None", @""), @"Description":NSLocalizedString(@"This server does not support modern SASL2 authentication.", @""), @"Color":@"Red"}];
+        [self.saslMethods addObject:@{@"Title": NSLocalizedString(@"None", @""), @"Description":NSLocalizedString(@"This server does not support modern SASL2 authentication.", @""), @"Color":SERVER_DETAILS_COLOR_ERROR}];
         return;
     }
     for(NSString* method in [connection.saslMethods.allKeys sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"self" ascending:YES]]])
@@ -220,7 +255,7 @@ -(void) checkSASLMethods:(MLXMPPConnection*) connection
             description = NSLocalizedString(@"Salted Challenge Response Authentication Mechanism using the given Hash Method additionally secured by Channel-Binding", @"");
         else if([method hasPrefix:@"SCRAM-"])
             description = NSLocalizedString(@"Salted Challenge Response Authentication Mechanism using the given Hash Method", @"");
-        [self.saslMethods addObject:@{@"Title": [NSString stringWithFormat:NSLocalizedString(@"Method: %@", @""), method], @"Description":description, @"Color":(used ? @"Green" : (!supported ? @"Yellow" : @"None"))}];
+        [self.saslMethods addObject:@{@"Title": [NSString stringWithFormat:NSLocalizedString(@"Method: %@", @""), method], @"Description":description, @"Color":(used ? SERVER_DETAILS_COLOR_OK : (!supported ? SERVER_DETAILS_COLOR_NON_IDEAL : @"None"))}];
     }
 }
 
@@ -229,7 +264,7 @@ -(void) checkChannelBindingTypes:(MLXMPPConnection*) connection
     DDLogVerbose(@"channelBindingTypes: %@", connection.channelBindingTypes);
     if(connection.channelBindingTypes == nil || connection.channelBindingTypes.count == 0)
     {
-        [self.channelBindingTypes addObject:@{@"Title": NSLocalizedString(@"None", @""), @"Description":NSLocalizedString(@"This server does not support any modern channel-binding to secure against MITM attacks on the TLS layer.", @""), @"Color":@"Red"}];
+        [self.channelBindingTypes addObject:@{@"Title": NSLocalizedString(@"None", @""), @"Description":NSLocalizedString(@"This server does not support any modern channel-binding to secure against MITM attacks on the TLS layer.", @""), @"Color":SERVER_DETAILS_COLOR_ERROR}];
         return;
     }
     NSArray* supportedChannelBindingTypes = self.xmppAccount.supportedChannelBindingTypes;
@@ -242,7 +277,7 @@ -(void) checkChannelBindingTypes:(MLXMPPConnection*) connection
             description = NSLocalizedString(@"Secure channel-binding defined for TLS1.3 and some TLS1.2 connections.", @"");
         else if([type isEqualToString:@"tls-server-end-point"])
             description = NSLocalizedString(@"Weakest channel-binding type, not securing against stolen certs/keys, but detects wrongly issued certs.", @"");
-        [self.channelBindingTypes addObject:@{@"Title": [NSString stringWithFormat:NSLocalizedString(@"Type: %@", @""), type], @"Description":description, @"Color":(used ? @"Green" : (!supported ? @"Yellow" : @"None"))}];
+        [self.channelBindingTypes addObject:@{@"Title": [NSString stringWithFormat:NSLocalizedString(@"Type: %@", @""), type], @"Description":description, @"Color":(used ? SERVER_DETAILS_COLOR_OK : (!supported ? SERVER_DETAILS_COLOR_NON_IDEAL : @"None"))}];
     }
 }
 
@@ -257,6 +292,8 @@ -(NSInteger) tableView:(UITableView*) tableView numberOfRowsInSection:(NSInteger
 {
     if(section == SUPPORTED_SERVER_XEPS_SECTION)
         return (NSInteger)self.serverCaps.count;
+    else if(section == VOIP_SECTION)
+        return (NSInteger)self.stunTurnServers.count;
     else if(section == SRV_RECORS_SECTION)
         return (NSInteger)self.srvRecords.count;
     else if(section == TLS_SECTION)
@@ -275,6 +312,8 @@ -(UITableViewCell*) tableView:(UITableView*) tableView cellForRowAtIndexPath:(NS
     NSDictionary* dic;
     if(indexPath.section == SUPPORTED_SERVER_XEPS_SECTION)
         dic = [self.serverCaps objectAtIndex:(NSUInteger)indexPath.row];
+    if(indexPath.section == VOIP_SECTION)
+        dic = [self.stunTurnServers objectAtIndex:(NSUInteger)indexPath.row];
     else if(indexPath.section == SRV_RECORS_SECTION)
         dic = [self.srvRecords objectAtIndex:(NSUInteger)indexPath.row];
     else if(indexPath.section == TLS_SECTION)
@@ -295,12 +334,12 @@ -(UITableViewCell*) tableView:(UITableView*) tableView cellForRowAtIndexPath:(NS
         cell.textLabel.backgroundColor = UIColor.clearColor;
         cell.detailTextLabel.backgroundColor = UIColor.clearColor;
 
-        if([entryColor isEqualToString:@"Green"])
-            [cell setBackgroundColor:[UIColor colorWithRed:0 green:0.8 blue:0 alpha:0.2]];
-        else if([entryColor isEqualToString:@"Red"])
-            [cell setBackgroundColor:[UIColor colorWithRed:0.8 green:0 blue:0 alpha:0.2]];
-        else if([entryColor isEqualToString:@"Yellow"])
-            [cell setBackgroundColor:[UIColor colorWithRed:1.0 green:1.0 blue:0 alpha:0.2]];
+        if([entryColor isEqualToString:SERVER_DETAILS_COLOR_OK])
+            [cell setBackgroundColor:[UIColor colorWithRed:0 green:0 blue:0.9 alpha:0.2]];
+        else if([entryColor isEqualToString:SERVER_DETAILS_COLOR_ERROR])
+            [cell setBackgroundColor:[UIColor colorWithRed:1.0 green:0 blue:0 alpha:0.2]];
+        else if([entryColor isEqualToString:SERVER_DETAILS_COLOR_NON_IDEAL])
+            [cell setBackgroundColor:[UIColor colorWithRed:0.99 green:0.95 blue:0 alpha:0.2]];
         else
             [cell setBackgroundColor:nil];
     }
@@ -311,14 +350,16 @@ -(NSString*) tableView:(UITableView*) tableView titleForHeaderInSection:(NSInteg
 {
     if(section == SUPPORTED_SERVER_XEPS_SECTION)
         return NSLocalizedString(@"These are the modern XMPP capabilities Monal detected on your server after you have logged in.", @"");
+    if(section == VOIP_SECTION)
+        return NSLocalizedString(@"These are STUN and TURN services announced by your server. (blue entries are used by monal)", @"");
     else if(section == SRV_RECORS_SECTION)
         return NSLocalizedString(@"These are SRV resource records found for your domain.", @"");
     else if(section == TLS_SECTION)
         return NSLocalizedString(@"These are the TLS versions supported by Monal, the one used to connect to your server will be green.", @"");
     else if(section == SASL_SECTION)
-        return NSLocalizedString(@"These are the SASL2 methods your server supports (used one in green, yellow ones unsupported by Monal).", @"");
+        return NSLocalizedString(@"These are the SASL2 methods your server supports (used one in blue, orange ones unsupported by Monal).", @"");
     else if(section == CB_SECTION)
-        return NSLocalizedString(@"These are the channel-binding types your server supports to detect attacks on the TLS layer (used one in green, yellow ones unsupported by Monal).", @"");
+        return NSLocalizedString(@"These are the channel-binding types your server supports to detect attacks on the TLS layer (used one in blue, orange ones unsupported by Monal).", @"");
     return @"";
 }