From b31a1f5488c0255c979d8cf39cd343f4da96f19e Mon Sep 17 00:00:00 2001 From: Burt Bielicki Date: Tue, 23 Feb 2016 15:04:14 -0800 Subject: [PATCH 1/4] Pass through the connection verify setting for fetching the auth token --- .../Python/msrestazure/msrestazure/azure_active_directory.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ClientRuntimes/Python/msrestazure/msrestazure/azure_active_directory.py b/ClientRuntimes/Python/msrestazure/msrestazure/azure_active_directory.py index 11f074faa5..74618d5a44 100644 --- a/ClientRuntimes/Python/msrestazure/msrestazure/azure_active_directory.py +++ b/ClientRuntimes/Python/msrestazure/msrestazure/azure_active_directory.py @@ -290,6 +290,7 @@ def set_token(self): username=self.username, password=self.password, resource=self.resource, + verify=self.verify, **optional) except (RequestException, OAuth2Error, InvalidGrantError) as err: raise_with_traceback(AuthenticationError, "", err) From 22870b28a0cad6cad63169931954219a79b119c8 Mon Sep 17 00:00:00 2001 From: Burt Bielicki Date: Wed, 24 Feb 2016 10:14:54 -0800 Subject: [PATCH 2/4] Update unit test to check verify setting is propogated --- ClientRuntimes/Python/msrestazure/test/unittest_auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ClientRuntimes/Python/msrestazure/test/unittest_auth.py b/ClientRuntimes/Python/msrestazure/test/unittest_auth.py index 17eb209650..4453ab56b9 100644 --- a/ClientRuntimes/Python/msrestazure/test/unittest_auth.py +++ b/ClientRuntimes/Python/msrestazure/test/unittest_auth.py @@ -314,7 +314,7 @@ def test_user_pass_credentials(self): self.assertEqual(creds.token, session.fetch_token.return_value) session.fetch_token.assert_called_with( "token_uri", client_id="id", username='user', - client_secret="secret", password='pass', resource='resource') + client_secret="secret", password='pass', resource='resource', verify=True) session.fetch_token.side_effect = oauthlib.oauth2.OAuth2Error From 5f83d537fc3b79e7daacefc746c2825e3b109dce Mon Sep 17 00:00:00 2001 From: Burt Bielicki Date: Wed, 24 Feb 2016 10:43:25 -0800 Subject: [PATCH 3/4] Adding 2 more calls to check verify setting --- ClientRuntimes/Python/msrestazure/test/unittest_auth.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ClientRuntimes/Python/msrestazure/test/unittest_auth.py b/ClientRuntimes/Python/msrestazure/test/unittest_auth.py index 4453ab56b9..c774fea23a 100644 --- a/ClientRuntimes/Python/msrestazure/test/unittest_auth.py +++ b/ClientRuntimes/Python/msrestazure/test/unittest_auth.py @@ -1,4 +1,4 @@ -#-------------------------------------------------------------------------- +test#-------------------------------------------------------------------------- # # Copyright (c) Microsoft Corporation. All rights reserved. # @@ -331,7 +331,7 @@ def test_user_pass_credentials(self): session.fetch_token.assert_called_with( "https://login.microsoftonline.com/private/oauth2/token", client_id='04b07795-8ddb-461a-bbee-02f9e1bf7b46', username='my_username', - password='my_password', resource='resource') + password='my_password', resource='resource', verify=False) with mock.patch.object( UserPassCredentials, '_setup_session', return_value=session): @@ -342,7 +342,7 @@ def test_user_pass_credentials(self): session.fetch_token.assert_called_with( "https://login.chinacloudapi.cn/private/oauth2/token", client_id="client_id", username='my_username', - password='my_password', resource='https://management.core.chinacloudapi.cn/') + password='my_password', resource='https://management.core.chinacloudapi.cn/', verify=False) if __name__ == '__main__': From e073080427bb006bf030e567626d10eb1a4672fc Mon Sep 17 00:00:00 2001 From: Burt Bielicki Date: Wed, 24 Feb 2016 16:44:45 -0800 Subject: [PATCH 4/4] fix typo --- ClientRuntimes/Python/msrestazure/test/unittest_auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ClientRuntimes/Python/msrestazure/test/unittest_auth.py b/ClientRuntimes/Python/msrestazure/test/unittest_auth.py index c774fea23a..e7fe73f67b 100644 --- a/ClientRuntimes/Python/msrestazure/test/unittest_auth.py +++ b/ClientRuntimes/Python/msrestazure/test/unittest_auth.py @@ -1,4 +1,4 @@ -test#-------------------------------------------------------------------------- +#-------------------------------------------------------------------------- # # Copyright (c) Microsoft Corporation. All rights reserved. #