Merge ~logan/software-properties:lp-2008489 into software-properties:ubuntu/master

[Logan Rosen]

Unmerged commits

99a5866... by Logan Rosen on 2023-06-19

Escape message in error dialog (LP: #2008489)

diff --git a/softwareproperties/gtk/SoftwarePropertiesGtk.py b/softwareproperties/gtk/SoftwarePropertiesGtk.py
index 0cced00..2d0db6d 100644
--- a/softwareproperties/gtk/SoftwarePropertiesGtk.py
+++ b/softwareproperties/gtk/SoftwarePropertiesGtk.py
@@ -148,7 +148,8 @@ def error(parent_window, summary, msg):
                                type=Gtk.MessageType.ERROR,
                                buttons=Gtk.ButtonsType.OK,
                                message_format=None)
-    dialog.set_markup("<big><b>%s</b></big>\n\n%s" % (summary, msg))
+    escaped_msg = GLib.markup_escape_text(msg, len(msg))
+    dialog.set_markup("<big><b>%s</b></big>\n\n%s" % (summary, escaped_msg))
     dialog.run()
     dialog.destroy()
     return False
diff --git a/tests/test_SoftwarePropertiesGtk.py b/tests/test_SoftwarePropertiesGtk.py
new file mode 100644
index 0000000..ca9dd28
--- /dev/null
+++ b/tests/test_SoftwarePropertiesGtk.py
@@ -0,0 +1,28 @@
+import unittest
+from unittest.mock import patch, MagicMock
+
+from gi.repository import GLib
+
+from softwareproperties.gtk.SoftwarePropertiesGtk import error
+
+
+class SoftwarePropertiesGtkTestCase(unittest.TestCase):
+    @patch('softwareproperties.gtk.SoftwarePropertiesGtk.Gtk')
+    def test_error_dialog_with_escaped_markup(self, mock_gtk):
+        # Create a dummy parent window
+        parent_window = MagicMock()
+
+        # Test input values
+        summary = "Test Summary"
+        msg = "Test Message With <Markup/>"
+        escaped_msg = GLib.markup_escape_text(msg, len(msg))
+
+        # Set up mock objects and return values
+        mock_dialog = MagicMock()
+        mock_gtk.MessageDialog.return_value = mock_dialog
+
+        # Call the function
+        error(parent_window, summary, msg)
+
+        # Assert that the dialog has markup set with escaped message
+        mock_dialog.set_markup.assert_called_once_with("<big><b>%s</b></big>\n\n%s" % (summary, escaped_msg))