Merge pull request #3 from zlangley/master

zlangley · web-flow · commit 6f72a08f0e94 · 2017-08-25T09:56:24.000-07:00
Python3 compatible
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ A tool to encrypt/decrypt files.
 
 * Install clrypt
 ```
-$ pip install git+https://git+https://github.com/ColorGenomics/clrypt.git@v0.1.3
+$ pip install git+https://github.com/color/clrypt.git@v0.2.1
 ```
 
 * Create a directory called `encrypted` in your root directory.
diff --git a/clrypt/encdir.py b/clrypt/encdir.py
@@ -1,3 +1,4 @@
+from builtins import object
 import os
 
 
@@ -23,7 +24,7 @@ def encrypted_file_path(self, group, name, ext='yaml'):
 
     def read_file(self, group, name, ext='yaml'):
         """Read the named file as a bytestring of decrypted plaintext."""
-        with open(self.encrypted_file_path(group, name, ext=ext)) as encrypted:
+        with open(self.encrypted_file_path(group, name, ext=ext), mode='rb') as encrypted:
             ciphertext = encrypted.read()
         return self.keypair.decrypt(ciphertext)
 
@@ -45,7 +46,7 @@ def write_file(self, in_fp, group, name, ext='yaml'):
         if not os.path.isdir(dirname):
             os.makedirs(dirname)
 
-        with open(out_path, 'w') as out_fp:
+        with open(out_path, 'wb') as out_fp:
             out_fp.write(encrypted)
         return out_path
 
diff --git a/clrypt/openssl.py b/clrypt/openssl.py
@@ -1,6 +1,9 @@
+from __future__ import unicode_literals
+from builtins import object
 import hashlib
 import struct
 import subprocess
+import base64
 
 from pyasn1.codec.der import decoder
 
@@ -94,14 +97,7 @@ def bignum_to_mpi(integer):
     else:
         header = struct.pack('>I', length)
 
-    # Build a big-endian arbitrary-length representation of the number
-    raw_bytes = []
-    while integer > 0:
-        raw_bytes.insert(0, chr(integer % 256))
-        integer = integer >> 8
-    raw_bytestring = b''.join(raw_bytes)
-
-    return header + raw_bytestring
+    return header + int_to_bytearray(integer)
 
 
 def parse_pubkey(pubkey_s):
