Merge pull request #224 from dougbenjamin/dougbenjamin-patch-1

Update cleanDN.py
HSF · Apr 17, 2024 · 11787d4 · 11787d4
2 parents df13534 + dccbfa0
commit 11787d4
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pandaharvester/harvestertest/cleanDN.py b/pandaharvester/harvestertest/cleanDN.py
@@ -42,6 +42,12 @@ def clean_user_id(id):
 p = subprocess.Popen(com.split() + [certFile], stdout=subprocess.PIPE)
 out, err = p.communicate()
 
+# Convert bytes object to string object if needed
+try:
+    out =  out.decode("utf-8")
+except (UnicodeDecodeError, AttributeError):
+    pass
+
 out = re.sub("^subject=", "", out)
 out = out.strip()
 print(f'DN: "{out}"')