improve /run handling, token handling with /run

make this act more reasonable. we drop the x-auth-token header when
using /run as the idea of that endpoint is to use whats in the lowstate.
we get rid of the /token route handling as it seemingly does the same
thing as /login, and doesnt actually exist in the rest_tornado impl so
I'm considering it deprecated for simplicity.

Author: mattp-

pepper/cli.py

@@ -598,8 +598,6 @@ def poll_for_returns(self, api, load):
             list(set(ret_nodes) ^ set(nodes)))
 
     def login(self, api):
-        login = api.token if self.options.userun else api.login
-
         if self.options.mktoken:
             token_file = self.options.cache
             try:
@@ -613,7 +611,7 @@ def login(self, api):
                     logger.error('Unable to load login token from {0} {1}'.format(token_file, str(e)))
                     if os.path.isfile(token_file):
                         os.remove(token_file)
-                auth = login(**self.parse_login())
+                auth = api.login(**self.parse_login())
                 try:
                     oldumask = os.umask(0)
                     fdsc = os.open(token_file, os.O_WRONLY | os.O_CREAT, 0o600)
@@ -624,7 +622,7 @@ def login(self, api):
                 finally:
                     os.umask(oldumask)
         else:
-            auth = login(**self.parse_login())
+            auth = api.login(**self.parse_login())
 
         api.auth = auth
         self.auth = auth

pepper/libpepper.py

@@ -219,7 +219,7 @@ def req(self, path, data=None):
             req.add_header('Content-Length', clen)
 
         # Add auth header to request
-        if self.auth and 'token' in self.auth and self.auth['token']:
+        if path != '/run' and self.auth and 'token' in self.auth and self.auth['token']:
             req.add_header('X-Auth-Token', self.auth['token'])
 
         # Send request
@@ -467,14 +467,6 @@ def login(self, username=None, password=None, eauth=None, **kwargs):
         self.auth = self._send_auth('/login', **kwargs).get('return', [{}])[0]
         return self.auth
 
-    def token(self, **kwargs):
-        '''
-        Get an eauth token from Salt for use with the /run URL
-
-        '''
-        self.auth = self._send_auth('/token', **kwargs)[0]
-        return self.auth
-
     def _construct_url(self, path):
         '''
         Construct the url to salt-api for the given path