Better handling of failure to use the remote-diagnosis

data/hooks/diagnosis/14-ports.py

@@ -47,8 +47,16 @@ class PortsDiagnoser(Diagnoser):
                                                ipversion=ipversion)
                 results[ipversion] = r["ports"]
             except Exception as e:
-                raise YunohostError("diagnosis_ports_could_not_diagnose", error=e)
+                yield dict(meta={"reason": "remote_diagnosis_failed", "ipversion": ipversion},
+                           data={"error": str(e)},
+                           status="WARNING",
+                           summary="diagnosis_ports_could_not_diagnose",
+                           details=["diagnosis_ports_could_not_diagnose_details"])
+                continue
 
+        ipversions = results.keys()
+        if not ipversions:
+            return
 
         for port, service in sorted(ports.items()):
             port = str(port)

data/hooks/diagnosis/21-web.py

@@ -96,7 +96,16 @@ class WebDiagnoser(Diagnoser):
                                                ipversion=ipversion)
                 results[ipversion] = r["http"]
             except Exception as e:
-                raise YunohostError("diagnosis_http_could_not_diagnose", error=e)
+                yield dict(meta={"reason": "remote_diagnosis_failed", "ipversion": ipversion},
+                           data={"error": str(e)},
+                           status="WARNING",
+                           summary="diagnosis_http_could_not_diagnose",
+                           details=["diagnosis_http_could_not_diagnose_details"])
+                continue
+
+        ipversions = results.keys()
+        if not ipversions:
+            return
 
         for domain in domains:
 

data/hooks/diagnosis/24-mail.py

@@ -13,8 +13,6 @@ from moulinette.utils.filesystem import read_yaml
 from yunohost.diagnosis import Diagnoser
 from yunohost.domain import _get_maindomain, domain_list
 
-DIAGNOSIS_SERVER = "diagnosis.yunohost.org"
-
 DEFAULT_DNS_BLACKLIST = "/usr/share/yunohost/other/dnsbl_list.yml"
 
 

locales/en.json

@@ -191,8 +191,8 @@
     "diagnosis_mail_ehlo_ok": "Postfix mail service answer correctly from outside",
     "diagnosis_mail_ehlo_unavailable": "Postfix mail service don't answer to EHLO request on IPv{ipversion}",
     "diagnosis_mail_ehlo_wrong": "A mail server answers {wrong_ehlo} instead {right_ehlo} on IPv{ipversion}",
-    "diagnosis_mail_ehlo_could_not_diagnose": "Could not diagnose if postfix mail server is reachable from outside",
-    "diagnosis_mail_ehlo_could_not_diagnose_details": "Error: {error}",
+    "diagnosis_mail_ehlo_could_not_diagnose": "Could not diagnose if postfix mail server is reachable from outside in IPv{ipversion}.",
+    "diagnosis_mail_ehlo_could_not_diagnose_details": "{error}",
     "diagnosis_mail_fcrdns_ok": "Your reverse DNS is well configured",
     "diagnosis_mail_fcrdns_dns_missing": "No reverse DNS defined for the ip {ip}",
     "diagnosis_mail_fcrdns_different_from_ehlo_domain": "Your reverse DNS {rdns_domain} is different from your EHLO domain {ehlo_domain} on {ip}",
@@ -220,7 +220,8 @@
     "diagnosis_description_mail": "Email",
     "diagnosis_description_regenconf": "System configurations",
     "diagnosis_description_security": "Security checks",
-    "diagnosis_ports_could_not_diagnose": "Could not diagnose if ports are reachable from outside. Error: {error}",
+    "diagnosis_ports_could_not_diagnose": "Could not diagnose if ports are reachable from outside in IPv{ipversion}.",
+    "diagnosis_ports_could_not_diagnose_details": "Error: {error}",
     "diagnosis_ports_unreachable": "Port {port} is not reachable from outside.",
     "diagnosis_ports_partially_unreachable": "Port {port} is not reachable from outside in IPv{failed}.",
     "diagnosis_ports_ok": "Port {port} is reachable from outside.",
@@ -228,7 +229,8 @@
     "diagnosis_ports_forwarding_tip": "To fix this issue, you most probably need to configure port forwarding on your internet router as described in <a href='https://yunohost.org/isp_box_config'>https://yunohost.org/isp_box_config</a>",
     "diagnosis_http_hairpinning_issue": "Your local network does not seem to have hairpinning enabled.",
     "diagnosis_http_hairpinning_issue_details": "This is probably because of your ISP box / router. As a result, people from outside your local network will be able to access your server as expected, but not people from inside the local network (like you, probably?). You may be able to improve the situation by having a look at <a href='https://yunohost.org/dns_local_network'>https://yunohost.org/dns_local_network</a>",
-    "diagnosis_http_could_not_diagnose": "Could not diagnose if domain is reachable from outside. Error: {error}",
+    "diagnosis_http_could_not_diagnose": "Could not diagnose if domains are reachable from outside in IPv{ipversion}.",
+    "diagnosis_http_could_not_diagnose_details": "Error: {error}",
     "diagnosis_http_ok": "Domain {domain} is reachable through HTTP from outside the local network.",
     "diagnosis_http_timeout": "Timed-out while trying to contact your server from outside. It appears to be unreachable.<br>1. The most common cause for this issue is that you did not correctly <a href='https://yunohost.org/isp_box_config'>configure port forwarding</a> for port 80.<br>2. Also make sure that the web server nginx is running<br>3. On more complex setups: make sure that a firewall or reverse-proxy is not interfering.",
     "diagnosis_http_connection_error": "Connection error: could not connect to the requested domain, it's very likely unreachable.",

src/yunohost/diagnosis.py

@@ -525,7 +525,7 @@ class Diagnoser():
             socket.getaddrinfo = old_getaddrinfo
 
         if r.status_code not in [200, 400]:
-            raise Exception("The remote diagnosis server failed miserably while trying to diagnose your server. This is most likely an error on Yunohost's infrastructure and not on your side. Please contact the YunoHost team an provide them with the following information.\nURL: <pre>%s</pre>\nStatus code: <pre>%s</pre>" % (url, r.status_code))
+            raise Exception("The remote diagnosis server failed miserably while trying to diagnose your server. This is most likely an error on Yunohost's infrastructure and not on your side. Please contact the YunoHost team an provide them with the following information.<br>URL: <code>%s</code><br>Status code: <code>%s</code>" % (url, r.status_code))
         if r.status_code == 400:
             raise Exception("Diagnosis request was refused: %s" % r.content)