Update BooleanControl encoding/decoding to use pyasn1

mistotebe · mistotebe · commit 9d7ca92108e8 · 2022-01-26T10:24:07.000Z
diff --git a/Lib/ldap/controls/simple.py b/Lib/ldap/controls/simple.py
@@ -7,6 +7,9 @@
 import struct,ldap
 from ldap.controls import RequestControl,ResponseControl,LDAPControl,KNOWN_RESPONSE_CONTROLS
 
+from pyasn1.type import univ
+from pyasn1.codec.ber import encoder,decoder
+
 
 class ValueLessRequestControl(RequestControl):
   """
@@ -57,19 +60,18 @@ class BooleanControl(LDAPControl):
   booleanValue
     Boolean (True/False or 1/0) which is the boolean controlValue.
   """
-  boolean2ber = { 1:'\x01\x01\xFF', 0:'\x01\x01\x00' }
-  ber2boolean = { '\x01\x01\xFF':1, '\x01\x01\x00':0 }
 
   def __init__(self,controlType=None,criticality=False,booleanValue=False):
     self.controlType = controlType
     self.criticality = criticality
     self.booleanValue = booleanValue
 
   def encodeControlValue(self):
-    return self.boolean2ber[int(self.booleanValue)]
+    return encoder.encode(self.booleanValue,asn1Spec=univ.Boolean())
 
   def decodeControlValue(self,encodedControlValue):
-    self.booleanValue = self.ber2boolean[encodedControlValue]
+    decodedValue,_ = decoder.decode(encodedControlValue,asn1Spec=univ.Boolean())
+    self.booleanValue = bool(int(decodedValue))
 
 
 class ManageDSAITControl(ValueLessRequestControl):
