bugfix: authinfo file

Author: jlwalke2

CHANGELOG.md

@@ -2,7 +2,14 @@
 Unreleased
 ----------
 
-- 
+ - 
+
+ 
+v1.1.1 (2019-8-6)
+-----------------
+**Bugfixes**
+- Fixed an issue where usernames were not parsed correctly from .authinfo files, resulting in failed logins. 
+
 
 v1.1.0 (2019-8-5)
 -----------------

src/sasctl/__init__.py

@@ -4,7 +4,7 @@
 # Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-__version__ = '1.1.0'
+__version__ = '1.1.1'
 __author__ = 'SAS'
 __credits__ = ['Yi Jian Ching, Lucas De Paula, Peter Tobac, Chris Toth, Jon '
                'Walker']

src/sasctl/core.py

@@ -304,8 +304,8 @@ def __init__(self, hostname,
             if 'swat' in sys.modules:
                 auth = swat.utils.authinfo.query_authinfo(domain, user=username,
                                                           path=authinfo)
-                self._settings['username'], self._settings[
-                    'password'] = auth.get('username'), auth.get('password')
+                self._settings['username'] = auth.get('user')
+                self._settings['password'] = auth.get('password')
 
             # Not able to load credentials using SWAT.  Try Netrc.
             # TODO: IF a username was specified, verify that the credentials found

tests/unit/test_session.py

@@ -33,6 +33,49 @@ def test_session_from_url():
     assert s.hostname == 'example.com'
     assert s._settings['protocol'] == 'http'
 
+
+def test_from_authinfo(tmpdir_factory):
+    filename = str(tmpdir_factory.mktemp('tmp').join('authinfo'))
+
+    HOSTNAME = 'example.com'
+    USERNAME = 'BlackKnight'
+    PASSWORD = 'iaminvincible!'
+
+    with open(filename, 'w') as f:
+        f.write('machine %s login %s password %s'
+                % (HOSTNAME, USERNAME, PASSWORD))
+
+    # Get username & password from matching hostname
+    with mock.patch('sasctl.core.Session.get_token'):
+        s = Session('http://example.com', authinfo=filename)
+    assert s.hostname == HOSTNAME
+    assert s.username == USERNAME
+    assert s._settings['password'] == PASSWORD
+
+
+    with open(filename, 'w') as f:
+        f.write('host %s user %s password %s'
+                % (HOSTNAME, USERNAME, PASSWORD))
+
+    with mock.patch('sasctl.core.Session.get_token'):
+        s = Session('http://example.com', authinfo=filename)
+    assert s.hostname == HOSTNAME
+    assert s.username == USERNAME
+    assert s._settings['password'] == PASSWORD
+
+    with open(filename, 'w') as f:
+        f.write('host %s user %s password %s\n'
+                % (HOSTNAME, 'Arthur', 'kingofthebrittons'))
+        f.write('host %s user %s password %s\n'
+                % (HOSTNAME, USERNAME, PASSWORD))
+
+    with mock.patch('sasctl.core.Session.get_token'):
+        s = Session('http://example.com', username=USERNAME, authinfo=filename)
+    assert s.hostname == HOSTNAME
+    assert s.username == USERNAME
+    assert s._settings['password'] == PASSWORD
+
+
 def test_new_session(missing_packages):
     HOST = 'example.com'
     USERNAME = 'user'