From 18a69716c1ac20051df5877fd64d143dc31f6f30 Mon Sep 17 00:00:00 2001
From: Adit Sarfaty <asarfaty@vmware.com>
Date: Sun, 7 Jul 2019 10:03:28 +0300
Subject: [PATCH] NSX|V3+P: Remove illegal characters from user-id in NSX
 headers

Change-Id: I1f5345c0592c9b2a7ceaac5bb5c13ef05f1d3bef
---
 vmware_nsx/plugins/nsx_v3/utils.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vmware_nsx/plugins/nsx_v3/utils.py b/vmware_nsx/plugins/nsx_v3/utils.py
index 0f4fb25a6b..aff09cfbe8 100644
--- a/vmware_nsx/plugins/nsx_v3/utils.py
+++ b/vmware_nsx/plugins/nsx_v3/utils.py
@@ -14,6 +14,7 @@
 #    under the License.
 import os
 import random
+import re
 
 from oslo_config import cfg
 from oslo_context import context as context_utils
@@ -535,7 +536,10 @@ def inject_headers():
     ctx = context_utils.get_current()
     if ctx:
         ctx_dict = ctx.to_dict()
-        return {'X-NSX-EUSER': ctx_dict.get('user_identity'),
+        # Remove unsupported characters from the user-id
+        user_id = ctx_dict.get('user_identity')
+        re.sub('[^A-Za-z0-9]+', '', user_id)
+        return {'X-NSX-EUSER': user_id,
                 'X-NSX-EREQID': ctx_dict.get('request_id')}
     return {}