Duo fix.

Author: Justin Wiley

gimme_aws_creds/duo.py

@@ -14,17 +14,11 @@
 # https://github.com/nathan-v/aws_okta_keyman
 """All the Duo things."""
 
-import sys
 import time
+from http.server import HTTPServer, BaseHTTPRequestHandler
 from multiprocessing import Process
 
 import requests
-from . import ui
-
-if sys.version_info[0] < 3:  # pragma: no cover
-    from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
-else:  # pragma: no cover
-    from http.server import HTTPServer, BaseHTTPRequestHandler
 
 
 class PasscodeRequired(BaseException):
@@ -109,7 +103,7 @@ def duo_webserver(self):
 
     def handler_with_html(self, *args):
         """Call the handler and include the HTML."""
-        QuietHandler(self.html, *args)
+        return QuietHandler(self.html, *args)
 
     def trigger_duo(self, passcode=""):
         """Try to get a Duo Push without needing an iframe

gimme_aws_creds/okta.py

@@ -10,11 +10,15 @@
 See the License for the specific language governing permissions and* limitations under the License.*
 """
 import base64
+import copy
 import getpass
 import re
+import socket
 import time
 import uuid
+import webbrowser
 from codecs import decode
+from multiprocessing import Process
 from urllib.parse import parse_qs
 from urllib.parse import urlparse, quote
 
@@ -31,11 +35,6 @@
 from . import errors, ui, version, duo
 from .registered_authenticators import RegisteredAuthenticators
 
