Revert TMS change (#1069)

* Revert TMS change

This reverts commit f4b5b90, reversing
changes made to a2ba0dc.

Author: chandra-tacc

client/src/components/Applications/AppForm/AppForm.jsx

@@ -233,7 +233,6 @@ AppInfo.propTypes = {
 
 export const AppSchemaForm = ({ app }) => {
   const dispatch = useDispatch();
-  const { systemNeedsKeys, pushKeysSystem } = app;
 
   useEffect(() => {
     dispatch({ type: 'GET_SYSTEM_MONITOR' });
@@ -256,7 +255,10 @@ export const AppSchemaForm = ({ app }) => {
       state.allocations
     );
     const { defaultHost, configuration, defaultSystem } = state.systems.storage;
-    const keyService = pushKeysSystem?.defaultAuthnMethod === 'TMS_KEYS';
+
+    const keyService = state.systems.storage.configuration.find(
+      (sys) => sys.system === defaultSystem && sys.default
+    )?.keyservice;
 
     const hasCorral =
       configuration.length &&
@@ -297,6 +299,8 @@ export const AppSchemaForm = ({ app }) => {
     (state) => state.workbench.config.hideManageAccount
   );
 
+  const { systemNeedsKeys, pushKeysSystem } = app;
+
   const missingLicense = app.license.type && !app.license.enabled;
   const pushKeys = (e) => {
     e.preventDefault();

client/src/components/DataFiles/DataFilesTable/DataFilesTable.jsx

@@ -34,6 +34,11 @@ const DataFilesTablePlaceholder = ({ section, data }) => {
       (sysDef) => sysDef.id === state.files.params.FilesListing.system
     )
   );
+
+  const { fetchSelectedSystem } = useSystems();
+
+  const selectedSystem = fetchSelectedSystem(params ?? {});
+
   const currSystemHost = currSystem ? currSystem.host : '';
 
   const modalRefs = useSelector((state) => state.files.refs);
@@ -118,30 +123,29 @@ const DataFilesTablePlaceholder = ({ section, data }) => {
         ['private', 'projects'].includes(scheme) &&
         currSystem?.effectiveUserId === currentUser
       ) {
-        const sectionMessage =
-          currSystem?.defaultAuthnMethod === 'TMS_KEYS' ? (
-            <span>
-              For help, please{' '}
-              <Link
-                className="wb-link"
-                to={`${ROUTES.WORKBENCH}${ROUTES.DASHBOARD}${ROUTES.TICKETS}/create`}
-              >
-                submit a ticket.
-              </Link>
-            </span>
-          ) : (
-            <span>
-              If this is your first time accessing this system, you may need to{' '}
-              <a
-                className="data-files-nav-link"
-                type="button"
-                href="#"
-                onClick={pushKeys}
-              >
-                push your keys
-              </a>
-            </span>
-          );
+        const sectionMessage = selectedSystem?.keyservice ? (
+          <span>
+            For help, please{' '}
+            <Link
+              className="wb-link"
+              to={`${ROUTES.WORKBENCH}${ROUTES.DASHBOARD}${ROUTES.TICKETS}/create`}
+            >
+              submit a ticket.
+            </Link>
+          </span>
+        ) : (
+          <span>
+            If this is your first time accessing this system, you may need to{' '}
+            <a
+              className="data-files-nav-link"
+              type="button"
+              href="#"
+              onClick={pushKeys}
+            >
+              push your keys
+            </a>
+          </span>
+        );
 
         return (
           <div className="h-100 listing-placeholder">

server/poetry.lock

@@ -9,7 +9,7 @@
 from django.utils.decorators import method_decorator
 from portal.views.base import BaseApiView
 from portal.apps.accounts.managers import accounts as AccountsManager
-from portal.apps.onboarding.steps.system_access_v3 import create_system_credentials_with_keys
+from portal.apps.onboarding.steps.system_access_v3 import create_system_credentials
 from portal.utils.encryption import createKeyPair
 
 logger = logging.getLogger(__name__)
@@ -52,11 +52,11 @@ def push(self, request, system_id, body):
             hostname=body['form']['hostname']
         )
 
-        create_system_credentials_with_keys(request.user.tapis_oauth.client,
-                                            request.user.username,
-                                            publ_key_str,
-                                            priv_key_str,
-                                            system_id)
+        create_system_credentials(request.user.tapis_oauth.client,
+                                  request.user.username,
+                                  publ_key_str,
+                                  priv_key_str,
+                                  system_id)
 
         return JsonResponse(
             {

server/portal/apps/accounts/api/views/systems.py

@@ -1,23 +1,27 @@
 import logging
+import requests
+from requests.exceptions import HTTPError
 from portal.apps.onboarding.steps.abstract import AbstractStep
 from portal.apps.onboarding.state import SetupState
+from django.conf import settings
+from portal.utils.encryption import createKeyPair
 from portal.libs.agave.utils import service_account
 from tapipy.errors import BaseTapyException
-from portal.utils.encryption import createKeyPair
+
 
 logger = logging.getLogger(__name__)
 
 
-def create_system_credentials_with_keys(client,
-                                        username,
-                                        public_key,
-                                        private_key,
-                                        system_id,
-                                        skipCredentialCheck=False) -> int:
+def create_system_credentials(client,
+                              username,
+                              public_key,
+                              private_key,
+                              system_id,
+                              skipCredentialCheck=False) -> int:
     """
     Set an RSA key pair as the user's auth credential on a Tapis system.
     """
-    logger.info(f"Creating user credential for {username} on Tapis system {system_id} using keys")
+    logger.info(f"Creating user credential for {username} on Tapis system {system_id}")
     data = {'privateKey': private_key, 'publicKey': public_key}
     client.systems.createUserCredential(
         systemId=system_id,
@@ -27,21 +31,16 @@ def create_system_credentials_with_keys(client,
     )
 
 
-def create_system_credentials(client,
-                              username,
-                              system_id,
-                              createTmsKeys,
-                              skipCredentialCheck=False) -> int:
+def register_public_key(username, publicKey, system_id) -> int:
     """
-    Create user's auth credential on a Tapis system. This Tapis API uses TMS.
+    Push a public key to the Key Service API.
     """
-    logger.info(f"Creating user credential for {username} on Tapis system {system_id} using TMS")
-    client.systems.createUserCredential(
-        systemId=system_id,
-        userName=username,
-        createTmsKeys=createTmsKeys,
-        skipCredentialCheck=skipCredentialCheck,
-    )
+    url = "https://api.tacc.utexas.edu/keys/v2/" + username
+    headers = {"Authorization": "Bearer {}".format(settings.KEY_SERVICE_TOKEN)}
+    data = {"key_value": publicKey, "tags": [{"name": "system", "value": system_id}]}
+    response = requests.post(url, json=data, headers=headers)
+    response.raise_for_status()
+    return response.status_code
 
 
 def set_user_permissions(user, system_id):
@@ -78,12 +77,6 @@ def prepare(self):
         self.state = SetupState.PENDING
         self.log("Awaiting TACC systems access.")
 
-    def get_system(self, system_id) -> None:
-        """
-        Get the system definition
-        """
-        return self.user.tapis_oauth.client.systems.getSystem(systemId=system_id)
-
     def check_system(self, system_id) -> None:
         """
         Check whether a user already has access to a storage system by attempting a listing.
@@ -108,17 +101,21 @@ def process(self):
             except BaseTapyException:
                 self.log(f"Creating credentials for system: {system}")
 
-            system_definition = self.get_system(system)
+            (priv, pub) = createKeyPair()
+
+            try:
+                register_public_key(self.user.username, pub, system)
+                self.log(f"Successfully registered public key for system: {system}")
+            except HTTPError as e:
+                logger.error(e)
+                self.fail(f"Failed to register public key with key service for system: {system}")
+
             try:
-                if system_definition.get("defaultAuthnMethod") != 'TMS_KEYS':
-                    (priv, pub) = createKeyPair()
-                    create_system_credentials_with_keys(
-                        self.user.tapis_oauth.client, self.user.username, pub, priv, system
-                    )
-                else:
-                    create_system_credentials(
-                        self.user.tapis_oauth.client, self.user.username, system, createTmsKeys=True
-                    )
+                create_system_credentials(self.user.tapis_oauth.client,
+                                          self.user.username,
+                                          pub,
+                                          priv,
+                                          system)
                 self.log(f"Successfully created credentials for system: {system}")
             except BaseTapyException as e:
                 logger.error(e)

server/portal/apps/onboarding/steps/system_access_v3.py

@@ -4,6 +4,7 @@
 from typing import Literal
 from django.conf import settings
 from django.contrib.auth import get_user_model
+# from portal.apps.onboarding.steps.system_access_v3 import create_system_credentials, register_public_key
 
 
 import logging
@@ -182,6 +183,16 @@ def create_shared_workspace(client: Tapis, title: str, owner: str, **kwargs):
 
     # User creates the system and adds their credential
     system_id = create_workspace_system(client, workspace_id, title)
+    # priv_key, pub_key = createKeyPair()
+    # register_public_key(owner,
+    #                     pub_key,
+    #                     system_id)
+    # create_system_credentials(client, owner, pub_key, priv_key, system_id)
+    # create_system_credentials(service_client,
+    #                           settings.PORTAL_ADMIN_USERNAME,
+    #                          settings.PORTAL_PROJECTS_PUBLIC_KEY,
+    #                           settings.PORTAL_PROJECTS_PRIVATE_KEY,
+    #                           system_id)
 
     return system_id
 
@@ -201,6 +212,14 @@ def add_user_to_workspace(client: Tapis,
                        "add",
                        role)
 
+    # Code to generate/push user keys to a workspace
+    # (uncomment to add per-user credentials)
+    # priv_key, pub_key = createKeyPair()
+    # register_public_key(username,
+    #                     pub_key,
+    #                     system_id)
+    # create_system_credentials(client, username, pub_key, priv_key, system_id)
+
     # Share system to allow listing of users
     client.systems.shareSystem(systemId=system_id, users=[username])
     set_workspace_permissions(client, username, system_id, role)

server/portal/apps/projects/workspace_operations/shared_workspace_operations.py

@@ -1,9 +1,4 @@
-from portal.apps.onboarding.steps.system_access_v3 import create_system_credentials
-from tapipy.errors import BaseTapyException
 import json
-import logging
-
-logger = logging.getLogger(__name__)
 
 
 def get_tapis_timeout_error_messages(job_id):
@@ -31,30 +26,3 @@ def check_job_for_timeout(job):
             job.remoteOutcome = 'FINISHED'
 
     return job
-
-
-def should_push_keys(system):
-    """
-    If defaultAuthnMethod is not TMS_KEYS, return true. Otherwise, false.
-    """
-    return system.get("defaultAuthnMethod") != 'TMS_KEYS'
-
-
-def test_system_credentials(system, user):
-    """
-    If system does not support TMS, create keys and
-    tapis system credentials using keys, otherwise create
-    credentials with TMS.
-    """
-    # TODOv3: Add Tapis system test utility method with proper error handling https://tacc-main.atlassian.net/browse/WP-101
-    tapis = user.tapis_oauth.client
-    if should_push_keys(system):
-        return False
-    else:
-        try:
-            create_system_credentials(user.tapis_oauth.client, user.username, system.id, createTmsKeys=True)
-            tapis.files.listFiles(systemId=system.id, path="/")
-        except BaseTapyException:
-            return False
-
-    return True