From 4408cb1fba463aa3fdaba518a74468430dd06895 Mon Sep 17 00:00:00 2001
From: Hugh Secker-Walker <hsw@hodain.net>
Date: Sat, 28 Jan 2023 11:04:46 -0500
Subject: [PATCH 1/5] fix(rsync-backup): Provide default port 22 for rsync
 usage in backup.py (#2226)

Co-authored-by: Hugh Secker-Walker <hsw+miac@hodain.net>
---
 management/backup.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/management/backup.py b/management/backup.py
index 3c4c38d7..99c3d60e 100755
--- a/management/backup.py
+++ b/management/backup.py
@@ -221,7 +221,9 @@ def get_duplicity_additional_args(env):
 			port = urlsplit(config["target"]).port
 		except ValueError:
 			port = 22
-
+		if port is None:
+			port = 22
+						
 		return [
 			f"--ssh-options= -i /root/.ssh/id_rsa_miab -p {port}",
 			f"--rsync-options= -e \"/usr/bin/ssh -oStrictHostKeyChecking=no -oBatchMode=yes -p {port} -i /root/.ssh/id_rsa_miab\"",
@@ -424,6 +426,8 @@ def list_target_files(config):
 			port = target.port
 		except ValueError:
 			 port = 22
+		if port is None:
+			port = 22
 
 		target_path = target.path
 		if not target_path.endswith('/'):

From 7af713592a67a712580d11ae5f76d40ce8927b89 Mon Sep 17 00:00:00 2001
From: Hugh Secker-Walker <hsw@hodain.net>
Date: Sat, 28 Jan 2023 11:11:17 -0500
Subject: [PATCH 2/5] feat(status page): Add summary of ok/error/warning counts
 (#2204)

* feat(status page): Add summary of ok/error/warning counts

* simplify a bit

---------

Co-authored-by: Hugh Secker-Walker <hsw+miac@hodain.net>
Co-authored-by: Joshua Tauberer <jt@occams.info>
---
 management/templates/system-status.html | 38 ++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/management/templates/system-status.html b/management/templates/system-status.html
index dc9233a5..12c8aa0b 100644
--- a/management/templates/system-status.html
+++ b/management/templates/system-status.html
@@ -10,13 +10,13 @@
   border-top: none;
   padding-top: 0;
 }
-#system-checks .status-error td {
+#system-checks .status-error td, .summary-error {
   color: #733;
 }
-#system-checks .status-warning td {
+#system-checks .status-warning td, .summary-warning {
   color: #770;
 }
-#system-checks .status-ok td {
+#system-checks .status-ok td, .summary-ok {
   color: #040;
 }
 #system-checks div.extra {
@@ -52,6 +52,9 @@
 	</div> <!-- /col -->
 	<div class="col-md-pull-3 col-md-8">
 
+          <div id="system-checks-summary">
+          </div>
+
 <table id="system-checks" class="table" style="max-width: 60em">
   <thead>
   </thead>
@@ -64,6 +67,9 @@
 
 <script>
 function show_system_status() {
+  const summary = $('#system-checks-summary');
+  summary.html("");
+
   $('#system-checks tbody').html("<tr><td colspan='2' class='text-muted'>Loading...</td></tr>")
 
   api(
@@ -93,6 +99,12 @@ function show_system_status() {
     { },
     function(r) {
       $('#system-checks tbody').html("");
+      const ok_symbol = "✓";
+      const error_symbol = "✖";
+      const warning_symbol = "?";
+
+      let count_by_status = { ok: 0, error: 0, warning: 0 };
+
       for (var i = 0; i < r.length; i++) {
         var n = $("<tr><td class='status'/><td class='message'><p style='margin: 0'/><div class='extra'/><a class='showhide' href='#'/></tr>");
         if (i == 0) n.addClass('first')
@@ -100,9 +112,12 @@ function show_system_status() {
                 n.addClass(r[i].type)
         else
                 n.addClass("status-" + r[i].type)
-        if (r[i].type == "ok") n.find('td.status').text("✓")
-        if (r[i].type == "error") n.find('td.status').text("✖")
-        if (r[i].type == "warning") n.find('td.status').text("?")
+
+        if (r[i].type == "ok") n.find('td.status').text(ok_symbol);
+        if (r[i].type == "error") n.find('td.status').text(error_symbol);
+        if (r[i].type == "warning") n.find('td.status').text(warning_symbol);
+        count_by_status[r[i].type]++;
+
         n.find('td.message p').text(r[i].text)
         $('#system-checks tbody').append(n);
 
@@ -122,8 +137,17 @@ function show_system_status() {
           n.find('> td.message > div').append(m);
         }
       }
-    })
 
+      // Summary counts
+      summary.html("Summary: ");
+      if (count_by_status['error'] + count_by_status['warning'] == 0) {
+        summary.append($('<span class="summary-ok"/>').text(`All ${count_by_status['ok']} ${ok_symbol} OK`));
+      } else {
+        summary.append($('<span class="summary-ok"/>').text(`${count_by_status['ok']} ${ok_symbol} OK, `));
+        summary.append($('<span class="summary-error"/>').text(`${count_by_status['error']} ${error_symbol} Error, `));
+        summary.append($('<span class="summary-warning"/>').text(`${count_by_status['warning']} ${warning_symbol} Warning`));
+      }
+    })
 }
 
 var current_privacy_setting = null;

