Merge pull request #13 from russell-lewis/update-deps

Update dependencies

Makefile

@@ -28,11 +28,12 @@ coverage:
 	coverage html
 
 publish:
+	rm -rf ./publish/bless_lambda/
 	mkdir -p ./publish/bless_lambda
 	cp -r ./bless ./publish/bless_lambda/
 	mv ./publish/bless_lambda/bless/aws_lambda/* ./publish/bless_lambda/
-	cp -r ./aws_lambda_libs/* ./publish/bless_lambda/
-	cp -r ./lambda_configs/* ./publish/bless_lambda/
+	cp -r ./aws_lambda_libs/. ./publish/bless_lambda/
+	cp -r ./lambda_configs/. ./publish/bless_lambda/
 	cd ./publish/bless_lambda && zip -r ../bless_lambda.zip .
 
 .PHONY: develop dev-docs clean test lint coverage publish

README.md

@@ -69,13 +69,14 @@ compile and include your dependencies before you can publish a working AWS Lambd
 $ sudo yum install gcc libffi-devel openssl-devel
 $ virtualenv venv
 $ source venv/bin/activate
-(venv) $ pip install --upgrade pip
+(venv) $ pip install --upgrade pip setuptools
 (venv) $ pip install -e .
 ```
 - From that instance, copy off the contents of:
-    - venv/lib/python2.7/site-packages/*
-    - venv/lib64/python2.7/site-packages/*
-
+```
+$ cp -r venv/lib/python2.7/site-packages/. aws_lambda_libs
+$ cp -r venv/lib64/python2.7/site-packages/. aws_lambda_libs
+```
 - put those files in: ./aws_lambda_libs/
 
 ### Protecting the CA Private Key

bless/__about__.py

@@ -11,7 +11,7 @@
     "sign ssh public keys.")
 __uri__ = "https://github.com/Netflix/bless"
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 
 __author__ = "The BLESS developers"
 __email__ = "[email protected]"

setup.py

@@ -19,30 +19,30 @@
     packages=[],
     install_requires=[
         'boto3==1.3.1',
-        'botocore==1.4.15',
-        'cffi==1.6.0',
-        'cryptography==1.3.1',
+        'botocore==1.4.37',
+        'cffi==1.7.0',
+        'cryptography==1.4',
         'docutils==0.12',
-        'enum34==1.1.4',
+        'enum34==1.1.6',
         'futures==3.0.5',
         'idna==2.1',
         'ipaddress==1.0.16',
         'jmespath==0.9.0',
-        'marshmallow==2.7.2',
+        'marshmallow==2.9.0',
         'pyasn1==0.1.9',
         'pycparser==2.14',
         'python-dateutil==2.5.3',
         'six==1.10.0'
     ],
     extras_require={
         'tests': [
-            'coverage==4.0.3',
-            'flake8==2.5.4',
-            'mccabe==0.4.0',
+            'coverage==4.1',
+            'flake8==2.6.2',
+            'mccabe==0.5.0',
             'pep8==1.7.0',
             'py==1.4.31',
-            'pyflakes==1.0.0',
-            'pytest==2.9.1'
+            'pyflakes==1.2.3',
+            'pytest==2.9.2'
         ]
     }
 )

tests/aws_lambda/bless-test.cfg

@@ -3,26 +3,3 @@ ca_private_key_file = ../../tests/aws_lambda/only-use-for-unit-tests.pem
 kms_key_id = alias/foo
 us-east-1_password = bogus-password-for-unit-test
 us-west-2_password = bogus-password-for-unit-test
-
-# todo get from config, with some sane defaults
-#[loggers]
-#keys=root
-#
-#[handlers]
-#keys=stream_handler
-#
-#[formatters]
-#keys=formatter
-#
-#[logger_root]
-#level=INFO
-#handlers=stream_handler
-#
-#[handler_stream_handler]
-#class=StreamHandler
-#level=DEBUG
-#formatter=formatter
-#args=(sys.stderr,)
-#
-#[formatter_formatter]
-#format=%(asctime)s %(name)-12s %(levelname)-8s %(message)s

tests/ssh/test_ssh_certificate_rsa.py

@@ -5,7 +5,7 @@
 from bless.ssh.certificates.rsa_certificate_builder import RSACertificateBuilder
 from bless.ssh.certificates.ssh_certificate_builder import SSHCertificateType
 from bless.ssh.public_keys.rsa_public_key import RSAPublicKey
-from cryptography.hazmat.primitives.serialization import _read_next_string
+from cryptography.hazmat.primitives.serialization import _ssh_read_next_string
 from tests.ssh.vectors import RSA_CA_PRIVATE_KEY, RSA_CA_PRIVATE_KEY_PASSWORD, \
     EXAMPLE_RSA_PUBLIC_KEY, EXAMPLE_RSA_PUBLIC_KEY_NO_DESCRIPTION, RSA_USER_CERT_MINIMAL, \
     RSA_USER_CERT_DEFAULTS, RSA_USER_CERT_DEFAULTS_NO_PUBLIC_KEY_COMMENT, \
@@ -35,8 +35,8 @@ def get_basic_cert_builder_rsa(cert_type=SSHCertificateType.USER,
 
 def extract_nonce_from_cert(cert_file):
     cert = cert_file.split(' ')[1]
-    cert_type, cert_remainder = _read_next_string(base64.b64decode(cert))
-    nonce, cert_remainder = _read_next_string(cert_remainder)
+    cert_type, cert_remainder = _ssh_read_next_string(base64.b64decode(cert))
+    nonce, cert_remainder = _ssh_read_next_string(cert_remainder)
     return nonce