From 1540e74afef8dcaf90d9bca6124e63ae77f5f090 Mon Sep 17 00:00:00 2001
From: Gerry Nelson <45608078+gerrynelson63@users.noreply.github.com>
Date: Tue, 12 Nov 2019 15:55:59 -0500
Subject: [PATCH] Urlparse update (#28)

* Update loginviauthinfo.py

use urlparse on python 2 and 3

* update for python 3

* update for python3

* Update loginviauthinfo.py

* update loginviauthinfo

* update loginviauthinfo
---
 __pycache__/sharedfunctions.cpython-36.pyc | Bin 0 -> 8304 bytes
 loginviauthinfo.md                         |  33 +++++++++++++++++++++
 loginviauthinfo.py                         |  22 ++++++++++----
 3 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 __pycache__/sharedfunctions.cpython-36.pyc
 create mode 100644 loginviauthinfo.md

diff --git a/__pycache__/sharedfunctions.cpython-36.pyc b/__pycache__/sharedfunctions.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e4c7ea3f4e17201448edecce85d4762ddb125049
GIT binary patch
literal 8304
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

literal 0
HcmV?d00001

diff --git a/loginviauthinfo.md b/loginviauthinfo.md
new file mode 100644
index 0000000..08ba8b9
--- /dev/null
+++ b/loginviauthinfo.md
@@ -0,0 +1,33 @@
+## Usage
+
+loginviauthinfo.py is used to read the credentials from a secure location and authenticate. The secure location is a authinfo file stored in the users home directory. Authinfo files are currently used in Viya to authenticate from any of the programming interfaces (Python,Java, Lua, Base SAS).  The use of the Authinfo file makes the code far easier to share and means the credentials are stored in one secure file rather than hundreds of unsecured code files."
+
+SAS Documents creating authinfo files:
+
+In the documnettation it says 
+
+"The format of an authinfo file is based on the .netrc file specification that is used for FTP login. In addition to the .netrc file standards, the authinfo specification allows for putting commands in the file, as well as using quoted strings for passwords. The quoted strings allow for spaces within passwords and user IDs. "
+
+https://go.documentation.sas.com/?cdcId=pgmsascdc&cdcVersion=9.4_3.4&docsetId=authinfo&docsetTarget=n0xo6z7e98y63dn1fj0g9l2j7oyq.htm&locale=en
+
+Note the **pyviyatools use the .netrc format** not the updated .authinfo format. An addtional difference is that .netrc uses "machine" to identify the target environment rather than "host" for .authinfo.
+
+The .netrc format is documented here https://www.ibm.com/support/knowledgecenter/en/ssw_aix_71/filesreference/netrc.html
+
+
+Related post: https://communities.sas.com/t5/SAS-Communities-Library/Automating-post-deployment-SAS-Viya-tasks-with-REST-and-the/ta-p/603304
+
+Example of file. 
+
+First line specifies the default userid and password if no machine is specified. 
+
+Second line specifies a machine and the userid and password for that machine.
+
+```bash
+
+default user sasadm1 password mypass
+machine sasviya01.race.sas.com user sasadm2 password mpass2
+
+```
+
+It is very similair to the .authinfo format, but not exactly the same.
\ No newline at end of file
diff --git a/loginviauthinfo.py b/loginviauthinfo.py
index 614391e..916c17f 100755
--- a/loginviauthinfo.py
+++ b/loginviauthinfo.py
@@ -8,7 +8,7 @@
 #              loginviauthinfo.py -f /tmp/myfile
 #
 #
-# Authinfo file users .netrc format https://www.ibm.com/support/knowledgecenter/en/ssw_aix_71/filesreference/netrc.html
+# Authinfo file uses .netrc format https://www.ibm.com/support/knowledgecenter/en/ssw_aix_71/filesreference/netrc.html
 #
 # Example of file. First line specifies the default userid and password if no machine is specified. Second line specifies a machine and the
 # userid and password for that machine,
@@ -21,6 +21,8 @@
 # 25AUG2019 modified to logon to the host in the profile and support multiple lines in authinfo
 # 10OCT2019 minor edits to header, no code changes
 # 18OCT2019 quote the password in the CLI step to deal with special characters
+# 12NOV2019 do quote the password for windows
+# 12NOV2019 deal with urlparse on python 3
 #
 # Copyright © 2018, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 #
@@ -37,14 +39,23 @@
 #  limitations under the License.
 #
 from __future__ import print_function
+
 import netrc
 import subprocess
 import platform
 import os
 import argparse
 import json
+
 from sharedfunctions import file_accessible
-from urlparse import urlparse
+
+try:
+    # Python 3
+    from urllib.parse import urlparse
+except ImportError:
+    # Python 2
+    from urlparse import urlparse
+
 
 # CHANGE THIS VARIABLE IF YOUR CLI IS IN A DIFFERENT LOCATION
 clidir='/opt/sas/viya/home/bin/'
@@ -113,9 +124,10 @@ if profileexists:
           print('user: '+username)
           print('profile: '+myprofile)
           print('host: '+host)
-
-       #command=clidir+'sas-admin --profile '+myprofile+ ' auth login -u '+username+ ' -p '+password
-       command=clidir+"sas-admin  --profile "+myprofile+ " auth login -u "+username+ " -p '"+password+"'"
+          
+       #quote the password string for posix systems
+       if (os.name =='posix'): command=clidir+"sas-admin  --profile "+myprofile+ " auth login -u "+username+ " -p '"+password+"'"
+       else: command=clidir+'sas-admin --profile '+myprofile+ ' auth login -u '+username+ ' -p '+password 
        subprocess.call(command, shell=True)
     
     else: