Merge lp:~milner/landscape-client/prevent-client-ui-unicode into lp:~landscape/landscape-client/trunk

[Mike Milner]

landscape-client's config system does not handle non-ascii characters. This small fix prevents non-ascii characters from the ui getting into the config system.

This branch simply replaces non-ascii characters with "?".

[Alberto Donato (ack)]

+1!

review: Approve

[Andreas Hasenack (ahasenack)]

It's ugly, but works in the sense that it doesn't crash ;)

But of course the user won't be able to register the machine like this. Should we perhaps file a new bug about this to fix it properly? With a dialog box perhaps saying that the <field> contained invalid characters.

[Mike Milner (milner)]

> It's ugly, but works in the sense that it doesn't crash ;)
>
> But of course the user won't be able to register the machine like this. Should
> we perhaps file a new bug about this to fix it properly? With a dialog box
> perhaps saying that the <field> contained invalid characters.

I do have another branch I started first that adds proper unicode support to the config system but it touches too many core parts just before a release.

I've opened Bug #956612 to remind us that we need a better story here.

[Chad Smith (chad.smith)]

+1 on assumption that we'll handle this more safely in Bug #956612

review: Approve

=== modified file 'landscape/ui/model/configuration/mechanism.py'
--- landscape/ui/model/configuration/mechanism.py	2012-03-09 17:06:06 +0000
+++ landscape/ui/model/configuration/mechanism.py	2012-03-15 17:13:35 +0000
@@ -97,6 +97,8 @@
         L{LandscapeSetupConfiguration}.
         """
         if self._is_allowed_by_policy(sender, conn, POLICY_NAME):
+            # Underlying _config does not support unicode so convert to ascii
+            value = unicode(value).encode("ascii", errors="replace")
             setattr(self._config, name, value)
 
     @dbus.service.method(INTERFACE_NAME,

=== modified file 'landscape/ui/model/configuration/tests/test_mechanism.py'
--- landscape/ui/model/configuration/tests/test_mechanism.py	2012-03-07 09:39:35 +0000
+++ landscape/ui/model/configuration/tests/test_mechanism.py	2012-03-15 17:13:35 +0000
@@ -65,6 +65,26 @@
         self.mechanism.set("account_name", "bar")
         self.assertEqual("bar", self.mechanism.get("account_name"))
 
+    def test_set_account_name_unicode(self):
+        """
+        Non-ascii characters are replaced before passing to underlying config.
+        """
+        self.mechanism.set("account_name", u"unicode\u00a3unicode")
+        self.assertEqual("unicode?unicode", self.mechanism.get("account_name"))
+
+    def test_no_unicode_to_underlying_config(self):
+        """
+        Non-ascii characters are replaced before passing to underlying config.
+        """
+        class FakeConfig(object):
+            def __init__(self):
+                self.account_name = None
+
+        fake_config = FakeConfig()
+        self.mechanism._config = fake_config
+        self.mechanism.set("account_name", u"unicode\u00a3unicode")
+        self.assertEqual("unicode?unicode", fake_config.account_name)
+
     def test_get_data_path(self):
         """
         Test we can get the data path from the mechanism.