Merge pull request #47 from target/customize-baseurl-path

Adding Draft for Initial Testing
target · Sep 8, 2023 · c20bb6e · c20bb6e
2 parents dfaba48 + 712370e
commit c20bb6e
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 28 deletions.
diff --git a/app/blueprints/strelka.py b/app/blueprints/strelka.py
@@ -221,7 +221,15 @@ def get_yara_hits(response: list) -> list:
     yarahits = set()
 
     for r in response:
-        for yarahit in r["scan"]["yara"]["matches"]:
+        matches = (r
+                   .get("scan", {})
+                   .get("yara", {})
+                   .get("matches"))
+
+        if not isinstance(matches, list):
+            continue
+
+        for yarahit in matches:
             yarahits.add(yarahit)
     return list(yarahits)
 

diff --git a/ui/package.json b/ui/package.json
@@ -2,6 +2,7 @@
   "name": "ui",
   "version": "0.1.0",
   "private": true,
+  "homepage": ".",
   "dependencies": {
     "@ant-design/pro-form": "^1.69.4",
     "@ant-design/pro-layout": "^6.38.9",

diff --git a/ui/public/config.js b/ui/public/config.js
@@ -0,0 +1,3 @@
+window.appConfig = {
+    baseUrl: '/strelkaui' // Change this to modify the base_url to be used as a prefix to routes.
+};
diff --git a/ui/public/index.html b/ui/public/index.html
@@ -11,6 +11,7 @@
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <script src="%PUBLIC_URL%/config.js"></script>
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

diff --git a/ui/src/App.js b/ui/src/App.js
@@ -1,22 +1,24 @@
-import React, { Component } from 'react';
-import './App.css';
+import React, { Component } from "react";
+import "./App.css";
 
-import { BrowserRouter } from 'react-router-dom'
-import MainRouter from './routes/MainRouter'
-import AuthenticationProvider from './providers/AuthProvider';
+import { BrowserRouter } from "react-router-dom";
+import MainRouter from "./routes/MainRouter";
+import AuthenticationProvider from "./providers/AuthProvider";
 
-class App extends Component {  
+const baseUrl = window.appConfig ? window.appConfig.baseUrl : "/";
+
+class App extends Component {
   render() {
     return (
       <div className="App">
         <AuthenticationProvider>
-          <BrowserRouter>
-            <MainRouter/>
+          <BrowserRouter basename={baseUrl}>
+            <MainRouter />
           </BrowserRouter>
         </AuthenticationProvider>
       </div>
     );
   }
 }
 
-export default App;
+export default App;
diff --git a/ui/src/components/SubmissionTable.js b/ui/src/components/SubmissionTable.js
@@ -190,13 +190,18 @@ const SubmissionTable = ({ filesUploaded, page_size }) => {
       width: 200,
       render: (mime_types) => <TagSet items={mime_types} />,
     },
-    {
-      title: "YARA Hits",
-      dataIndex: "yara_hits",
-      key: "yara_hits",
-      width: 200,
-      render: (yara_hits) => <TagSet items={yara_hits} />,
-    },
+{
+  title: "YARA Hits",
+  dataIndex: "yara_hits",
+  key: "yara_hits",
+  width: 200,
+  render: (yara_hits = []) => {
+    if (!Array.isArray(yara_hits) || yara_hits.length === 0) {
+      return "No YARA Hits";
+    }
+    return <TagSet items={yara_hits} />;
+  },
+},
     {
       title: "Scanners Run",
       key: "scanners_run",

diff --git a/ui/src/pages/SubmissionView.js b/ui/src/pages/SubmissionView.js
@@ -210,17 +210,22 @@ const SubmissionsPage = (props) => {
               })}
             </div>
           </Descriptions.Item>
-          <Descriptions.Item label="YARA Hits">
-            <div>
-              {data?.strelka_response[0]?.scan?.[
-                "scan_yara" in data.strelka_response[0] ? "scan_yara" : "yara"
-              ].matches.map((type) => (
-                <Tag style={{ marginBottom: "4px" }} key={type}>
-                  {type}
-                </Tag>
-              ))}
-            </div>
-          </Descriptions.Item>
+            <Descriptions.Item label="YARA Hits">
+              <div>
+                {
+                  data?.strelka_response?.[0]?.scan &&
+                  (
+                    "scan_yara" in data.strelka_response[0]
+                    ? data.strelka_response[0].scan.scan_yara
+                    : data.strelka_response[0].scan.yara
+                  )?.matches?.map((type, index) => (
+                    <Tag style={{ marginBottom: "4px" }} key={type + '-' + index}>
+                      {type}
+                    </Tag>
+                  ))
+                }
+              </div>
+            </Descriptions.Item>
         </Descriptions>
       </PageHeader>