Merge branch 'main' into fix/impersonate-url

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

@@ -10,7 +10,7 @@ import { useSelector, useDispatch } from 'react-redux';
 import { useTable, useBlockLayout } from 'react-table';
 import { FixedSizeList, areEqual } from 'react-window';
 import AutoSizer from 'react-virtualized-auto-sizer';
-import { Link } from 'react-router-dom';
+import { Link, useLocation } from 'react-router-dom';
 import { useFileListing, useSystems } from 'hooks/datafiles';
 import { LoadingSpinner, SectionMessage } from '_common';
 import './DataFilesTable.scss';
@@ -19,6 +19,9 @@ import * as ROUTES from '../../../constants/routes';
 // What to render if there are no files to display
 const DataFilesTablePlaceholder = ({ section, data }) => {
   const { params, error: err, loading } = useFileListing(section);
+
+  const isPublicSystem = params?.scheme === 'public';
+
   const { api: currentListing, scheme } = params ?? {};
 
   const dispatch = useDispatch();
@@ -170,6 +173,14 @@ const DataFilesTablePlaceholder = ({ section, data }) => {
       );
     }
     if (err === '403') {
+      if (isPublicSystem)
+        return (
+          <div className="h-100 listing-placeholder">
+            <SectionMessage type="warning">
+              You must be logged in to view this data.
+            </SectionMessage>
+          </div>
+        );
       return (
         <div className="h-100 listing-placeholder">
           <SectionMessage type="warning">

client/src/components/DataFiles/DataFilesTable/DataFilesTable.test.js

@@ -197,9 +197,7 @@ describe('DataFilesTable', () => {
         </BrowserRouter>
       </Provider>
     );
-    expect(
-      getByText(/You are missing the required allocation for this system./)
-    ).toBeDefined();
+    expect(getByText(/You must be logged in to view this data./)).toBeDefined();
   });
 
   it('should display an error for 400 when the api is Google Drive', async () => {

client/src/components/PublicData/PublicData.jsx

@@ -14,6 +14,7 @@ import { useSelectedFiles } from 'hooks/datafiles';
 import DataFilesBreadcrumbs from '../DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs';
 import DataFilesListing from '../DataFiles/DataFilesListing/DataFilesListing';
 import DataFilesPreviewModal from '../DataFiles/DataFilesModals/DataFilesPreviewModal';
+import DataFilesShowPathModal from '../DataFiles/DataFilesModals/DataFilesShowPathModal';
 import { ToolbarButton } from '../DataFiles/DataFilesToolbar/DataFilesToolbar';
 
 import styles from './PublicData.module.css';
@@ -46,7 +47,9 @@ const PublicData = () => {
   useEffect(() => {
     const pathLength = location.pathname.split('/').length;
     if (publicDataSystem.system && pathLength < 6) {
-      history.push(`/public-data/tapis/public/${publicDataSystem.system}/`);
+      history.push(
+        `/public-data/tapis/public/${publicDataSystem.system}${publicDataSystem.homeDir}`
+      );
     }
   }, [publicDataSystem.system]);
 
@@ -67,6 +70,7 @@ const PublicData = () => {
         </Route>
       </Switch>
       <DataFilesPreviewModal />
+      <DataFilesShowPathModal />
     </>
   );
 };

client/src/components/PublicData/PublicData.test.js

@@ -16,6 +16,7 @@ const systems = {
       {
         name: 'Public Data',
         system: 'cep.storage.public',
+        homeDir: '/',
         scheme: 'public',
         api: 'tapis',
         icon: null,

server/portal/apps/datafiles/views.py

@@ -60,12 +60,20 @@ def get(self, request):
         return JsonResponse(response)
 
 
-@method_decorator(login_required, name='dispatch')
 class SystemDefinitionView(BaseApiView):
     """Get definitions for individual systems"""
 
     def get(self, request, systemId):
-        system_def = request.user.tapis_oauth.client.systems.getSystem(systemId=systemId)
+        try:
+            client = request.user.tapis_oauth.client
+        except AttributeError:
+            # Make sure that we only let unauth'd users see public systems
+            public_sys = next((sys for sys in settings.PORTAL_DATAFILES_STORAGE_SYSTEMS if sys['scheme'] == 'public'), None)
+            if public_sys and public_sys['system'] == systemId:
+                client = service_account()
+            else:
+                return JsonResponse({'message': 'Unauthorized'}, status=401)
+        system_def = client.systems.getSystem(systemId=systemId)
         return JsonResponse(
             {
                 "status": 200,
@@ -81,8 +89,8 @@ def get(self, request, operation=None, scheme=None, system=None, path='/'):
             client = request.user.tapis_oauth.client
         except AttributeError:
             # Make sure that we only let unauth'd users see public systems
-            if next((sys for sys in settings.PORTAL_DATAFILES_STORAGE_SYSTEMS
-                    if sys['system'] == system and sys['scheme'] == 'public'), None):
+            public_sys = next((sys for sys in settings.PORTAL_DATAFILES_STORAGE_SYSTEMS if sys['scheme'] == 'public'), None)
+            if public_sys and public_sys['system'] == system and path.startswith(public_sys['homeDir'].strip('/')):
                 client = service_account()
             else:
                 return JsonResponse(

server/portal/apps/datafiles/views_unit_test.py

@@ -161,7 +161,7 @@ def test_get_system_forbidden(client, regular_user, mock_tapis_client, agave_sto
     mock_tapis_client.systems.get.return_value = agave_storage_system_mock
 
     response = client.get("/api/datafiles/systems/definition/MySystem/")
-    assert response.status_code == 302  # redirect to login
+    assert response.status_code == 401
 
 
 @pytest.fixture