@@ -114,10 +110,10 @@ def parse_pubkey(pubkey_s):
         ...base64...
         -----END PUBLIC KEY-----
     """
-    der_encoded = ''.join(pubkey_s.strip().splitlines()[1:-1]).decode('base64')
+    der_encoded = base64.b64decode(b''.join(pubkey_s.strip().splitlines()[1:-1]))
     rsa_params_encoded = bitstring_to_bytes(decoder.decode(der_encoded)[0][1])
     rsa_params = decoder.decode(rsa_params_encoded)
-    modulus, exponent = long(rsa_params[0][0]), long(rsa_params[0][1])
+    modulus, exponent = int(rsa_params[0][0]), int(rsa_params[0][1])
     return (modulus, exponent)
 
 def bitstring_to_bytes(bitstring):
@@ -126,9 +122,14 @@ def bitstring_to_bytes(bitstring):
     if len(bitstring) % 8 != 0:
         raise ValueError("Unaligned bitstrings cannot be converted to bytes")
 
-    raw_bytes = []
-    ones_and_zeros = ''.join(str(b) for b in bitstring)
-    while ones_and_zeros:
-        raw_bytes.append(chr(int(ones_and_zeros[:8], 2)))
-        ones_and_zeros = buffer(ones_and_zeros, 8)
-    return ''.join(raw_bytes)
+    integer = int(''.join(str(x) for x in bitstring), 2)
+    return bytes(int_to_bytearray(integer))
+
+def int_to_bytearray(integer):
+    # Build a big-endian arbitrary-length representation of the number
+    raw_bytes = bytearray()
+    while integer > 0:
+        raw_bytes.insert(0, integer & 0xff)
+        integer = integer >> 8
+
+    return raw_bytes
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
+future==0.16.0
 PyYAML>=3.11
 pyasn1==0.1.9
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 
 setup(name = "clrypt",
-      version = "0.2.0",
+      version = "0.2.1",
       description = "A tool to encrypt/decrypt files.",
       author = "Color Genomics",
       author_email = "dev@getcolor.com",
diff --git a/tests/test-cert/test.crt b/tests/test-cert/test.crt
diff --git a/tests/test-cert/test.dem b/tests/test-cert/test.dem
diff --git a/tests/test-clrypt/encrypted/testing/05f8ef9229fe21844aacfe2ec6e63e2b-content.yml.smime b/tests/test-clrypt/encrypted/testing/05f8ef9229fe21844aacfe2ec6e63e2b-content.yml.smime
diff --git a/tests/test-clrypt/subdir/another_subdir/.gitkeep b/tests/test-clrypt/subdir/another_subdir/.gitkeep
diff --git a/tests/test_clrypt.py b/tests/test_clrypt.py
@@ -49,7 +49,7 @@ def setUp(self):
         self.prev_dir = os.getcwd()
 
     def tearDown(self):
-        for attr in vars(clrypt._environment).keys():
+        for attr in list(vars(clrypt._environment).keys()):
             delattr(clrypt._environment, attr)
         os.chdir(self.prev_dir)
 
@@ -59,7 +59,7 @@ def test_happy_path(self):
         os.environ['ENCRYPTED_DIR'] = EXPECTED_ENC_DIR
 
         decrypted = clrypt.read_file("testing", "content", ext="yml")
-        self.assertEqual(decrypted, "test content")
+        self.assertEqual(decrypted, b"test content")
 
     def test_happy_path_find_encrypted_dir(self):
         os.environ['CLRYPT_CERT'] = CERT_FILE
@@ -68,4 +68,4 @@ def test_happy_path_find_encrypted_dir(self):
         os.chdir(TEST_DIR)
 
         decrypted = clrypt.read_file("testing", "content", ext="yml")
-        self.assertEqual(decrypted, "test content")
+        self.assertEqual(decrypted, b"test content")
diff --git a/tests/test_encdir.py b/tests/test_encdir.py
@@ -1,4 +1,7 @@
-from StringIO import StringIO
+from future import standard_library
+standard_library.install_aliases()
+from builtins import object
+from io import BytesIO
 import os.path
 import shutil
 import unittest
@@ -27,19 +30,19 @@ def test_encrypted_file_path(self):
     def test_read_file(self):
         path = self.encdir.encrypted_file_path('dev', 'secrets2', ext='yaml')
         os.makedirs(os.path.dirname(path))
-        with open(path, 'w') as fp:
-            fp.write("E:some secret data")
+        with open(path, 'wb') as fp:
+            fp.write(b"E:some secret data")
 
         plaintext = self.encdir.read_file('dev', 'secrets2', ext='yaml')
-        self.assertEqual(plaintext, "some secret data")
+        self.assertEqual(plaintext, b"some secret data")
 
     def test_read_yaml_file(self):
         path = self.encdir.encrypted_file_path('dev', 'secrets3', ext='yaml')
         os.makedirs(os.path.dirname(path))
-        with open(path, 'w') as fp:
-            fp.write('E:rootKey:\n')
-            fp.write('  subKey1: value\n')
-            fp.write('  subKey2: 123\n')
+        with open(path, 'wb') as fp:
+            fp.write(b'E:rootKey:\n')
+            fp.write(b'  subKey1: value\n')
+            fp.write(b'  subKey2: 123\n')
 
         plainobj = self.encdir.read_yaml_file('dev', 'secrets3', ext='yaml')
         self.assertEqual(
@@ -48,20 +51,20 @@ def test_read_yaml_file(self):
 
     def test_write_file(self):
         path = self.encdir.encrypted_file_path('dev', 'secrets4', 'yaml')
-        contents = "another secret datum"
+        contents = b"another secret datum"
 
-        self.encdir.write_file(StringIO(contents), 'dev', 'secrets4', ext='yaml')
-        with open(path) as fp:
-            self.assertEqual(fp.read(), "E:" + contents)
+        self.encdir.write_file(BytesIO(contents), 'dev', 'secrets4', ext='yaml')
+        with open(path, 'rb') as fp:
+            self.assertEqual(fp.read(), b"E:" + contents)
 
 
 class DummyKeypair(object):
     def get_key_id(self):
         return "dummy12345"
 
     def encrypt(self, bytes):
-        return "E:" + bytes
+        return b"E:" + bytes
 
     def decrypt(self, bytes):
-        assert bytes.startswith("E:")
+        assert bytes.startswith(b"E:")
         return bytes[2:]
diff --git a/tests/test_openssl.py b/tests/test_openssl.py
@@ -12,26 +12,28 @@ class TestBignumToMPI(unittest.TestCase):
 
     def test_exponent(self):
         self.assertEqual(
-            clrypt.openssl.bignum_to_mpi(65537L),
-            '\x00\x00\x00\x03\x01\x00\x01')
+            clrypt.openssl.bignum_to_mpi(65537),
+            b'\x00\x00\x00\x03\x01\x00\x01')
 
     def test_modulus(self):
         self.assertEqual(
             clrypt.openssl.bignum_to_mpi(
-                17652187434302119818626903597973364646688501428151181083346396650190495499971143555821153235865918471667488379960690165155890225429359619542780951438912782907420720337860016081609304413559138090809578303571230455363722891195091112107003860558073312270213669052061287420596945410842819944331551665414956709934244337764287956982989490636986364084315970710464920930036478862933506058288047831177960977170956029647528492070455408969834953275116251472162035375269818449753491792832735260819579628653112578006009233208029743042292911927382613736571054059145327226830704584124567079108161933244408783987994310178893677777563L),
-            '\x00\x00\x01\x01\x00\x8b\xd5\x0e\xf7s\xde\xce\xcayg\xe5s\xaf'
-            '\xa5\\\x95\xd9\xbd\xb3\xff4\xa9\x98T\xe6^\x91\xcc\xb9X\xda*'
-            '\xf3W@\xed\x8b\xd7E\rB\xa7\x17l\x83_s\x8479\xa2\x92}SL\x007g'
-            '\x829\xfdz\x1bwf\x060}\xd1\xaagXF\xf1\x12n\x96z\xba\xa3\xd9'
-            '\xb1\x91\x98\x99\xf4.\xbfo\xd1\x13\xb8\x97p^*\x16\x0bi~\xd5'
-            '\x10\x07\xa7\x7f\x86D\x9a\xf3]0YZ4\xea\xe9\x17\xe1\x86\x96'
-            '\xad\xe9;\xcf\xd3T+\x91U#K.\xdb\xcc\x06\x90e]\x88\x0e[hs\xde'
-            '\xbbm\x16\xc9\x19@\xd9{FI\x04\xe7\xf6\xd5\xcb\xff\xe7&\xce'
-            '\xaa\x0e\x88{\xc7\xfa\xe6\x94d\x1d\xf9\x00\x18\xa2[\xeaf\xf1'
-            '\xea\xe7\xc2ZG\x99\xfc\xe8\xb9|\xc7\xa4r\x06\x7f\x1e\tA\xaa'
-            '\x1a\xe6\xe0\x86\x85\x11\xf0q?\xdc\xa0c\xbey\x05[u\xe5}>\xf5'
-            '\xfc\x85\xaa\xff\x93v\xf7\xdf\xc6\xffv\xcei47\x03\xb1\xd0vR'
-            '\x90\x16\xf5\x1a\xad\x1eH\x9dRW(\xea\xa4\xd2\x9b')
+                17652187434302119818626903597973364646688501428151181083346396650190495499971143555821153235865918471667488379960690165155890225429359619542780951438912782907420720337860016081609304413559138090809578303571230455363722891195091112107003860558073312270213669052061287420596945410842819944331551665414956709934244337764287956982989490636986364084315970710464920930036478862933506058288047831177960977170956029647528492070455408969834953275116251472162035375269818449753491792832735260819579628653112578006009233208029743042292911927382613736571054059145327226830704584124567079108161933244408783987994310178893677777563
+            ),
+            b'\x00\x00\x01\x01\x00\x8b\xd5\x0e\xf7s\xde\xce\xcayg\xe5s\xaf'
+            b'\xa5\\\x95\xd9\xbd\xb3\xff4\xa9\x98T\xe6^\x91\xcc\xb9X\xda*'
+            b'\xf3W@\xed\x8b\xd7E\rB\xa7\x17l\x83_s\x8479\xa2\x92}SL\x007g'
+            b'\x829\xfdz\x1bwf\x060}\xd1\xaagXF\xf1\x12n\x96z\xba\xa3\xd9'
+            b'\xb1\x91\x98\x99\xf4.\xbfo\xd1\x13\xb8\x97p^*\x16\x0bi~\xd5'
+            b'\x10\x07\xa7\x7f\x86D\x9a\xf3]0YZ4\xea\xe9\x17\xe1\x86\x96'
+            b'\xad\xe9;\xcf\xd3T+\x91U#K.\xdb\xcc\x06\x90e]\x88\x0e[hs\xde'
+            b'\xbbm\x16\xc9\x19@\xd9{FI\x04\xe7\xf6\xd5\xcb\xff\xe7&\xce'
+            b'\xaa\x0e\x88{\xc7\xfa\xe6\x94d\x1d\xf9\x00\x18\xa2[\xeaf\xf1'
+            b'\xea\xe7\xc2ZG\x99\xfc\xe8\xb9|\xc7\xa4r\x06\x7f\x1e\tA\xaa'
+            b'\x1a\xe6\xe0\x86\x85\x11\xf0q?\xdc\xa0c\xbey\x05[u\xe5}>\xf5'
+            b'\xfc\x85\xaa\xff\x93v\xf7\xdf\xc6\xffv\xcei47\x03\xb1\xd0vR'
+            b'\x90\x16\xf5\x1a\xad\x1eH\x9dRW(\xea\xa4\xd2\x9b',
+        )
 
 
 class TestOpenSSLKeypair(unittest.TestCase):
@@ -49,7 +51,7 @@ def test_key_id(self):
 
     def test_encryption_cycle(self):
         """A smoke test: check that decrypt(encrypt(text)) == text."""
-        message = "Some message"
+        message = b"Some message"
         encrypted = self.keypair.encrypt(message)
         self.assertNotEqual(encrypted, message)
         decrypted = self.keypair.decrypt(encrypted)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+future==0.16.0`
`1`	`2`	`PyYAML>=3.11`
`2`	`3`	`pyasn1==0.1.9`