From 31bbef3401df4a0c9384de7d5c0bc5a85381220e Mon Sep 17 00:00:00 2001
From: Hugh Secker-Walker <hsw@hodain.net>
Date: Sat, 28 Jan 2023 11:12:40 -0500
Subject: [PATCH 3/5] chore(setup): Make sed fingerprint patterns in start.sh
 be case insensitive (#2201)

---
 setup/start.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/start.sh b/setup/start.sh
index 960ec55d..3abb4fe3 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -167,7 +167,7 @@ if management/status_checks.py --check-primary-hostname; then
 	echo "If you have a DNS problem put the box's IP address in the URL"
 	echo "(https://$PUBLIC_IP/admin) but then check the TLS fingerprint:"
 	openssl x509 -in $STORAGE_ROOT/ssl/ssl_certificate.pem -noout -fingerprint -sha256\
-        	| sed "s/SHA256 Fingerprint=//"
+        	| sed "s/SHA256 Fingerprint=//i"
 else
 	echo https://$PUBLIC_IP/admin
 	echo
@@ -175,7 +175,7 @@ else
 	echo the certificate fingerprint matches:
 	echo
 	openssl x509 -in $STORAGE_ROOT/ssl/ssl_certificate.pem -noout -fingerprint -sha256\
-        	| sed "s/SHA256 Fingerprint=//"
+        	| sed "s/SHA256 Fingerprint=//i"
 	echo
 	echo Then you can confirm the security exception and continue.
 	echo

From c77d1697a771d23426e9e60e3c7c4fed17ef80be Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Sat, 28 Jan 2023 11:08:20 -0500
Subject: [PATCH 4/5] Revert "Improve error messages in the management tools
 when external command-line tools are run"

Command line arguments have user secrets in some cases which should not be included in error messages.

This reverts commit 26709a3c1dba9cadbd88636b002d95c2f6bd2b14.

Reported by AK.
---
 CHANGELOG.md        |  5 +++++
 management/utils.py | 15 ++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11d86ce6..2f154d1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+In Development
+--------------
+
+* Reverted "Improve error messages in the management tools when external command-line tools are run." because of the possibility of user secrets being included in error messages.
+
 Version 61 (January 21, 2023)
 -----------------------------
 
diff --git a/management/utils.py b/management/utils.py
index f452c16d..b5ca7e59 100644
--- a/management/utils.py
+++ b/management/utils.py
@@ -122,16 +122,13 @@ def shell(method, cmd_args, env={}, capture_stderr=False, return_bytes=False, tr
     if method == "check_output" and input is not None:
         kwargs['input'] = input
 
-    try:
+    if not trap:
         ret = getattr(subprocess, method)(cmd_args, **kwargs)
-        code = 0
-    except subprocess.CalledProcessError as e:
-        if not trap:
-            # Reformat exception.
-            msg = "Command failed with exit code {}: {}".format(e.returncode, subprocess.list2cmdline(cmd_args))
-            if e.output: msg += "\n\nOutput:\n" + e.output
-            raise Exception(msg)
-        else:
+    else:
+        try:
+            ret = getattr(subprocess, method)(cmd_args, **kwargs)
+            code = 0
+        except subprocess.CalledProcessError as e:
             ret = e.output
             code = e.returncode
     if not return_bytes and isinstance(ret, bytes): ret = ret.decode("utf8")

From 6f94412204a63af156cc6cced1541d08af7a6287 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Sat, 28 Jan 2023 11:22:30 -0500
Subject: [PATCH 5/5] v61.1

---
 CHANGELOG.md       | 6 ++++--
 README.md          | 2 +-
 setup/bootstrap.sh | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f154d1f..dddbb546 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,12 @@
 CHANGELOG
 =========
 
-In Development
---------------
+Version 61.1 (January 28, 2022)
+-------------------------------
 
+* Fixed rsync backups not working with the default port.
 * Reverted "Improve error messages in the management tools when external command-line tools are run." because of the possibility of user secrets being included in error messages.
+* Fix for TLS certificate SHA fingerprint not being displayed during setup.
 
 Version 61 (January 21, 2023)
 -----------------------------
diff --git a/README.md b/README.md
index 1f423011..435530ce 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ Clone this repository and checkout the tag corresponding to the most recent rele
 
 	$ git clone https://github.com/mail-in-a-box/mailinabox
 	$ cd mailinabox
-	$ git checkout v61
+	$ git checkout v61.1
 
 Begin the installation.
 
diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh
index 4414d7bb..b3fce67a 100644
--- a/setup/bootstrap.sh
+++ b/setup/bootstrap.sh
@@ -23,7 +23,7 @@ if [ -z "$TAG" ]; then
 	if [ "$UBUNTU_VERSION" == "Ubuntu 22.04 LTS" ]; then
 		# This machine is running Ubuntu 22.04, which is supported by
 		# Mail-in-a-Box versions 60 and later.
-		TAG=v61
+		TAG=v61.1
 	elif [ "$UBUNTU_VERSION" == "Ubuntu 18.04 LTS" ]; then
 		# This machine is running Ubuntu 18.04, which is supported by
 		# Mail-in-a-Box versions 0.40 through 5x.