Getting employee login command working

Author: allmightyspiff

SoftLayer/API.py

@@ -6,6 +6,7 @@
     :license: MIT, see LICENSE for more details.
 """
 # pylint: disable=invalid-name
+import os
 import time
 import warnings
 
@@ -144,7 +145,8 @@ def create_client_from_env(username=None,
 
 
 def employee_client(username=None,
-                    api_key=None,
+                    access_token=None,
+                    password=None,
                     endpoint_url=None,
                     timeout=None,
                     auth=None,
@@ -159,7 +161,8 @@ def employee_client(username=None,
     config file.
 
     :param username: your user ID
-    :param api_key: hash from SoftLayer_User_Employee::performExternalAuthentication(username, password, 2fa_string)
+    :param access_token: hash from SoftLayer_User_Employee::performExternalAuthentication(username, password, 2fa_string)
+    :param password: password to use for employee authentication
     :param endpoint_url: the API endpoint base URL you wish to connect to.
         Set this to API_PRIVATE_ENDPOINT to connect via SoftLayer's private
         network.
@@ -185,15 +188,21 @@ def employee_client(username=None,
 
     """
     settings = config.get_client_settings(username=username,
-                                          api_key=api_key,
+                                          api_key=None,
                                           endpoint_url=endpoint_url,
                                           timeout=timeout,
                                           proxy=proxy,
                                           verify=verify,
                                           config_file=config_file)
 
+    url = settings.get('endpoint_url') or consts.API_EMPLOYEE_ENDPOINT
+
+    if 'internal' not in url:
+        raise exceptions.SoftLayerError("{} does not look like an Internal Employee url. Try {}".format(
+                                         url, consts.API_EMPLOYEE_ENDPOINT))
+
     if transport is None:
-        url = settings.get('endpoint_url')
+        
         if url is not None and '/rest' in url:
             # If this looks like a rest endpoint, use the rest transport
             transport = transports.RestTransport(
@@ -214,24 +223,26 @@ def employee_client(username=None,
             )
 
 
-    if auth is None and settings.get('username') and settings.get('api_key'):
-        real_transport = getattr(transport, 'transport', transport)
-        if isinstance(real_transport, transports.XmlRpcTransport):
-            auth = slauth.EmployeeAuthentication(
-                settings.get('username'),
-                settings.get('api_key'),
-            )
+    if access_token is None:
+        access_token = settings.get('access_token')
+
+    user_id = settings.get('user_id')
+
+    # Assume access_token is valid for now, user has logged in before at least.
+    if access_token and user_id:
+        auth = slauth.EmployeeAuthentication(user_id, access_token)
+        return EmployeeClient(auth=auth, transport=transport)
+    else:
+        return EmployeeClient(auth=None, transport=transport)
 
-    return BaseClient(auth=auth, transport=transport)
 
 
 def Client(**kwargs):
     """Get a SoftLayer API Client using environmental settings.
 
     Deprecated in favor of create_client_from_env()
     """
-    warnings.warn("use SoftLayer.create_client_from_env() instead",
-                  DeprecationWarning)
+    warnings.warn("use SoftLayer.create_client_from_env() instead", DeprecationWarning)
     return create_client_from_env(**kwargs)
 
 

SoftLayer/CLI/environment.py

@@ -198,7 +198,7 @@ def ensure_client(self, config_file=None, is_demo=False, proxy=None):
             )
         else:
             # Create SL Client
-            client = SoftLayer.create_client_from_env(
+            client = SoftLayer.employee_client(
                 proxy=proxy,
                 config_file=config_file,
             )

SoftLayer/CLI/login.py

@@ -2,18 +2,51 @@
 # :license: MIT, see LICENSE for more details.
 
 import click
+import os 
 
+
+from SoftLayer.API import EmployeeClient
 from SoftLayer.CLI.command import SLCommand as SLCommand
-from SoftLayer.CLI import config
+from SoftLayer import config
 from SoftLayer.CLI import environment
 
 
+# def get_username(env):
+#     """Gets the username from config or env"""
+#     settings = 
+
+def censor_password(value):
+    if value:
+        value = '*' * len(value)
+    return value
+
 @click.command(cls=SLCommand)
 @environment.pass_env
 def cli(env):
     """Logs you into the internal SoftLayer Network.
 
-    username and password can be set in SL_USER and SL_PASSWORD env variables. You will be prompted for them otherwise.
+    username: Set this in either the softlayer config, or SL_USER ENV variable 
+    password: Set this in SL_PASSWORD env variable. You will be prompted for them otherwise.
     """
+    settings = config.get_config(config_file=env.config_file)
+    username = settings.get('username') or os.environ.get('SLCLI_USER')
+    password = os.environ.get('SLCLI_PASSWORD', '')
+    yubi = 123456
+
+    url = settings.get('endpoint_url') or consts.API_EMPLOYEE_ENDPOINT
+    click.echo("URL: {}".format(url))
+    if username is None:
+        username = input("Username: ")
+    click.echo("Username: {}".format(username))
+    if password is None:
+        password = env.getpass("Password: ")
+    click.echo("Password: {}".format(censor_password(password)))
+    # yubi = input("Yubi: ")
+
+    client = EmployeeClient(config_file=env.config_file)
+    try:
+        client.authenticate_with_password(username, password, yubi)
+    except Exception as e:
+        click.echo("EXCEPTION: {}".format(e))
 
     print("OK")

SoftLayer/auth.py

@@ -143,7 +143,7 @@ class EmployeeAuthentication(AuthenticationBase):
     """Token-based authentication class.
 
         :param username str: a user's username
-        :param api_key str: a user's API key
+        :param user_hash str: a user's Authentication hash
     """
     def __init__(self, user_id, user_hash):
         self.user_id = user_id

SoftLayer/consts.py

@@ -10,5 +10,6 @@
 API_PRIVATE_ENDPOINT = 'https://api.service.softlayer.com/xmlrpc/v3.1/'
 API_PUBLIC_ENDPOINT_REST = 'https://api.softlayer.com/rest/v3.1/'
 API_PRIVATE_ENDPOINT_REST = 'https://api.service.softlayer.com/rest/v3.1/'
+API_EMPLOYEE_ENDPOINT = 'https://internal.app0lb.dal10.softlayer.local/v3/internal/xmlrpc/'
 USER_AGENT = "softlayer-python/%s" % VERSION
 CONFIG_FILE = "~/.softlayer"