Merge pull request #9 from dalingk/master

Python 3 Support

Author: sspreitzer

README.md

@@ -30,7 +30,18 @@ Output
 S-1-5-21-2127521184-1604012920-1887927527-72713
 ```
 
+## Tests
+
+Run tests using
+```
+python -m unittest
+```
+while in the `src/sid` directory.
+
 ## Changelog
+* 0.2
+  * Python 3 support
+  * Added a few tests
 * 0.1
   * Fix docstrings for documentation
   * Add setup.py

setup.py

@@ -28,7 +28,7 @@
 
 setup(
     name = "sid",
-    version = "0.1",
+    version = "0.2",
     author = "Sascha Spreitzer",
     author_email = "sspreitz@redhat.com",
     description = ("Python library to convert Windows SIDs"),

src/sid/__init__.py

@@ -9,4 +9,4 @@
 '''
 
 
-from lib import *
+from .lib import *

src/sid/lib.py

@@ -1,9 +1,7 @@
 '''The lib contains exceptions, constants and the sid class'''
 
-
 import base64
 import struct
-import string
 import binascii
 
 
@@ -90,10 +88,10 @@ def byteToLong(cls, byte, little_endian=True):
             raise Exception('Bytes too long. Needs to be <= 8 or 64bit')
         else:
             if little_endian:
-                a = string.ljust(byte, 8, '\x00')
+                a = byte.ljust(8, b'\x00')
                 return struct.unpack('<q', a)[0]
             else:
-                a = string.rjust(byte, 8, '\x00')
+                a = byte.rjust(8, b'\x00')
                 return struct.unpack('>q', a)[0]  
 
     @classmethod
@@ -104,7 +102,7 @@ def strsid(cls, byte):
         '''
         ret = 'S'
         sid = []
-        sid.append(cls.byteToLong(byte[0]))
+        sid.append(cls.byteToLong(byte[0:1]))
         sid.append(cls.byteToLong(byte[2:2+6], False))
         for i in range(8, len(byte), 4):
             sid.append(cls.byteToLong(byte[i:i+4]))
@@ -118,8 +116,8 @@ def byte(cls, strsid):
         Convert a SID into bytes
             strdsid - SID to convert into bytes
         '''
-        sid = string.split(strsid, '-')
-        ret = ''
+        sid = str.split(strsid, '-')
+        ret = bytearray()
         sid.remove('S')
         for i in range(len(sid)):
             sid[i] = int(sid[i])
@@ -138,8 +136,7 @@ def byteldap(cls, strsid):
             strsid - SID to encode
         '''
         ret = ''
-        a = binascii.hexlify(cls.byte(strsid))
-        print a
+        a = binascii.hexlify(cls.byte(strsid)).decode('utf-8')
         for i in range(0, len(a), 2):
             ret += '\\' + a[i:i+2]
         return ret

src/sid/test_lib.py

@@ -0,0 +1,57 @@
+"""Module containing a few tests for this module"""
+import unittest
+import lib as sid
+
+
+class Testsid(unittest.TestCase):
+    """Class for testing sid"""
+    sid_null = 'S-1-0-0'
+    sid_sample = 'S-1-5-21-2127521184-1604012920-1887927527-72713'
+    sid_null_bin = bytearray(
+        b'\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+    sid_sample_bin = bytearray(
+        b'\x01\x05\x00\x00\x00\x00\x00\x05\x15\x00\x00\x00\xa0e\xcf~xK\x9b_\xe7|\x87p\t\x1c\x01\x00')
+    sid_null_b64 = b'AQEAAAAAAAAAAAAA'
+    sid_sample_b64 = b'AQUAAAAAAAUVAAAAoGXPfnhLm1/nfIdwCRwBAA=='
+
+    def test_init_string(self):
+        """Test creating sids from strings"""
+        self.assertEqual(self.sid_null, str(sid.sid(self.sid_null)))
+        self.assertEqual(self.sid_sample, str(sid.sid(self.sid_sample)))
+
+    def test_init_base64(self):
+        """Test creating sids from base64"""
+        self.assertEqual(self.sid_null, str(
+            sid.sid(self.sid_null_b64, sid.SID_BASE64)))
+        self.assertEqual(self.sid_sample, str(
+            sid.sid(self.sid_sample_b64, sid.SID_BASE64)))
+
+    def test_init_binary(self):
+        """Test creating sids from binary"""
+        self.assertEqual(self.sid_null, str(
+            sid.sid(self.sid_null_bin, sid.SID_BINARY)))
+        self.assertEqual(self.sid_sample, str(
+            sid.sid(self.sid_sample_bin, sid.SID_BINARY)))
+
+    def test_ldap(self):
+        """Test ldap filter form of sid"""
+        sid_null_ldap = '\\01\\01\\00\\00\\00\\00\\00\\00\\00\\00\\00\\00'
+        sid_sample_ldap = '\\01\\05\\00\\00\\00\\00\\00\\05\\15\\00\\00\\00\\a0\\65\\cf\\7e\\78\\4b\\9b\\5f\\e7\\7c\\87\\70\\09\\1c\\01\\00'
+        self.assertEqual(sid_null_ldap, sid.sid(self.sid_null).ldap())
+        self.assertEqual(sid_sample_ldap, sid.sid(self.sid_sample).ldap())
+
+    def test_binary(self):
+        """Test binary form of sid"""
+        self.assertEqual(self.sid_null_bin, sid.sid(self.sid_null).binary())
+        self.assertEqual(self.sid_sample_bin,
+                         sid.sid(self.sid_sample).binary())
+
+    def test_base64(self):
+        """Test base64 form of sid"""
+        self.assertEqual(self.sid_null_b64, sid.sid(self.sid_null).base64())
+        self.assertEqual(self.sid_sample_b64,
+                         sid.sid(self.sid_sample).base64())
+
+
+if __name__ == '__main__':
+    unittest.main()