auth: handle unicode in subscription name when under python 2.7 (Azur…

…e#9439)

src/azure-cli-core/azure/cli/core/_profile.py

@@ -235,11 +235,18 @@ def find_subscriptions_on_login(self,
 
     def _normalize_properties(self, user, subscriptions, is_service_principal, cert_sn_issuer_auth=None,
                               user_assigned_identity_id=None):
+        import sys
         consolidated = []
         for s in subscriptions:
+            display_name = s.display_name
+            try:
+                s.display_name.encode(sys.getdefaultencoding())
+            except (UnicodeEncodeError, UnicodeDecodeError):  # mainly for Python 2.7 with ascii as the default encoding
+                display_name = re.sub(r'[^\x00-\x7f]', lambda x: '?', display_name)
+
             consolidated.append({
                 _SUBSCRIPTION_ID: s.id.rpartition('/')[2],
-                _SUBSCRIPTION_NAME: s.display_name,
+                _SUBSCRIPTION_NAME: display_name,
                 _STATE: s.state.value,
                 _USER_ENTITY: {
                     _USER_NAME: user,
@@ -249,6 +256,7 @@ def _normalize_properties(self, user, subscriptions, is_service_principal, cert_
                 _TENANT_ID: s.tenant_id,
                 _ENVIRONMENT_NAME: self.cli_ctx.cloud.name
             })
+
             if cert_sn_issuer_auth:
                 consolidated[-1][_USER_ENTITY][_SERVICE_PRINCIPAL_CERT_SN_ISSUER_AUTH] = True
             if user_assigned_identity_id:

src/azure-cli-core/azure/cli/core/tests/test_profile.py

@@ -6,6 +6,7 @@
 # pylint: disable=protected-access
 import json
 import os
+import sys
 import unittest
 import mock
 import re
@@ -106,6 +107,21 @@ def test_normalize(self):
         # verify serialization works
         self.assertIsNotNone(json.dumps(consolidated[0]))
 
+    def test_normalize_with_unicode_in_subscription_name(self):
+        cli = DummyCli()
+        storage_mock = {'subscriptions': None}
+        test_display_name = 'sub' + chr(255)
+        polished_display_name = 'sub?'
+        test_subscription = SubscriptionStub('sub1',
+                                             test_display_name,
+                                             SubscriptionState.enabled,
+                                             'tenant1')
+        profile = Profile(cli_ctx=cli, storage=storage_mock, use_global_creds_cache=False, async_persist=False)
+        consolidated = profile._normalize_properties(self.user1,
+                                                     [test_subscription],
+                                                     False)
+        self.assertTrue(consolidated[0]['name'] in [polished_display_name, test_display_name])
+
     def test_update_add_two_different_subscriptions(self):
         cli = DummyCli()
         storage_mock = {'subscriptions': None}