integrations specify type in standalone report + issuer/subject color…

…ed/multiline
WilliamSalusky · Sep 3, 2021 · 53043ec · 53043ec
1 parent 53dd71e
commit 53043ec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/Layouts/TableLayout.tsx b/src/Layouts/TableLayout.tsx
@@ -1,6 +1,13 @@
 import {DataLayout} from "./DataLayout";
 import React, {useState} from "react";
-import {makeColorElems, makeUnbreakable, toColorText, trySnipDate, typeColors} from "../Util/Util";
+import {
+    makeColorElems,
+    makeUnbreakable,
+    toColorElemsMultiline,
+    toColorText,
+    trySnipDate,
+    typeColors
+} from "../Util/Util";
 import {ASCENDING, DESCENDING} from "../Util/SortUtil";
 import {LinkOut} from "../Components/LinkBack";
 import {MaxLen} from "../Util/ElemUtil";
@@ -64,9 +71,12 @@ const makeColumn = (columnable: Columnable): Column => {
             }
 
             switch (str) {
-                case 'color':
+                case 'color_inline':
                     column.genContents = value => <span>{makeColorElems(value)}</span>;
                     break;
+                case 'color':
+                    column.genContents = value => <div>{toColorElemsMultiline(toColorText(value))}</div>;
+                    break;
                 case 'stringify_inline':
                     const func = (value: any) => toColorText(value, {multiline: false}).genText();
                     column.genContents = func;

diff --git a/src/Types/Integration.tsx b/src/Types/Integration.tsx
@@ -58,8 +58,8 @@ export class Integration {
 
     genStandaloneReportText(): string {
         const iData = this.genIndicatorData();
-        const indicatorDeclaration = `${ITypes[iData.type]}${(iData.subType === ISubTypes.NONE ? '' : `(${ISubTypes[iData.subType]})`)}: ${iData.value}`;
-        return `${indicatorDeclaration}\n\n${this.genReportText()}`;
+        const header = `${this.type} for ${iData.value}`;
+        return `${header}\n\n${this.genReportText()}`;
     }
 
     genReportText(): string {
@@ -652,8 +652,8 @@ export class ShodanIntegration extends Integration {
                     ['', linkOutColumn(value => {
                         return `https://search.censys.io/certificates?q=${value}`
                     })],
-                    ['issuer', 'stringify_inline'],
-                    ['subject', 'stringify_inline'],
+                    ['issuer', 'color'],
+                    ['subject', 'color'],
                 ],
                 (rowData => {
                     const {issued, expires, fingerprint, issuer, subject} = rowData?.ssl?.cert || {};