MSTeams Fixes

- Fixed Kamailio option messages for MSTeams so that it works with any domain
- Fixed the Option Message Status Check
- Added styling to the MSTeams Test Connectivity tooltips

gui/modules/api/api_routes.py

@@ -1614,9 +1614,13 @@ def getOptionMessageStatus(domain):
     if response:
         response = response.decode('utf8').replace("'", '"')
         found_domain = response.find(domain)
-        if found_domain >= 0 and response.find("FLAGS: AP", found_domain):
-            return True
-    return False
+        if not found_domain:
+            return False
+        else:
+            found_inactive = response.find("FLAGS: IP", found_domain)
+            if found_inactive > 0:
+                return False
+    return True
 
 @api.route("/api/v1/domains/msteams/test/<string:domain>", methods=['GET'])
 @api_security
@@ -1642,12 +1646,14 @@ def testConnectivity(domain):
             # Get the IP address of the domain from Google  DNS
             resolver = dns.resolver.Resolver()
             resolver.nameservers = ['8.8.8.8']
-            answers = resolver.query(domain, 'A')
-            for a in answers:
-                # If the External IP and IP from DNS match then it passes the check
-                if a.to_text() == external_ip_addr:
-                    responsePayload['hostname_check'] = True
-
+            try:
+                answers = resolver.query(domain, 'A')
+                for a in answers:
+                 # If the External IP and IP from DNS match then it passes the check
+                    if a.to_text() == external_ip_addr:
+                        responsePayload['hostname_check'] = True
+            except:
+                pass
         # Check if Domain is the root of the CN
         # GoDaddy Certs Don't work with Microsoft Direct routing
         certInfo = isCertValid(domain,external_ip_addr,5061)

gui/static/js/msteams.js

@@ -37,7 +37,12 @@ function updateConnectivtyStatus(msg) {
   else {
     $("#tls_check").addClass("glyphicon glyphicon-remove");
     $("#tls_check").css("color","red");
-    $("#tls_check_row").tooltip({'title': "Cert commonname doesn't match the domain:" + JSON.stringify(msg.tls_check.tls_cert_details), 'placement': 'right', 'trigger': 'manual','tooltipClass': 'tooltipclass'}); 
+    if (msg.tls_check.tls_cert_details == '')
+		  error_msg="Certificate was not found";
+    else
+		  error_msg="Cert commonname doesn't match the domain:" + JSON.stringify(msg.tls_check.tls_cert_details);
+
+	  $("#tls_check_row").tooltip({'title': error_msg, 'placement': 'right', 'trigger': 'manual','tooltipClass': 'tooltipclass'}); 
     $("#tls_check_row").tooltip('show');
   }
 

kamailio/kamailio_dsiprouter.cfg

@@ -21,9 +21,9 @@
 ##!define WITH_DMQ
 #!define WITH_MSTEAMS
 #
-#!substdef "!INTERNAL_IP_ADDR!68.183.206.180!g"
-#!substdef "!INTERNAL_IP_NET!68.183.206.*!g"
-#!substdef "!EXTERNAL_IP_ADDR!68.183.206.180!g"
+#!substdef "!INTERNAL_IP_ADDR!159.203.32.114!g"
+#!substdef "!INTERNAL_IP_NET!159.203.32.*!g"
+#!substdef "!EXTERNAL_IP_ADDR!159.203.32.114!g"
 #!substdef "!EXTERNAL_FQDN!sbc3.dsiprouter.net!g"
 #!substdef "!SIP_PORT!5060!g"
 #!substdef "!SIPS_PORT!5061!g"
@@ -229,7 +229,7 @@ server.pbx_invite_timeout_aftertry = 52000 desc "PBX INVITE timeout value if a S
 
 # DSIPRouter API Server Settings
 server.api_server = "http://127.0.0.1:5000" desc "URL to the DSIPRouter API Server"
-server.api_token = "admin" desc "API Token for DSIPRouter API Server"
+server.api_token = "vmqkMcYFElJjSdPLx6zp4zeEYq1W4NZRmPm1aMcV07x0kYkJVn4XIHiv8qEJ84B0" desc "API Token for DSIPRouter API Server"
 
 ####### Modules Section ########
 
@@ -2110,8 +2110,9 @@ event_route[xhttp:request] {
 event_route[tm:local-request] {
 
         if(is_method("OPTIONS") && $ru =~ "pstnhub.microsoft.com") {
-               append_hf("Contact: <sip:EXTERNAL_FQDN:SIPS_PORT;transport=tls>\r\n");
-               xlog("L_INFO", "Sent out tm request: $mb\n");
+               #append_hf("Contact: <sip:EXTERNAL_FQDN:SIPS_PORT;transport=tls>\r\n");
+               append_hf("Contact: <sip:$fd:SIPS_PORT;transport=tls>\r\n");
+               xlog("L_DBG", "Sent out tm request: $mb\n");
         }