From c3afd454752c064778af0e2bb949e1351c317f43 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 13 Oct 2022 17:52:26 -0400 Subject: [PATCH] Normalize uid python2 was crashing when getting unicode over the link. --- confluent_server/confluent/config/configmanager.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py index e4fb25c0..30e37f18 100644 --- a/confluent_server/confluent/config/configmanager.py +++ b/confluent_server/confluent/config/configmanager.py @@ -2470,6 +2470,11 @@ class ConfigManager(object): for user in tmpconfig[confarea]: ucfg = tmpconfig[confarea][user] uid = ucfg.get('id', None) + if uid is not None and not isinstance(uid, str): + if isinstance(uid, bytes): + uid = uid.decode('utf8') + else: + uid = uid.encode('utf8') displayname = ucfg.get('displayname', None) role = ucfg.get('role', None) self.create_user(user, uid=uid, displayname=displayname, role=role)