-from multiprocessing import Process
-import webbrowser
-import socket
-import copy
-
 
 class OktaClient(object):
     """

gimme_aws_creds/ui.py

@@ -16,7 +16,10 @@
 
 
 class UserInterface:
-    def __init__(self, environ=os.environ, argv=sys.argv):
+    def __init__(self, environ=os.environ, argv=None):
+        if argv is None:
+            argv = sys.argv
+
         self.environ = environ.copy()
         self.environ_bkp = None
         self.argv = argv[:]
@@ -114,5 +117,6 @@ def read_input(self, hidden=False):
     def notify(self, message):
         builtins.print(message, file=sys.stderr)
 
+
 cli = CLIUserInterface()
 default = cli

lambda/lambda_handler.py

@@ -1,9 +1,11 @@
-import sys
-import os
 import json
+import os
+import sys
+
 from okta.framework.ApiClient import ApiClient
 from okta.framework.OktaError import OktaError
 
+
 def aws_account_info(event, context):
     # We need access to the entire JSON response from the Okta APIs, so we need to
     # use the low-level ApiClient instead of UsersClient and AppInstanceClient

requirements_dev.txt

@@ -1,4 +1,3 @@
 -r requirements.txt
 responses>=0.5.1,<1.0.0
-nose>=1.3.7
-mock>=3.0.0,<4.0.0
+nose>=1.3.7

tests/test_aws_resolver.py

@@ -8,7 +8,7 @@
 import responses
 from nose.tools import assert_equals
 
-import gimme_aws_creds.common as commondef
+import gimme_aws_creds.common as common_def
 from gimme_aws_creds.aws import AwsResolver
 
 
@@ -2056,26 +2056,26 @@ def setUp(self):
         self.saml = "<?xml version="1.0" encoding="UTF-8"?><saml2p:Response xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol" Destination="https://signin.aws.amazon.com/saml" ID="id13003700621234548094110630" IssueInstant="2018-03-14T22:18:41.839Z" Version="2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"><saml2:Issuer xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://www.okta.com/exkbXXXXXXXXXHw0h7</saml2:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference URI="#id13003700621234548094110630"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" PrefixList="xs"/></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>R/sMlGOc4Cf52L90LEybnvU7yGj00DK6Hf5c050PbsU=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>L3cgRX0kAW4TmV3ayQsVqwGbLBxLZ9/KGXv3vSxY5ArBnryGwvbsJQSU/DlM9O8I4vGv/X5ZO7F8/S6ZYvNseUavjEW6lOrcmjJDbF712bgC6bqwgo4gPXiS7ivOkvL+bRja2nZ95E3CHUY8HjeECANm9Lie4IQoy+Fdgq2Y8NlsTvY0OuQY3VPXDGcLSbUlY/ox7agxCThsFsQYl7jGUYnTdmYjuu9/q6tLZ/l/G+zePOuXg+RgS0nMRbFeyuycC9gfm8MjC/4qn8hN9r41Q1E7usJgDrJLawYamuOzB5O4DQ5xcOzAX+9vdQM1tHnbe+rMKaIuKLcE9Zs07qDZ4A==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>blahblah</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><saml2p:Status xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol"><saml2p:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></saml2p:Status><saml2:Assertion xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" ID="id1300370062761496296099412" IssueInstant="2018-03-14T22:18:41.839Z" Version="2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"><saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">http://www.okta.com/exkbXXXXXXXXXHw0h7</saml2:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference URI="#id1300370062761496296099412"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" PrefixList="xs"/></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>SEMzBwpxue8//+Uu3pPv4oTSG6unU9axuJVkyd69wQA=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>GM3viajIB+JvFzCI1zxDHQkLFicsBfJZ+a51zK1OJybdEGXL6SxVF81QL+qapsOCVGnkd1knkm3a0S0Ucl4iNsmD1oOX5PibB9E6GWXwwyJ9m2QWXxIEbG5QyzV0dIBcJM0bfMWLH53rbKKCRwy7JXkKMa/eyaPO3nUFAUafnq/8vdwhlLBpL8gXPwFbT/wa+as1DN/rPL4DiLoQjdgbLZPC5EWcpiOEAb7+yh991HiYj9cv5Ag0NzU2LLsps/xr8zc23hK+/+7QJRKkZVB7jm3kBw8HZx4q9Lj9lwVSpsRGg/1pABKnSTZ7UJza130FCXUcifoYLr82u3VbS7Dr2Q==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>blahblah</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><saml2:Subject xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified">john.doe@mycorp.com</saml2:NameID><saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml2:SubjectConfirmationData NotOnOrAfter="2018-03-14T22:23:41.839Z" Recipient="https://signin.aws.amazon.com/saml"/></saml2:SubjectConfirmation></saml2:Subject><saml2:Conditions NotBefore="2018-03-14T22:13:41.839Z" NotOnOrAfter="2018-03-14T22:23:41.839Z" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:AudienceRestriction><saml2:Audience>urn:amazon:webservices</saml2:Audience></saml2:AudienceRestriction></saml2:Conditions><saml2:AuthnStatement AuthnInstant="2018-03-14T22:18:10.920Z" SessionIndex="id1521065921839.1361779309" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:AuthnContext><saml2:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml2:AuthnContextClassRef></saml2:AuthnContext></saml2:AuthnStatement><saml2:AttributeStatement xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:Attribute Name="https://aws.amazon.com/SAML/Attributes/Role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">arn:aws:iam::987654321987:saml-provider/OKTA-IDP,arn:aws:iam::987654321987:role/testrole3</saml2:AttributeValue><saml2:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">arn:aws:iam::987654321987:saml-provider/OKTA-IDP,arn:aws:iam::987654321987:role/testrole4</saml2:AttributeValue><saml2:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">arn:aws:iam::987654321987:saml-provider/OKTA-IDP,arn:aws:iam::987654321987:role/testrole5</saml2:AttributeValue><saml2:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">arn:aws:iam::012345678901:saml-provider/OKTA-IDP,arn:aws:iam::012345678901:role/testrole1</saml2:AttributeValue><saml2:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">arn:aws:iam::012345678901:saml-provider/OKTA-IDP,arn:aws:iam::012345678901:role/testrole2</saml2:AttributeValue></saml2:Attribute><saml2:Attribute Name="https://aws.amazon.com/SAML/Attributes/RoleSessionName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"><saml2:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">john.doe@mycorp.com</saml2:AttributeValue></saml2:Attribute><saml2:Attribute Name="https://aws.amazon.com/SAML/Attributes/SessionDuration" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"><saml2:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">3600</saml2:AttributeValue></saml2:Attribute></saml2:AttributeStatement></saml2:Assertion></saml2p:Response>"
 
         self.roles = []
-        self.roles.append(commondef.RoleSet(idp='arn:aws:iam::012345678901:saml-provider/OKTA-IDP', 
-                                            role='arn:aws:iam::012345678901:role/testrole1',
-                                            friendly_account_name='Account: testaccount1 (012345678901)',
-                                            friendly_role_name='testrole1'))
-        self.roles.append(commondef.RoleSet(idp='arn:aws:iam::012345678901:saml-provider/OKTA-IDP', 
-                                            role='arn:aws:iam::012345678901:role/testrole2',
-                                            friendly_account_name='Account: testaccount1 (012345678901)',
-                                            friendly_role_name='testrole2'))
-        self.roles.append(commondef.RoleSet(idp='arn:aws:iam::987654321987:saml-provider/OKTA-IDP', 
-                                            role='arn:aws:iam::987654321987:role/testrole3',
-                                            friendly_account_name='Account: 987654321987',
-                                            friendly_role_name='testrole3'))
-        self.roles.append(commondef.RoleSet(idp='arn:aws:iam::987654321987:saml-provider/OKTA-IDP', 
-                                            role='arn:aws:iam::987654321987:role/testrole4',
-                                            friendly_account_name='Account: 987654321987',
-                                            friendly_role_name='testrole4'))
-        self.roles.append(commondef.RoleSet(idp='arn:aws:iam::987654321987:saml-provider/OKTA-IDP', 
-                                            role='arn:aws:iam::987654321987:role/testrole5',
-                                            friendly_account_name='Account: 987654321987',
-                                            friendly_role_name='testrole5'))
+        self.roles.append(common_def.RoleSet(idp='arn:aws:iam::012345678901:saml-provider/OKTA-IDP',
+                                             role='arn:aws:iam::012345678901:role/testrole1',
+                                             friendly_account_name='Account: testaccount1 (012345678901)',
+                                             friendly_role_name='testrole1'))
+        self.roles.append(common_def.RoleSet(idp='arn:aws:iam::012345678901:saml-provider/OKTA-IDP',
+                                             role='arn:aws:iam::012345678901:role/testrole2',
+                                             friendly_account_name='Account: testaccount1 (012345678901)',
+                                             friendly_role_name='testrole2'))
+        self.roles.append(common_def.RoleSet(idp='arn:aws:iam::987654321987:saml-provider/OKTA-IDP',
+                                             role='arn:aws:iam::987654321987:role/testrole3',
+                                             friendly_account_name='Account: 987654321987',
+                                             friendly_role_name='testrole3'))
+        self.roles.append(common_def.RoleSet(idp='arn:aws:iam::987654321987:saml-provider/OKTA-IDP',
+                                             role='arn:aws:iam::987654321987:role/testrole4',
+                                             friendly_account_name='Account: 987654321987',
+                                             friendly_role_name='testrole4'))
+        self.roles.append(common_def.RoleSet(idp='arn:aws:iam::987654321987:saml-provider/OKTA-IDP',
+                                             role='arn:aws:iam::987654321987:role/testrole5',
+                                             friendly_account_name='Account: 987654321987',
+                                             friendly_role_name='testrole5'))
 
     def setUp_client(self, verify_ssl_certs):
         resolver = AwsResolver(verify_ssl_certs)

tests/test_config.py

@@ -1,8 +1,7 @@
 """Unit tests for gimme_aws_creds.config.Config"""
 import argparse
 import unittest
-
-from mock import patch
+from unittest.mock import patch
 
 from gimme_aws_creds import ui, errors
 from gimme_aws_creds.config import Config
@@ -47,7 +46,7 @@ def test_get_args_username(self, mock_arg):
 
     def test_read_config(self):
         """Test to make sure getting config works"""
-        test_ui = MockUserInterface(argv = [
+        test_ui = MockUserInterface(argv=[
             "--profile",
             "myprofile",
         ])
@@ -63,20 +62,23 @@ def test_read_config(self):
 
     def test_read_config_inherited(self):
         """Test to make sure getting config works when inherited"""
-        test_ui = MockUserInterface(argv = [
+        test_ui = MockUserInterface(argv=[
             "--profile",
             "myprofile",
         ])
         with open(test_ui.HOME + "/.okta_aws_login_config", "w") as config_file:
-            config_file.write("""
-[mybase]
-client_id = bar
-aws_appname = baz
-[myprofile]
-inherits = mybase
-client_id = foo
-aws_rolename = myrole
-""")
+            config_file.write(
+                """
+                [mybase]
+                client_id = bar
+                aws_appname = baz
+                [myprofile]
+                inherits = mybase
+                client_id = foo
+                aws_rolename = myrole
+                """
+            )
+
         config = Config(gac_ui=test_ui, create_config=False)
         config.conf_profile = "myprofile"
         profile_config = config.get_config_dict()
@@ -127,9 +129,3 @@ def test_fail_if_profile_not_found(self):
             config.get_config_dict()
         self.assertTrue('DEFAULT profile is missing! This is profile is required when not using --profile' == context.exception.message)
 
-
-class MockUserInterface(ui.UserInterface):
-
-    def __init__(self, argv):
-        super().__init__(environ={}, argv=argv)
-        self.HOME = tempfile.mkdtemp()

tests/test_main.py

@@ -1,10 +1,9 @@
 import unittest
-
-from mock import patch
+from unittest.mock import patch
 
 from gimme_aws_creds import errors
-from gimme_aws_creds.main import GimmeAWSCreds
 from gimme_aws_creds.common import RoleSet
+from gimme_aws_creds.main import GimmeAWSCreds
 
 
 class TestMain(unittest.TestCase):

tests/test_okta_client.py

@@ -5,13 +5,13 @@
 import unittest
 from contextlib import contextmanager
 from io import StringIO
+from unittest.mock import patch
 from urllib.parse import quote
 
 import requests
 import responses
 from fido2.attestation import PackedAttestation
 from fido2.ctap2 import AttestationObject, AuthenticatorData, AttestedCredentialData
-from mock import patch
 from nose.tools import assert_equals
 
 from gimme_aws_creds import errors, ui
@@ -265,15 +265,15 @@ def test_get_state_token(self):
     def test_get_username_password_creds(self, mock_pass, mock_input):
         """Test that initial authentication works with Okta"""
         result = self.client._get_username_password_creds()
-        assert_equals(result, {'username': '[email protected]', 'password': '1234qwert' })
+        self.assertDictEqual(result, {'username': '[email protected]', 'password': '1234qwert' })
 
     @patch('getpass.getpass', return_value='1234qwert')
     @patch('builtins.input', return_value='')
     def test_passed_username(self, mock_pass, mock_input):
         """Test that initial authentication works with Okta"""
         self.client.set_username('[email protected]')
         result = self.client._get_username_password_creds()
-        assert_equals(result, {'username': '[email protected]', 'password': '1234qwert' })
+        self.assertDictEqual(result, {'username': '[email protected]', 'password': '1234qwert' })
 
 #    @patch('getpass.getpass', return_value='1234qwert')
 #    @patch('builtins.input', return_value='ann')

tests/user_interface_mock.py

@@ -1,10 +1,24 @@
 import tempfile
-from abc import ABC
 
 from gimme_aws_creds import ui
 
 
-class MockUserInterface(ui.UserInterface, ABC):
+class MockUserInterface(ui.UserInterface):
+    def result(self, result):
+        pass
+
+    def prompt(self, message):
+        pass
+
+    def message(self, message):
+        pass
+
+    def read_input(self, hidden=False):
+        pass
+
+    def notify(self, message):
+        pass
+
     def __init__(self, environ=None, argv=None):
         super().__init__(environ=environ or {}, argv=argv or [])
         self.HOME = tempfile.mkdtemp()