Merge branch 'develop' into 20-merge-lz-infra

cisagov · Dec 5, 2024 · ed31b7e · ed31b7e
2 parents 90be9cf + 3e772fd
commit ed31b7e
Show file tree

Hide file tree

Showing 55 changed files with 138 additions and 1,811 deletions.
diff --git a/backend/src/api/vulnerabilities.ts b/backend/src/api/vulnerabilities.ts
@@ -122,9 +122,28 @@ class VulnerabilitySearch {
       });
     }
     if (this.filters?.severity) {
-      qs.andWhere('vulnerability.severity ILIKE :severity', {
-        severity: `%${this.filters.severity}%`
-      });
+      if (this.filters.severity === 'N/A') {
+        qs.andWhere(
+          "vulnerability.severity IS NULL OR vulnerability.severity = ''"
+        );
+      } else if (this.filters.severity === 'Other') {
+        qs.andWhere(
+          `vulnerability.severity NOT ILIKE 'N/A' AND
+         vulnerability.severity NOT ILIKE 'Low' AND
+         vulnerability.severity NOT ILIKE 'Medium' AND
+         vulnerability.severity NOT ILIKE 'High' AND
+         vulnerability.severity NOT ILIKE 'Critical'AND
+         vulnerability.severity NOT ILIKE '' OR
+         vulnerability.severity ILIKE :other`,
+          {
+            other: 'Other'
+          }
+        );
+      } else {
+        qs.andWhere('vulnerability.severity ILIKE :severity', {
+          severity: `%${this.filters.severity}%`
+        });
+      }
     }
     if (this.filters?.cpe) {
       qs.andWhere('vulnerability.cpe ILIKE :cpe', {

diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js
@@ -31,9 +31,6 @@ module.exports = {
         title: '',
         items: [{ text: 'API Reference', link: '/api-reference/' }],
       },
-      {
-        items: [{ text: 'ReadySetCyber', link: '/rsc/user-guide' }],
-      },
     ],
     secondaryLinks: [
       {

diff --git a/docs/src/documentation-pages/rsc/img/assessment.png b/docs/src/documentation-pages/rsc/img/assessment.png
diff --git a/docs/src/documentation-pages/rsc/img/click-details.png b/docs/src/documentation-pages/rsc/img/click-details.png
diff --git a/docs/src/documentation-pages/rsc/img/confirmation-code.png b/docs/src/documentation-pages/rsc/img/confirmation-code.png
diff --git a/docs/src/documentation-pages/rsc/img/no-assessment.png b/docs/src/documentation-pages/rsc/img/no-assessment.png
diff --git a/docs/src/documentation-pages/rsc/img/register-email.png b/docs/src/documentation-pages/rsc/img/register-email.png
diff --git a/docs/src/documentation-pages/rsc/img/register-now.png b/docs/src/documentation-pages/rsc/img/register-now.png
diff --git a/docs/src/documentation-pages/rsc/img/register-request.png b/docs/src/documentation-pages/rsc/img/register-request.png
diff --git a/docs/src/documentation-pages/rsc/img/register.png b/docs/src/documentation-pages/rsc/img/register.png
diff --git a/docs/src/documentation-pages/rsc/img/resources.png b/docs/src/documentation-pages/rsc/img/resources.png
diff --git a/docs/src/documentation-pages/rsc/img/rsc-create-account.png b/docs/src/documentation-pages/rsc/img/rsc-create-account.png
diff --git a/docs/src/documentation-pages/rsc/img/rsc-dashboard.png b/docs/src/documentation-pages/rsc/img/rsc-dashboard.png
diff --git a/docs/src/documentation-pages/rsc/img/rsc-login.png b/docs/src/documentation-pages/rsc/img/rsc-login.png
diff --git a/docs/src/documentation-pages/rsc/img/side-nav.png b/docs/src/documentation-pages/rsc/img/side-nav.png
diff --git a/docs/src/documentation-pages/rsc/img/sign-in.png b/docs/src/documentation-pages/rsc/img/sign-in.png
diff --git a/docs/src/documentation-pages/rsc/img/terms.png b/docs/src/documentation-pages/rsc/img/terms.png
diff --git a/docs/src/documentation-pages/rsc/user-guide.md b/docs/src/documentation-pages/rsc/user-guide.md
diff --git a/frontend/scripts/api.js b/frontend/scripts/api.js
@@ -30,10 +30,7 @@ app.use((req, res, next) => {
 // These CORS origins work in all Crossfeed environments
 app.use(
   cors({
-    origin: [
-      /^https:\/\/(.*\.)?crossfeed\.cyber\.dhs\.gov$/,
-      /^https:\/\/(.*\.)?readysetcyber\.cyber\.dhs\.gov$/
-    ],
+    origin: [/^https:\/\/(.*\.)?crossfeed\.cyber\.dhs\.gov$/],
     methods: 'GET,POST,PUT,DELETE,OPTIONS'
   })
 );

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -35,9 +35,6 @@ import {
 import { LayoutWithSearch, RouteGuard } from 'components';
 import './styles.scss';
 import { Authenticator } from '@aws-amplify/ui-react';
-import { RSCDashboard } from 'components/ReadySetCyber/RSCDashboard';
-import { RSCDetail } from 'components/ReadySetCyber/RSCDetail';
-import { RSCLogin } from 'components/ReadySetCyber/RSCLogin';
 import { RiskWithSearch } from 'pages/Risk/Risk';
 import { StaticsContextProvider } from 'context/StaticsContextProvider';
 import { SavedSearchContextProvider } from 'context/SavedSearchContextProvider';
@@ -221,35 +218,6 @@ const App: React.FC = () => (
                         component={RegionUsers}
                         permissions={['regionalAdmin', 'globalView']}
                       />
-                      <RouteGuard
-                        exact
-                        path="/readysetcyber"
-                        unauth={RSCLogin}
-                        component={RSCDashboard}
-                      />
-                      <RouteGuard
-                        exact
-                        path="/readysetcyber/dashboard"
-                        component={RSCDashboard}
-                        permissions={[
-                          'globalView',
-                          'readySetCyber',
-                          'regionalAdmin',
-                          'standard'
-                        ]}
-                        unauth={RSCLogin}
-                      />
-                      <RouteGuard
-                        path="/readysetcyber/result/:id"
-                        component={RSCDetail}
-                        permissions={[
-                          'globalView',
-                          'readySetCyber',
-                          'regionalAdmin',
-                          'standard'
-                        ]}
-                        unauth={RSCLogin}
-                      />
                     </Switch>
                   </LayoutWithSearch>
                 </SearchProvider>

diff --git a/frontend/src/components/Layout.tsx b/frontend/src/components/Layout.tsx
@@ -13,8 +13,6 @@ import { useUserActivityTimeout } from 'hooks/useUserActivityTimeout';
 import { useAuthContext } from 'context/AuthContext';
 import UserInactiveModal from './UserInactivityModal/UserInactivityModal';
 import { CrossfeedFooter } from './Footer';
-import { RSCFooter } from './ReadySetCyber/RSCFooter';
-import { RSCHeader } from './ReadySetCyber/RSCHeader';
 import { SkipToMainContent } from './SkipToMainContent/index';
 import { matchPath } from 'utils/matchPath';
 import { drawerWidth, FilterDrawerV2 } from './FilterDrawerV2';
@@ -162,65 +160,57 @@ export const Layout: React.FC<PropsWithChildren<ContextType>> = ({
           <GovBanner />
           <SkipToMainContent />
         </div>
-        {!pathname.includes('/readysetcyber') ? (
-          <>
-            <div
-              style={{
-                display: 'flex',
-                flexDirection: 'row',
-                height: '100vh'
-              }}
-            >
-              {userLevel > 0 ? (
-                <FilterDrawerV2
-                  setIsFilterDrawerOpen={setIsFilterDrawerOpen}
-                  isFilterDrawerOpen={isFilterDrawerOpen}
-                  isMobile={isMobile}
-                  initialFilters={initialFilters}
-                />
-              ) : (
-                <Drawer
-                  variant="persistent"
-                  id="dummy-drawer-does-not-offer-functionality"
-                  sx={{ width: drawerWidth }}
-                  PaperProps={{ style: { position: 'unset' } }}
-                >
-                  <Box width={drawerWidth} />
-                </Drawer>
-              )}
-              <Main open={isFilterDrawerOpen} user={!!user}>
-                <Header
-                  isFilterDrawerOpen={isFilterDrawerOpen}
-                  setIsFilterDrawerOpen={setIsFilterDrawerOpen}
-                />
-                <div className="main-content" id="main-content" tabIndex={-1} />
+        <>
+          <div
+            style={{
+              display: 'flex',
+              flexDirection: 'row',
+              height: '100vh'
+            }}
+          >
+            {userLevel > 0 ? (
+              <FilterDrawerV2
+                setIsFilterDrawerOpen={setIsFilterDrawerOpen}
+                isFilterDrawerOpen={isFilterDrawerOpen}
+                isMobile={isMobile}
+                initialFilters={initialFilters}
+              />
+            ) : (
+              <Drawer
+                variant="persistent"
+                id="dummy-drawer-does-not-offer-functionality"
+                sx={{ width: drawerWidth }}
+                PaperProps={{ style: { position: 'unset' } }}
+              >
+                <Box width={drawerWidth} />
+              </Drawer>
+            )}
+            <Main open={isFilterDrawerOpen} user={!!user}>
+              <Header
+                isFilterDrawerOpen={isFilterDrawerOpen}
+                setIsFilterDrawerOpen={setIsFilterDrawerOpen}
+              />
+              <div className="main-content" id="main-content" tabIndex={-1} />
 
-                <Box
-                  display="block"
-                  position="relative"
-                  flex="1"
-                  height="calc(100vh - 64px - 72px - 24px)"
-                  overflow="scroll"
-                  sx={{
-                    '&::-webkit-scrollbar': {
-                      display: 'none'
-                    }
-                  }}
-                  zIndex={16}
-                >
-                  {children}
-                </Box>
-                <CrossfeedFooter />
-              </Main>
-            </div>
-          </>
-        ) : (
-          <>
-            <RSCHeader />
-            <div className={classes.content}>{children}</div>
-            <RSCFooter />
-          </>
-        )}
+              <Box
+                display="block"
+                position="relative"
+                flex="1"
+                height="calc(100vh - 64px - 72px - 24px)"
+                overflow="scroll"
+                sx={{
+                  '&::-webkit-scrollbar': {
+                    display: 'none'
+                  }
+                }}
+                zIndex={16}
+              >
+                {children}
+              </Box>
+              <CrossfeedFooter />
+            </Main>
+          </div>
+        </>
       </div>
     </StyledScopedCssBaseline>
   );