Htpdate: display the logs when the clock synchronization fails.

config/chroot_local-includes/etc/NetworkManager/dispatcher.d/50-htp.sh

@@ -7,8 +7,8 @@
 
 # However, since all DNS lookups are normally made through the Tor
 # network, which we are not connected to at this point, we use the
-# local DNS servers obtained through DHCP if possible, or the OpenDNS
-# ones, else.
+# local DNS servers obtained through DHCP, if possible, or the OpenDNS
+# ones otherwise.
 
 # To limit fingerprinting possibilities, we do not want to send HTTP
 # requests aimed at an IP-based virtualhost such as https://IP/, but
@@ -116,7 +116,7 @@ echo "${END_MAGIC}" >> /etc/hosts
 
 touch "${HTPDATE_LOG}"
 chown htp:nogroup "${HTPDATE_LOG}"
-chmod 600 "${HTPDATE_LOG}"
+chmod 644 "${HTPDATE_LOG}"
 
 /usr/local/sbin/htpdate \
 	-d \
@@ -132,6 +132,7 @@ echo "htpdate exited with return code ${HTPDATE_RET}" >>$LOG
 
 cleanup_etc_hosts
 
+echo "${HTPDATE_RET}" > "${DONE_FILE}"
 touch "${DONE_FILE}"
 
 exit ${HTPDATE_RET}

config/chroot_local-includes/usr/local/bin/tails-htp-notify-user

@@ -47,4 +47,30 @@ $notification->show();
 until (-e $htp_done_file) {
     sleep 1;
 }
-$notification->close();
+
+# read the return code from /var/lib/live/htp-done
+open(my $htp_done, "< $htp_done_file") or die "Can not read file: $!";
+(my $htp_done_code) = (<$htp_done> =~ /^(\d+)/);
+# in case htpdate went fine, close the 'Please wait...' notification
+if ($htp_done_code == 0) {
+    $notification->close();
+}
+# in case htpdate failed, notify the user with the corresponding logs
+else {
+    open(my $htp_log, "< /var/log/htpdate.log") or die "Can not read file: $!";
+    my $last_log;
+    while (<$htp_log>) {
+        if ($_ =~ /Running htpdate./) {
+            $last_log = ''; 
+            next;            
+        }
+        $last_log .= $_;
+    }
+    my $failure_summary      = gettext("Failed to synchronize the clock!");
+    my $failure_body         = $last_log;
+    my $failure_notification = $notify->create(summary => $failure_summary,
+                                               body    => $failure_body,
+                                               timeout => 0);
+    $failure_notification->show();
+}
+

config/chroot_local-includes/usr/local/sbin/htpdate

@@ -240,6 +240,7 @@ sub adjustDate {
 }
 
 my @urls = parseCommandLine();
+message("Running htpdate.");
 my @diffs = grep {
     defined $_
 } map {