STIX Domain Objects (SDOs)
STIX Cyber-observable Objects (SCOs)
@@ -58,6 +128,9 @@
+ 
+
+ 
+ //
`)
+ $('.message-status').html(`Node of type "${type}" cannot be added to a kill chain.`)
+ }
+
+
+ }
+ })
+ }
+
+ // console.log("Reset prevPosition")
+ ele.data("prevPosition", null)
+ ele.parent().data("prevBounds", null)
+
+
+}
+
+function handleDrag(e: cytoscape.EventObject) {
+ var ele = e.target
+
+ if (ele.hasClass("stix_node") && ele.isChild()) {
+ var parent = e.cy.$(`#${ele.data("parent")}`)
+
+ var prevPosition = {x:0, y:0}
+
+ if (!ele.data("prevPosition")) {
+
+ prevPosition.x = ele.position().x
+ prevPosition.y = ele.position().y
+ // console.log(prevPosition)
+ ele.data("prevPosition", prevPosition)
+ } else {
+ prevPosition = ele.data("prevPosition")
+ }
+
+ // Check if the node can be removed from a layer
+ var dX = ele.position().x - prevPosition.x
+ var dY = ele.position().y - prevPosition.y
+
+ if (canRemove(parent, dX, dY)) {
+ var lPos = parent.position()
+ lPos.x -= dX
+ lPos.y -= dY
+ parent.position(lPos)
+ ele.move({parent: null})
+ var data = ele.data("raw_data")
+ if (parent.hasClass("layer")) {
+ if (Object.getOwnPropertyNames(data["extensions"]).length == 1) {
+ // There is only one extension. Delete the extensions property.
+ delete data["extensions"]
+ } else {
+ // There are multiple extensions defined. Find the right one and delete it.
+ var extId = Object.getOwnPropertyNames(defenseExtension.property)[0]
+ // console.log("removing:", extId)
+ delete data["extensions"][extId]
+ }
+ } else if (parent.hasClass("phase")) {
+ if (data["kill_chain_phases"].length == 1) {
+ // There is only one kill chain phase. Delete the kill_chain_phases property.
+ delete data["kill_chain_phases"]
+ // console.log("check: ", data["kill_chain_phases"])
+ } else {
+ // There are multiple kill chain phases defined. Find the right one and delete it.
+
+ // console.log("Multiple kill chains")
+
+ var kill_chain_name = parent.parent()[0].data("name")
+ var phase_name = parent.data("name")
+
+ // console.log(kill_chain_name, phase_name)
+
+ var phaseList = data["kill_chain_phases"] as Array
+ // STIG
+ //
+ //
+ //
+ // Node of type "${type}" cannot be added to a kill chain.
+ //
+ // Message: ${message}
-Stack: ${stack}
`); - } - public display() { - const dialog = new ErrorWidget($('#error-anchor')); - dialog.open(); - } -} - -export class HTTPQueryError implements Error { - public props: any; - public code: number; - public name: string = "QueryError"; - public message: string; - public json: OrientErrorMessage; - public statusCode = this.code; - public statusMessage = this.message; - constructor(code: string | number, msg: string, props?: any) { - if (typeof code === "string") { (this.isCodeString(code)) ? code = http_codes[code] : code = +code; } - if (typeof code !== "number") { throw new TypeError(`unsupported HTTP Code: ${code}`); } - if (typeof msg === "object" && msg !== null) { props = msg; msg = null; } - this.code = code; - try { - this.json = JSON.parse(msg); - this.message = JSON.stringify(this.json); - } catch (e) { - this.json = undefined; - this.message = msg; - } - this.props = props; - $('#query-status').html('Query Error!'); - } - - private isCodeString(code: string) { - // tslint:disable-next-line:use-isnan - return +code === NaN; - } - - public toHtml() { - let msg = 'Query Error
'; - if (this.json !== undefined && this.json.errors && this.json.errors.length > 0) { - this.json.errors.forEach((e) => { - msg += `Status Code: ${e.code} - ${http_codes.getStatusText(e.code)}<\p> - Error: `; - msg += `
${e.content.replace(//g, '>').replace(/\n/g, '
')}
- 
+ 
+
@@ -176,9 +249,9 @@
@@ -217,21 +290,22 @@
+
+
+
+
-
-
+
-
+
diff --git a/src/index.ts b/src/index.ts
index 13080731..7d44908b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,128 +1,5 @@
-/*
-Copyright 2018 Southern California Edison Company
+import {main} from './main';
+require('webpack-jquery-ui')
+require('webpack-jquery-ui/controlgroup');
-ALL RIGHTS RESERVED
- */
-
-import { app, BrowserWindow, ipcMain, Event, BrowserWindowConstructorOptions } from 'electron';
-import * as unhandled from 'electron-unhandled';
-import * as path from 'path';
-import * as config_menu from './ui/main-window-menu';
-import * as window_manager from './ui/window-manager';
-import { DatabaseConfigurationStorage } from './storage';
-import { openDatabaseConfigurationDialogMain } from './ui/configuration-dialog-main';
-import { IDatabaseConfigOptions } from './storage/database-configuration-storage';
-
-// tslint:disable-next-line:no-var-requires
-if (require('electron-squirrel-startup')) { // eslint-disable-line global-require
- app.quit();
-}
-
-config_menu.setup();
-
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow: BrowserWindow;
-
-function createWindow() {
- const window_options: BrowserWindowConstructorOptions = {
- width: 1024,
- // width: winmgr.width,
- height: 768,
- // height: winmgr.height,
- // x: winmgr.x > 0 ? winmgr.x : undefined,
- // y: winmgr.y > 0 ? winmgr.x : undefined,
- icon: path.join(__dirname, '../assets/icons/png/64x64.png'),
- };
- const winmgr = window_manager.instance;
- if (!winmgr.is_initial()) {
- window_options.x = winmgr.x;
- window_options.y = winmgr.y;
- window_options.width = winmgr.width;
- window_options.height = winmgr.height;
- window_options.fullscreen = winmgr.isFullScreen;
- // window_options.webPreferences.nodeIntegration = false;
- }
- mainWindow = new BrowserWindow(window_options);
- if (winmgr.maximize) {
- mainWindow.maximize();
- }
- winmgr.window = mainWindow;
- window_manager.set_events();
-
- mainWindow.loadURL(`file://${__dirname}/index.html`);
-
- ipcMain.on("openDialog", (event: Event) => {
- return event.returnValue = JSON.stringify(DatabaseConfigurationStorage.Instance.currentConfig());
- });
-
- ipcMain.on("closeDialog", (data: IDatabaseConfigOptions) => {
- DatabaseConfigurationStorage.Instance.save(data);
- });
-
- ipcMain.on("prompt", () => {
- openDatabaseConfigurationDialogMain(mainWindow);
- });
-
- ipcMain.on("useDatabase", (_event: Electron.Event, options: IDatabaseConfigOptions) => {
- mainWindow.webContents.send('database_reconfigured', options);
- });
-
- // mainWindow.webContents.openDevTools();
-
- // Emitted when the window is closed.
- mainWindow.on('closed', () => {
- // Dereference the window object, usually you would store windows
- // in an array if your app supports multi windows, this is the time
- // when you should delete the corresponding element.
- window_manager.remove_events();
- mainWindow = null;
- });
-
- // mainWindow.on('unresponsive', () => {
- // const options = {
- // type: 'info',
- // title: 'Main Process Hanging',
- // message: 'This process is hanging.',
- // buttons: ['Reload', "Close"],
- // };
- // dialog.showMessageBox(options, (index) => {
- // if (index === 0) { mainWindow.reload(); } else { mainWindow.close(); }
- // });
- // });
-
-// mainWindow.webContents.on('crashed', () => {
-// const options = {
-// type: 'info',
-// title: 'Renderer Process Crashed',
-// message: 'This process has crashed.',
-// buttons: ['Reload', 'Close'],
-// };
-// dialog.showMessageBox(options, (index) => {
-// if (index === 0) { mainWindow.reload(); } else { mainWindow.close(); }
-// });
-// });
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow);
-
-// Quit when all windows are closed.
-app.on('window-all-closed', () => {
- // On OS X it is common for applications and their menu bar
- // to stay active until the user quits explicitly with Cmd + Q
- if (process.platform !== 'darwin') {
- app.quit();
- }
-});
-
-app.on('activate', () => {
- // On OS X it's common to re-create a window in the app when the
- // dock icon is clicked and there are no other windows open.
- unhandled();
- if (mainWindow === null) {
- createWindow();
- }
-});
+main.prototype.run();
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 4717b8bf..5a393fbc 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,127 +1,470 @@
-/*
-Copyright 2018 Southern California Edison Company
+// /*
+// Copyright 2018 Southern California Edison Company
-ALL RIGHTS RESERVED
- */
+// ALL RIGHTS RESERVED
+// */
-import * as moment from 'moment';
-import * as unhandled from 'electron-unhandled';
-import * as uuid from 'uuid';
+import uuid from 'uuid';
import {
- BundleType,
Relationship,
- SDO,
- SRO,
StixObject,
Indicator,
ObservedData,
Report,
StixNode,
+ StixRelationship,
+ BundleType,
+ SRO,
+ SDO,
} from './stix';
import * as stix from './stix';
import * as fileSaver from 'file-saver';
-// import { ViewUtilitiesOptions } from './cytoscape-view-utilities';
-import { StigDB } from './db/db';
import {
+ compound_style,
edge_style,
node_style,
select_node_style,
view_utils_options,
modified_unselect_style,
modified_select_style,
+ layouts
} from './graph/graphOptions';
-import * as cola from 'cytoscape-cola';
-import * as cosebilkent from 'cytoscape-cose-bilkent';
-import * as dagre from 'cytoscape-dagre';
-import * as euler from 'cytoscape-euler';
-import * as ngraph from 'cytoscape-ngraph.forcelayout';
-import * as spread from 'cytoscape-spread';
-import { QueryHistoryDialog } from './ui/queryHistoryWidget';
+import cola from 'cytoscape-cola';
+import cosebilkent from 'cytoscape-cose-bilkent';
+import dagre from 'cytoscape-dagre';
+import euler from 'cytoscape-euler';
+// import ngraph from 'cytoscape-ngraph.forcelayout';
+import spread from 'cytoscape-spread';
import { setup_edge_handles, edgehandles_style } from './graph/edge-handles';
import { setup_ctx_menu } from './graph/context-menu';
import { GraphUtils } from './graph/graphFunctions';
import { StixEditor } from './ui/stix-editor';
-import * as Split from 'split.js';
-import * as cytoscape from 'cytoscape';
+import Split from 'split.js';
+import cytoscape, { CytoscapeOptions } from 'cytoscape';
import { ViewUtilitiesOptions } from './graph/graphOptions';
-import { ipcRenderer } from 'electron';
-import { GraphQueryResult } from './db/db_types';
-import * as edgehandles from 'cytoscape-edgehandles';
+import edgehandles from 'cytoscape-edgehandles';
+import moment from 'moment';
import { QueryStorageService, DatabaseConfigurationStorage, StigSettings } from './storage';
-import { setHandlers } from './ui/ipc-render-handlers';
+import {graph_copy, graph_paste} from './ui/clipboard'
+import { openDatabaseConfiguration } from './ui/database-config-widget';
+import { check_db, commit, get_diff, query } from './db/dbFunctions';
+import { commit_all, delete_selected } from './ui/ipc-render-handlers';
+import { GraphQueryResult } from './db/db_types';
+import { QueryHistoryDialog } from './ui/queryHistoryWidget';
+import { DiffDialog } from './ui/diff-dialog';
+import { removeCompoundNodes, initDefenseGraph, initKillChainGraph } from './contextLayouts/contextLayouts';
+import tippy from 'tippy.js'
+import { organizeOrphans } from './contextLayouts/graphLayoutFunctions';
+
+const killChain = require("./contextLayouts/killChainSchema.json")
+const defense = require("./contextLayouts/defenseInDepthSchema.json")
+import { openDatabaseUpload } from './ui/database-upload-widget';
+import { openConnectTaxii } from './ui/connect-taxii-widget';
+import { openBundleExport } from './ui/export -bundle-widget';
declare global {
- interface Window {
+ interface Window {
cycore: cytoscape.Core;
layout: string;
}
}
+// Returns nodes positions
+const getNodeMetadata = (nodes) => {
+ return nodes.map(obj => ({
+ id: obj.id(),
+ position: obj.position(),
+ }))
+}
+
// tslint:disable-next-line:class-name
export class main {
// tslint:disable-next-line:no-empty
constructor() { }
- public run() {
+ public async run() {
+
+ // Initialize tippy tooltips
+ tippy('[data-tippy-content]', {
+ theme: 'light',
+ });
+ // Initialize the query storage object
const storage: QueryStorageService = QueryStorageService.Instance;
+
+ // Initialize the settings object
+ const settings = StigSettings.Instance;
+
let loading: boolean = false;
document.addEventListener('DOMContentLoaded', async () => {
- unhandled();
- const cyto_options: cytoscape.CytoscapeOptions = {
+
+ // load saved data
+ await DatabaseConfigurationStorage.Instance.getConfigs()
+ await StigSettings.Instance.getSettings()
+ await QueryStorageService.Instance.getQueryHistory()
+
+ const cyto_options: CytoscapeOptions = {
container: $('#cy')[0],
- style: [node_style, edge_style, select_node_style, modified_select_style, modified_unselect_style, ...edgehandles_style],
- // wheelSensitivity: 0.25,
+ style: [node_style, compound_style, edge_style, select_node_style, modified_select_style, modified_unselect_style, ...edgehandles_style],
+ wheelSensitivity: 0.25,
} as cytoscape.CytoscapeOptions;
// set up cytoscape
const cy = cytoscape(cyto_options);
window.cycore = cy;
+ const graph_utils = new GraphUtils(cy);
+
// used by some events to make cytoscape respond
- window.addEventListener("resize", () => cy.resize(), false);
+ window.addEventListener("resize", () => {cy.resize()}, false);
const call_forceRender = () => {
cy.resize();
};
- Split(['#cy', '#editpane'], {
+ var split = Split(['#cy', '#editpane'], {
direction: 'horizontal',
sizes: [75, 25],
gutterSize: 8,
cursor: 'col-resize',
onDragEnd: call_forceRender,
});
- const current_db_config = DatabaseConfigurationStorage.Instance.current;
- const db = new StigDB(current_db_config);
+
+
+
+ // Add event listeners to dropdown menu items
+
+ // GRAPH
+ $("#dd-copyElem").on("click", () => {
+ //console.log("Copy element")
+ graph_copy();
+ })
+ $("#dd-cutElem").on("click", () => {
+ //console.log("Cut element")
+ const selected = window.cycore.$(":selected")
+ graph_copy()
+ window.cycore.remove(selected)
+ })
+ $("#dd-pasteElem").on("click", () => {
+ //console.log("paste element")
+ graph_paste()
+ })
+ $("#dd-commitElem").on("click", () => {
+ //console.log("Commit elements")
+ commit_all()
+ })
+ $("#dd-dbDelete").on("click", () => {
+ //console.log("Delete from db")
+ delete_selected()
+ })
+ $("#dd-selectElem").on("click", () => {Blob
+ //console.log("Select all elements")
+ window.cycore.elements().select()
+ })
+ $("#dd-invertSelect").on("click", () => {
+ console.log("Invert")
+ const unselected = window.cycore.$(':unselected');
+ const selected = window.cycore.$(':selected');
+ selected.unselect();
+ unselected.select();
+ })
+ $("#dd-viewEmbeddedRels").on("click", () => {
+ // list all objects with property "object_refs"
+ let embedded_rel_types = ["report", "opinion", "grouping", "note", "observed-data"]
+
+ // get all current objects
+ let nodes = window.cycore.$(':visible')
+ nodes = nodes.union(nodes.connectedEdges());
+ //let new_rels = []
+
+ // if an object has "object_refs" property, create relationships for all reference objects
+ nodes.each((ele) => {
+ console.log(ele)
+ let current_object = ele.data('raw_data');
+ if (current_object !== undefined && embedded_rel_types.includes(current_object['type']) && current_object['object_refs']) {
+ console.log(current_object["object_refs"])
+ console.log(current_object["id"])
+ for (var ref_id of current_object["object_refs"]) {
+ console.log(ref_id)
+
+ // Step 1.
+ let rel_id = uuid.v4();
+ //let rel_created = moment().utc().format('YYYY-MM-DDTHH:mm:ss.SSS[Z]')
+
+ // const raw_data: Relationship = {
+ // // get source node
+ // source_ref: current_object["id"],
+ // // get target node
+ // target_ref: ref_id,
+ // type: 'relationship',
+ // created: rel_created,
+ // id: rel_id,
+ // relationship_type: 'related-to',
+ // };
+
+ const opts: stix.VisualEdgeData = {
+ raw_data: "visual_edge",
+ id: rel_id,
+ target: ref_id,
+ source: current_object["id"]
+ }
+
+ // const opts: stix.StixRelationshipData = {
+ // raw_data: raw_data,
+ // type: 'relationship',
+ // id: rel_id,
+ // created: rel_created,
+ // source: current_object["id"],
+ // target: ref_id,
+ // label: 'related-to'
+ // };
+
+ // console.log(opts)
+
+ // Step 2.
+ let rel_node = new stix.VisualEdge(opts)
+
+ // Step 3.
+ cy.add(rel_node);
+ // cy.add({data: {id: rel_id, source: current_object["id"], target: ref_id}});
+ }
+ }
+ //&& ele.data('raw_data').object_refs
+ });
+ })
+
+ var relationshipsOn = true
+ $("#dd-toggleRelationships").on("click", () => {
+ if (relationshipsOn) {
+ view_util.hide(cy.edges())
+ } else {
+ view_util.show(cy.edges())
+ }
+ relationshipsOn = !relationshipsOn
+ })
+
+ // EXPORT
+ $("#dd-exportSelected").on("click", () => {
+ //console.log("Export selected")
+ const bundle_id = 'bundle--' + uuid.v4();
+ const bundle = { type: 'bundle', id: bundle_id, objects: [] } as BundleType;
+
+ let nodes = window.cycore.$(':selected');
+ nodes.each((ele) => {
+ if (ele.length === 0) {
+ return;
+ }
+ //logic to remove null on json export
+ if(ele.data('raw_data')!==undefined){
+ bundle.objects.push(ele.data('raw_data'));
+ }
+ });
+
+ openBundleExport(bundle)
+ })
+ $("#dd-exportGraph").on("click", () => {
+ //console.log("Export graph")
+ const bundle_id = 'bundle--' + uuid.v4();
+ const bundle = { type: 'bundle', id: bundle_id, objects: [] } as BundleType;
+
+ let nodes = window.cycore.$(':selected');
+ nodes.each((ele) => {
+ if (ele.length === 0) {
+ return;
+ }
+ //logic to remove null on json export
+ if(ele.data('raw_data')!==undefined){
+ bundle.objects.push(ele.data('raw_data'));
+ }
+ });
+
+ openBundleExport(bundle)
+ })
+ $("#dd-exportAll").on("click", () => {
+ //console.log("Export all")
+ const bundle_id = 'bundle--' + uuid.v4();
+ const bundle = { type: 'bundle', id: bundle_id, objects: [] } as BundleType;
+ let nodes = window.cycore.$(':visible');
+ nodes = nodes.union(nodes.connectedEdges());
+ nodes.each((ele) => {
+ if (ele.length === 0) {
+ return;
+ }
+ //logic to remove null on json export
+ if(ele.data('raw_data')!==undefined){
+ bundle.objects.push(ele.data('raw_data'));
+ }
+ });
+ bundle.metadata = getNodeMetadata(nodes);
+
+ openBundleExport(bundle)
+ })
+ $("#dd-exportPos").on("click", () => {
+ //console.log("Export positions")
+ let nodes = window.cycore.$(':visible')
+
+ const jsonObj = JSON.stringify({metadata: getNodeMetadata(nodes)}, null, 2);
+ const blob = new Blob([jsonObj], { type: "application/json" });
+ fileSaver.saveAs(blob, "metadata.json");
+ $('.message-status').html("exported metadata")
+ })
+
+ // LAYOUT
+ $("#dd-layoutCose").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-layout")}).prop("style", "background-color: white")
+ $("#dd-layoutCose").prop("style", "background-color: #0d6efd")
+
+ graph_utils.myLayout("cose");
+ settings.setLayout("cose");
+ })
+ $("#dd-layoutCola").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-layout")}).prop("style", "background-color: white")
+ $("#dd-layoutCola").prop("style", "background-color: #0d6efd")
+
+ graph_utils.myLayout("cola");
+ settings.setLayout("cola");
+ })
+ $("#dd-layoutCircle").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-layout")}).prop("style", "background-color: white")
+ $("#dd-layoutCircle").prop("style", "background-color: #0d6efd")
+
+ graph_utils.myLayout("circle");
+ settings.setLayout("circle");
+ })
+ $("#dd-layoutSpread").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-layout")}).prop("style", "background-color: white")
+ $("#dd-layoutSpread").prop("style", "background-color: #0d6efd")
+
+ graph_utils.myLayout("spread");
+ settings.setLayout("spread");
+ })
+ $("#dd-layoutCoseBilkent").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-layout")}).prop("style", "background-color: white")
+ $("#dd-layoutCoseBilkent").prop("style", "background-color: #0d6efd")
+
+ graph_utils.myLayout("cose_bilkent");
+ settings.setLayout("cose_bilkent");
+ })
+ $("#dd-layoutKlay").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-layout")}).prop("style", "background-color: white")
+ $("#dd-layoutKlay").prop("style", "background-color: #0d6efd")
+
+ graph_utils.myLayout("klay");
+ settings.setLayout("klay");
+ })
+ $("#dd-layoutDagre").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-layout")}).prop("style", "background-color: white")
+ $("#dd-layoutDagre").prop("style", "background-color: #0d6efd")
+
+ graph_utils.myLayout("dagre");
+ settings.setLayout("dagre");
+ })
+ $("#dd-layoutRandom").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-layout")}).prop("style", "background-color: white")
+ $("#dd-layoutRandom").prop("style", "background-color: #0d6efd")
+
+ graph_utils.myLayout("random");
+ settings.setLayout("random");
+ })
+ $("#dd-layoutConcentric").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-layout")}).prop("style", "background-color: white")
+ $("#dd-layoutConcentric").prop("style", "background-color: #0d6efd")
+
+ graph_utils.myLayout("concentric");
+ settings.setLayout("concentric");
+ })
+ $("#dd-layoutBreadthfirst").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-layout")}).prop("style", "background-color: white")
+ $("#dd-layoutBreadthfirst").prop("style", "background-color: #0d6efd")
+
+ graph_utils.myLayout("breadthfirst");
+ settings.setLayout("breadthfirst");
+ })
+ $("#dd-layoutGrid").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-layout")}).prop("style", "background-color: white")
+ $("#dd-layoutGrid").prop("style", "background-color: #0d6efd")
+
+ graph_utils.myLayout("grid");
+ settings.setLayout("grid");
+ })
+
+ // CONTEXT LAYOUTS
+ $("#dd-ctxLayoutNone").prop("style", "background-color: #0d6efd")
+ $("#dd-ctxLayoutNone").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-ctxLayout")}).prop("style", "background-color: white")
+ $("#dd-ctxLayoutNone").prop("style", "background-color: #0d6efd")
+
+ removeCompoundNodes()
+ // Position the nodes with a layout
+ graph_utils.myLayout(StigSettings.Instance.layout.toLowerCase());
+ })
+ $("#dd-ctxLayoutDefInDepth").on("click", () => {
+ $("a").filter(function(_index: number, ele: HTMLElement) {return ele.id.includes("dd-ctxLayout")}).prop("style", "background-color: white")
+ $("#dd-ctxLayoutDefInDepth").prop("style", "background-color: #0d6efd")
+
+ removeCompoundNodes()
+ initDefenseGraph()
+ organizeOrphans()
+ })
+ killChain["kill-chain"].forEach(kc => {
+ $("#contextLayoutOptions").append(`URL:
++ +
API Root Name:
+ +Collection ID:
+ +Username:
+ +Password:
+ + +`; + +class NewTaxiiConnection { + public _storage: DatabaseConfigurationStorage; + public _anchor: JQuery";
+ public _footer = "
"; // "";
+ private useConfig: string;
+
+ constructor(anchor: JQuery, key?: string) {
+ this._storage = DatabaseConfigurationStorage.Instance;
+ this._anchor = anchor;
+ this._footer = ""; // this._createDeleteButton();
+ // this.populateHistoryDialog();
+ key === undefined ? this.useConfig = this._storage.current : this.useConfig = key;
+ }
+
+ public addToDialog() {
+ this._anchor.empty();
+ this._anchor.html(this._header + body + this._footer);
+ this.setupEventHandlers();
+ }
+
+ public setupEventHandlers() {
+ return;
+ }
+
+ public isOpen(): boolean {
+ return this._anchor.dialog( "isOpen" );
+ }
+
+ private loadData() {
+ const params = this._storage.get(this.useConfig);
+ $('#host').val(params.host);
+ $('#port').val(params.port);
+ $('#db_name').val(params.name);
+ $('#username').val(params.username);
+ $('#user_password').val(params.password);
+ }
+
+ private async saveData() {
+
+ // Get user Taxii input
+ const tax: TaxiiParams = {
+ url: $("#url").val() as string,
+ apiroot_name: $("#apiroot_name").val() as string,
+ collection_id: $("#collection_id").val() as string,
+ username: $("#tax_username").val() as string,
+ password: $("#tax_password").val() as string,
+ };
+
+ // Call backend taxii logic
+ let objects = await get_taxii(tax) //await
+
+ // Debugging
+ if (objects) {
+ $('.message-status').html(`${objects.length} TAXII objects found.`);
+ console.log("try here: ", objects)
+ } else {
+ // add error message "No found Taxii objects"
+ $('.message-status').html(`No TAXII objects found.`);
+ console.log("tried")
+ }
+
+ // Commit taxii objects to database
+ const relationships : StixObject[] = []
+ var numErrors = 0
+ var i = 0
+ $('.message-status').html(`Committing ${objects.length} to the database...`);
+ for (const obj of objects) {
+ $('.message-status').html(`Committing object ${i++}/${objects.length} ...`);
+ // Save relationships for later
+ if (obj.type == "relationship" || obj.type == "sighting") {
+ relationships.push(obj)
+ } else {
+ // Commit everything else
+ //console.log(obj)
+ let success = commit(obj)
+ if (!success) {
+ numErrors++
+ }
+ }
+ }
+ for (const rel of relationships) {
+ console.log(rel)
+ $('.message-status').html(`Committing object ${i++}/${objects.length} ...`);
+ let success = commit(rel)
+ if (!success) {
+ numErrors++
+ }
+ }
+
+ $('.message-status').html(`Successfully committed ${objects.length - numErrors} out of ${objects.length} objects.`);
+
+ this.close()
+
+
+ }
+
+ private close() {
+ if (this.isOpen()) {
+ this._anchor.dialog("close");
+ }
+ }
+
+ public open() {
+ this.addToDialog();
+ this._anchor.dialog({
+ autoOpen: true,
+ modal: true,
+ width: 'maxcontent',
+ maxWidth: window.innerWidth / 2,
+ maxHeight: window.innerHeight - 100,
+ buttons: [
+ {
+ text: 'Cancel',
+ click: () => this.close(),
+ },
+ {
+ text: 'Upload TAXII to DB',
+ click: () => this.saveData(),
+ },
+ ],
+ });
+ this._anchor.dialog("open");
+ //this.loadData();
+ }
+}
diff --git a/src/ui/database-config-widget.ts b/src/ui/database-config-widget.ts
index 420c69d9..76991f57 100644
--- a/src/ui/database-config-widget.ts
+++ b/src/ui/database-config-widget.ts
@@ -4,11 +4,12 @@ Copyright 2018 Southern California Edison Company
ALL RIGHTS RESERVED
*/
+import { use_db } from "../db/dbFunctions";
import { DatabaseConfigurationStorage } from "../storage";
-import { ipcRenderer } from 'electron';
-import { newDatabaseConfiguration } from './new-database-widget';
+import { newDatabaseConfiguration } from './new-database-widget'
export function openDatabaseConfiguration() {
+ //console.log("Open database dialog")
const dbdialog = new DatabaseConfigDialog($('#db-dialog-anchor'));
dbdialog.open();
}
@@ -69,12 +70,15 @@ class DatabaseConfigDialog {
],
});
- $(".controlgroup").controlgroup({
- direction: "vertical",
- });
+ // $(".controlgroup").controlgroup({
+ // direction: "vertical"
+ // });
+
+ $(".controlgroup").buttonset();
+
$( `#db-config-list input[type='radio']`).prop('checked', false);
- $( `#db-config-list input[type='radio'][value='${this._storage.current}']` ).prop('checked', true);
- $( "#db-config-list input[type='radio']" ).checkboxradio('refresh');
+ // $( `#db-config-list input[type='radio'][value='${this._storage.current}']` ).prop('checked', true);
+ // $( "#db-config-list input[type='radio']" ).buttonset('refresh');
}
public addToDialog() {
@@ -90,12 +94,12 @@ class DatabaseConfigDialog {
this._list += `
+
+
+
`
+
+class DatabaseUploadDialog {
+ public _anchor: JQuery"
+ public _footer = "
"
+
+ constructor(anchor: JQuery) {
+ this._anchor = anchor
+ }
+
+ private saveBundle() {
+ const files = $("#bundleUploadFile").prop("files")
+ for (var i = 0; i < files.length; i++) {
+ if (files[i] && files[i] instanceof File) {
+ const f = files[i];
+ document.getElementById('chosen-files')!.innerText += f.name + " ";
+ // hideMessages();
+
+ const r = new FileReader();
+ r.onload = (_e: Event) => {
+ // this.result
+ // addToGraph(JSON.parse(e.target.result))
+ // addToGraph(JSON.parse(r.result as string));
+ const bundle : BundleType = JSON.parse(r.result as string)
+ const objects : StixObject[] = bundle.objects as StixObject[]
+ const relationships : StixObject[] = []
+ var numErrors = 0
+ var i = 0
+ $('.message-status').html(`Committing ${objects.length} to the database...`);
+ for (const obj of objects) {
+ $('.message-status').html(`Committing object ${i++}/${objects.length} ...`);
+ // Save relationships for later
+ if (obj.type == "relationship" || obj.type == "sighting") {
+ relationships.push(obj)
+ } else {
+ // Commit everything else
+ console.log(obj)
+ let success = commit(obj)
+ if (!success) {
+ numErrors++
+ }
+ }
+ }
+ for (const rel of relationships) {
+ console.log(rel)
+ $('.message-status').html(`Committing object ${i++}/${objects.length} ...`);
+ let success = commit(rel)
+ if (!success) {
+ numErrors++
+ }
+ }
+
+ $('.message-status').html(`Successfully committed ${objects.length - numErrors} out of ${objects.length} objects.`);
+
+ this.close()
+ };
+ r.readAsText(f);
+ }
+ }
+ }
+
+ public open() {
+ this.addToDialog()
+ this._anchor.dialog({
+ autoOpen: true,
+ modal: true,
+ width: 'maxcontent',
+ maxWidth: window.innerWidth / 2,
+ maxHeight: window.innerHeight - 100,
+ buttons: [
+ {
+ text: 'Commit',
+ click: () => this.saveBundle()
+ }
+ ]
+ });
+ this._anchor.dialog("open");
+ }
+
+ public addToDialog() {
+ this._anchor.empty();
+ this._anchor.html(this._header + body + this._footer)
+ }
+
+ public isOpen(): boolean {
+ return this._anchor.dialog( "isOpen" );
+ }
+
+ private close() {
+ if (this.isOpen()) {
+ this._anchor.dialog("close");
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/ui/diff-dialog.ts b/src/ui/diff-dialog.ts
index b24e245e..fc136d40 100644
--- a/src/ui/diff-dialog.ts
+++ b/src/ui/diff-dialog.ts
@@ -319,7 +319,7 @@ export class DiffDialog {
this.clearId(stix_id);
}
// tslint:disable-next-line:no-console
- console.log(name, id);
+ //console.log(name, id);
});
this.updateNode(ids);
this._anchor.dialog('close');
diff --git a/src/ui/errorWidget.ts b/src/ui/errorWidget.ts
deleted file mode 100644
index fd236542..00000000
--- a/src/ui/errorWidget.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2018 Southern California Edison Company
-
-ALL RIGHTS RESERVED
- */
-
-export class ErrorWidget {
- public _footer: string = '';
- public _header: string = '';
- public _anchor: JQuery"
+ public _body = `
"
+ private bundle: BundleType
+
+ constructor(anchor: JQuery, bundle: BundleType) {
+ this._anchor = anchor
+ this.bundle = bundle
+ }
+
+ private export() {
+
+ // Get the filename
+ var filename = $("#filenameInput").prop("value")
+ if (filename == "") {
+ // If it's blank, set the filename to bundle.json
+ filename = "bundle.json"
+ } else {
+ // Replace illegal characters with underscores
+ filename = filename.replaceAll(/\/|<|>|:|\"|\\|\||\?|\*|\./g, "_") + ".json"
+ }
+ // console.log(filename)
+
+ // Convert to JSON and save
+ const jsonToSave = JSON.stringify(this.bundle, null, 2);
+ const jsonBundleSave = new Blob([jsonToSave], { type: "application/json" });
+ fileSaver.saveAs(jsonBundleSave, filename);
+ $('.message-status').html(`Exported ${this.bundle.objects.length} objects`);
+ this.close()
+ }
+
+ public open() {
+ this.addToDialog()
+ this._anchor.dialog({
+ autoOpen: true,
+ modal: true,
+ width: 'maxcontent',
+ maxWidth: window.innerWidth / 2,
+ maxHeight: window.innerHeight - 100,
+ buttons: [
+ {
+ text: 'Export',
+ click: () => this.export()
+ }
+ ]
+ })
+ this._anchor.dialog("open")
+ }
+
+ public addToDialog() {
+ this._anchor.empty();
+ this._anchor.html(this._header + this._body + this._footer)
+ }
+
+ public isOpen(): boolean {
+ return this._anchor.dialog( "isOpen" );
+ }
+
+ private close() {
+ if (this.isOpen()) {
+ this._anchor.dialog("close");
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/ui/file-manager.ts b/src/ui/file-manager.ts
deleted file mode 100644
index 2cab26b2..00000000
--- a/src/ui/file-manager.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-Copyright 2018 Southern California Edison Company
-
-ALL RIGHTS RESERVED
- */
-
-import { shell } from 'electron';
-import * as os from 'os';
-
-export function show_item_in_folder() {
- shell.showItemInFolder(os.homedir());
-}
diff --git a/src/ui/ipc-render-handlers.ts b/src/ui/ipc-render-handlers.ts
index 435bc962..17db5455 100644
--- a/src/ui/ipc-render-handlers.ts
+++ b/src/ui/ipc-render-handlers.ts
@@ -4,16 +4,12 @@ Copyright 2018 Southern California Edison Company
ALL RIGHTS RESERVED
*/
-import { ipcRenderer, dialog } from "electron";
-import { CollectionReturnValue, NodeSingular, EdgeCollection, CollectionElements} from 'cytoscape';
-import { StigDB } from '../db';
-import { StixObject, BundleType } from '../stix';
-import { DatabaseConfigurationStorage } from '../storage';
+// import { ipcRenderer, dialog } from "electron";
+import { CollectionReturnValue, NodeSingular, EdgeCollection, CollectionElements, SingularElementReturnValue} from 'cytoscape';
+// import { StigDB } from '../db';
+import { StixObject } from '../stix';
// import { open } from 'fs';
-import { openDatabaseConfiguration } from './database-config-widget';
-import { newDatabaseConfiguration } from './new-database-widget';
-import * as fileSaver from 'file-saver';
-import * as uuid from 'uuid';
+import { commit, db_delete } from '../db/dbFunctions';
const getNodeMetadata = (nodes) => {
return nodes.map(obj => ({
@@ -22,71 +18,85 @@ const getNodeMetadata = (nodes) => {
}))
}
-export async function setHandlers() {
- ipcRenderer.on("commit_all", () => {
- const db = new StigDB(DatabaseConfigurationStorage.Instance.current);
- const to_save: CollectionReturnValue = window.cycore.$('[!saved]');
- const results: StixObject[] = [];
- const edges: StixObject[] = [];
- let numObjects = to_save.size();
- let itemsProcessed = 0;
-
- async function saveEdges (edges: StixObject[]) {
- //do the edges
- edges.forEach((stix_obj: StixObject) => {
- db.updateDB(stix_obj)
- .then((result) => {
- results.push(...result);
- })
- .catch((e) => {
- // tslint:disable-next-line:no-console
- console.error(e);
- },
- );
- })
- }
+/*************************************
+ * Commit all
+ *
+ * Takes each object from the graph and commits them to the database
+ */
+export async function commit_all() {
+ // const db = new StigDB(DatabaseConfigurationStorage.Instance.current);
+ const nodes: CollectionReturnValue = window.cycore.$('nodes');
+ const edges: CollectionReturnValue = window.cycore.$('edges');
- async function saveVertex(stix_obj: StixObject) {
- await db.updateDB(stix_obj)
- .then((result) => {
- results.push(...result);
- })
- .catch((e) => {
- // tslint:disable-next-line:no-console
- console.error(e);
- });
- }
-
- to_save.forEach(async (ele: NodeSingular, _i: number, _eles: CollectionReturnValue) => {
- const stix_obj = ele.data('raw_data');
- console.log(stix_obj);
- if (stix_obj === undefined) {
- numObjects--;
- return;
+ $('.message-status').html(`Committing ${nodes.length + edges.length} to the database...`);
+
+ let count = 0;
+ let invalid = [];
+
+ for (let i = 0; i < nodes.length; i++) {
+ let ele = nodes[i]
+
+ const stix_obj = ele.data('raw_data');
+ // console.log(stix_obj);
+
+ if (stix_obj !== undefined) {
+
+ // The spec_version is mandatory, but sometimes it doesn't exist on the objects.
+ // This adds it if it isn't there already.
+ // TODO: It might be better to just add the spec_version when an object is created.
+ if (!stix_obj.spec_version) {
+ stix_obj.spec_version = "2.1"
}
- if (stix_obj['type'] === 'relationship') {
- // save edges for after all the nodes are done
- edges.push(stix_obj);
- itemsProcessed++;
- return;
+
+ if (await commit(stix_obj)) {
+ count++
+ ele.data("saved", true);
+ } else {
+ invalid.push(stix_obj.id)
}
+ }
+ $('.message-status').html(`Committing object ${count + invalid.length} / ${nodes.length + edges.length} to the database...`);
+ }
+
+ for (let i = 0; i < edges.length; i++) {
+ let ele = edges[i]
- await saveVertex(stix_obj);
+ const stix_obj = ele.data('raw_data');
+ //console.log(stix_obj);
- itemsProcessed++;
- //wait for all vertex to step through before saving edges
- if (itemsProcessed === numObjects){
- saveEdges(edges);
- $('.message-status').html(`Committed ${numObjects} objects to the database.`);
+ if (stix_obj !== undefined) {
+
+ // The spec_version is mandatory, but sometimes it doesn't exist on the objects.
+ // This adds it if it isn't there already.
+ // TODO: It might be better to just add the spec_version when an object is created.
+ if (!stix_obj.spec_version) {
+ stix_obj.spec_version = "2.1"
}
- });
-
- });
+
+ // Don't commit edges connected to invalid nodes
+ if (!invalid.includes(stix_obj.source_ref) && !invalid.includes(stix_obj.target_ref)) {
+ if (await commit(stix_obj)) {
+ count++
+ ele.data("saved", true);
+ } else {
+ invalid.push(stix_obj.id)
+ }
+ } else {
+ invalid.push(stix_obj)
+ }
+
+ }
+ $('.message-status').html(`Committing object ${count + invalid.length} / ${nodes.length + edges.length} to the database...`);
+ }
+
+ $('.message-status').html(`Committed ${count} objects to the database. ${invalid.length} objects were not commited.`);
+
+}
//user selected delete selected from dropdown
//TODO: test single edge delete
- ipcRenderer.on("delete_selected", async () => {
- const db = new StigDB(DatabaseConfigurationStorage.Instance.current);
+ export async function delete_selected() {
+ // const db = new StigDB(DatabaseConfigurationStorage.Instance.current);
const selected: CollectionReturnValue = window.cycore.$(':selected');
// const to_save: CollectionReturnValue = window.cycore.$('[saved]');
const vis: CollectionReturnValue = window.cycore.$(':visible');
@@ -95,142 +105,120 @@ export async function setHandlers() {
let sroresults: StixObject[] = [];
let results: StixObject[] = [];
- async function delSelectedVertex(stix_obj: StixObject) {
- await db.sdoDestroyedUI(stix_obj)
- .then((result) => {
- results.push(...result);
- })
- .catch((e) => {
- // tslint:disable-next-line:no-console
- console.error(e);
- });
- }
-
- async function delSelectedEdge(edge_obj: StixObject) {
- await db.sroDestroyedUI(edge_obj)
- .then((result) => {
- results.push(...result);
- })
- .catch((e) => {
- // tslint:disable-next-line:no-console
- console.error(e);
- });
-
- }
//Delete incoming/outgoing edges first.
- await edges.forEach(async (ele) => {
+ edges.forEach((ele) => {
const sro = ele.data('raw_data');
- await delSelectedEdge(sro);
+ db_delete(sro)
window.cycore.remove(ele);
});
- await selected.forEach(async (ele) => {
+ selected.forEach((ele) => {
const sdo = ele.data('raw_data');
- await delSelectedVertex(sdo);
+ db_delete(sdo)
window.cycore.remove(ele);
});
$('.message-status').html(`Deleted ${results} objects from the database.`);
- });
-
- //user selected delete view from db
- ipcRenderer.on("delete_all", () => {
- const db = new StigDB(DatabaseConfigurationStorage.Instance.current);
- const to_save: CollectionReturnValue = window.cycore.$('[saved]');
- const results: StixObject[] = [];
-
- console.log('our db: ', db);
-
- //delete all things in graph that are in our to_save list
- console.log('saved: ', to_save);
- let toDelete: any[] = [];
- to_save.forEach( (ele) => {
- //sometimes to_save has an undefined element
- if(ele.data('raw_data')!==undefined){
- const stix_id = ele.data('raw_data').id;
- console.log('all id to delete', stix_id);
- toDelete.push(stix_id);
- }
- });
- console.log('deleting: ', toDelete);
+ }
+
+// //user selected delete view from db
+// ipcRenderer.on("delete_all", () => {
+// const db = new StigDB(DatabaseConfigurationStorage.Instance.current);
+// const to_save: CollectionReturnValue = window.cycore.$('[saved]');
+// const results: StixObject[] = [];
+
+// console.log('our db: ', db);
+
+// //delete all things in graph that are in our to_save list
+// console.log('saved: ', to_save);
+// let toDelete: any[] = [];
+// to_save.forEach( (ele) => {
+// //sometimes to_save has an undefined element
+// if(ele.data('raw_data')!==undefined){
+// const stix_id = ele.data('raw_data').id;
+// console.log('all id to delete', stix_id);
+// toDelete.push(stix_id);
+// }
+// });
+// console.log('deleting: ', toDelete);
- $('.message-status').html("deleted from databases")
+// $('.message-status').html("deleted from databases")
- });
+// });
- ipcRenderer.on("invert_selected", () => {
- const unselected = window.cycore.$(':unselected');
- const selected = window.cycore.$(':selected');
- selected.unselect();
- unselected.select();
- });
+// ipcRenderer.on("invert_selected", () => {
+// const unselected = window.cycore.$(':unselected');
+// const selected = window.cycore.$(':selected');
+// selected.unselect();
+// unselected.select();
+// });
- ipcRenderer.on("export_selected", () => {
- const bundle_id = 'bundle--' + uuid.v4();
- const bundle = { type: 'bundle', id: bundle_id, objects: [] } as BundleType;
+// ipcRenderer.on("export_selected", () => {
+// const bundle_id = 'bundle--' + uuid.v4();
+// const bundle = { type: 'bundle', id: bundle_id, objects: [] } as BundleType;
- let nodes = window.cycore.$(':selected');
- nodes.each((ele) => {
- if (ele.length === 0) {
- return;
- }
- //logic to remove null on json export
- if(ele.data('raw_data')!==undefined){
- bundle.objects.push(ele.data('raw_data'));
- }
- });
-
- const jsonToSave = JSON.stringify(bundle);
- const jsonBundleSave = new Blob([jsonToSave], { type: "application/json" });
- fileSaver.saveAs(jsonBundleSave, "bundle.json");
- $('.message-status').html(`Exported ${bundle.objects.length} objects`);
-
- });
-
- ipcRenderer.on("export_all", async () => {
-
- const bundle_id = 'bundle--' + uuid.v4();
- const bundle = { type: 'bundle', id: bundle_id, objects: [] } as BundleType;
- let nodes = window.cycore.$(':visible');
- nodes = nodes.union(nodes.connectedEdges());
- nodes.each((ele) => {
- if (ele.length === 0) {
- return;
- }
- //logic to remove null on json export
- if(ele.data('raw_data')!==undefined){
- bundle.objects.push(ele.data('raw_data'));
- }
- });
- bundle.metadata = getNodeMetadata(nodes);
-
- // Convert to JSON and save
- const jsonToSave = JSON.stringify(bundle);
- const jsonBundleSave = new Blob([jsonToSave], { type: "application/json" });
- fileSaver.saveAs(jsonBundleSave, "bundle.json");
- $('.message-status').html(`Exported ${bundle.objects.length} objects`);
- });
-
- ipcRenderer.on("export_metadata", async () => {
-
- let nodes = window.cycore.$(':visible')
-
- const jsonObj = JSON.stringify({metadata: getNodeMetadata(nodes)}, null, 2);
- const blob = new Blob([jsonObj], { type: "application/json" });
- fileSaver.saveAs(blob, "metadata.json");
- $('.message-status').html("exported metadata")
- })
- ipcRenderer.on("select_all", () => {
- window.cycore.elements().select();
- });
-
- ipcRenderer.on("OpenDatabaseConfiguration", () => {
- openDatabaseConfiguration();
- });
-
- ipcRenderer.on("NewDatabaseConfiguration", () => {
- newDatabaseConfiguration();
- });
-}
+// let nodes = window.cycore.$(':selected');
+// nodes.each((ele) => {
+// if (ele.length === 0) {
+// return;
+// }
+// //logic to remove null on json export
+// if(ele.data('raw_data')!==undefined){
+// bundle.objects.push(ele.data('raw_data'));
+// }
+// });
+
+// const jsonToSave = JSON.stringify(bundle);
+// const jsonBundleSave = new Blob([jsonToSave], { type: "application/json" });
+// fileSaver.saveAs(jsonBundleSave, "bundle.json");
+// $('.message-status').html(`Exported ${bundle.objects.length} objects`);
+
+// });
+
+// ipcRenderer.on("export_all", async () => {
+
+// const bundle_id = 'bundle--' + uuid.v4();
+// const bundle = { type: 'bundle', id: bundle_id, objects: [] } as BundleType;
+// let nodes = window.cycore.$(':visible');
+// nodes = nodes.union(nodes.connectedEdges());
+// nodes.each((ele) => {
+// if (ele.length === 0) {
+// return;
+// }
+// //logic to remove null on json export
+// if(ele.data('raw_data')!==undefined){
+// bundle.objects.push(ele.data('raw_data'));
+// }
+// });
+// bundle.metadata = getNodeMetadata(nodes);
+
+// // Convert to JSON and save
+// const jsonToSave = JSON.stringify(bundle);
+// const jsonBundleSave = new Blob([jsonToSave], { type: "application/json" });
+// fileSaver.saveAs(jsonBundleSave, "bundle.json");
+// $('.message-status').html(`Exported ${bundle.objects.length} objects`);
+// });
+
+// ipcRenderer.on("export_metadata", async () => {
+
+// let nodes = window.cycore.$(':visible')
+
+// const jsonObj = JSON.stringify({metadata: getNodeMetadata(nodes)}, null, 2);
+// const blob = new Blob([jsonObj], { type: "application/json" });
+// fileSaver.saveAs(blob, "metadata.json");
+// $('.message-status').html("exported metadata")
+// })
+// ipcRenderer.on("select_all", () => {
+// window.cycore.elements().select();
+// });
+
+// ipcRenderer.on("OpenDatabaseConfiguration", () => {
+// openDatabaseConfiguration();
+// });
+
+// ipcRenderer.on("NewDatabaseConfiguration", () => {
+// newDatabaseConfiguration();
+// });
+// }
diff --git a/src/ui/main-window-menu.ts b/src/ui/main-window-menu.ts
deleted file mode 100644
index 585d2a71..00000000
--- a/src/ui/main-window-menu.ts
+++ /dev/null
@@ -1,510 +0,0 @@
-/*
-Copyright 2018 Southern California Edison Company
-
-ALL RIGHTS RESERVED
- */
-
-import { BrowserWindow, Menu, app, MenuItemConstructorOptions, MenuItem } from "electron";
-import * as Electron from 'electron';
-import { openDatabaseConfigurationDialogMain } from './configuration-dialog-main';
-import { StigSettings } from '../storage';
-
-const stig_settings = StigSettings.Instance;
-
-function change_layout(item: MenuItem, focusedWindow: BrowserWindow) {
- if (focusedWindow) { focusedWindow.webContents.send("layout", item.label.toLowerCase()); }
- stig_settings.layout = item.label;
- item.checked = true;
-}
-
-function copy_selected(item: MenuItem, focusedWindow: BrowserWindow) {
- if (focusedWindow) { focusedWindow.webContents.send("copy_selected", item.label); }
-}
-
-function paste_elements(item: MenuItem, focusedWindow: BrowserWindow) {
- if (focusedWindow) { focusedWindow.webContents.send("paste_elements", item.label); }
-}
-
-function cut_selected(item: MenuItem, focusedWindow: BrowserWindow) {
- if (focusedWindow) { focusedWindow.webContents.send("cut_selected", item.label); }
-}
-
-function commit_all(item: MenuItem, focusedWindow: BrowserWindow) {
- if (focusedWindow) {
- focusedWindow.webContents.send("commit_all", item.label);
- }
-}
-function delete_selected(item: MenuItem, focusedWindow: BrowserWindow) {
- if (focusedWindow) {
- focusedWindow.webContents.send("delete_selected", item.label);
- }
-}
-
-function export_selected(item: MenuItem, focusedWindow: BrowserWindow) {
- if (focusedWindow) {
- focusedWindow.webContents.send("export_selected", item.label);
- }
-}
-
-function invert_selection(item: MenuItem, focusedWindow: BrowserWindow) {
- if (focusedWindow) {
- focusedWindow.webContents.send("invert_selected", item.label);
- }
-}
-
-function export_all(item: MenuItem, focusedWindow: BrowserWindow) {
- if (focusedWindow) {
- focusedWindow.webContents.send("export_all", item.label);
- }
-}
-
-function export_graph(item: MenuItem, focusedWindow: BrowserWindow) {
- if (focusedWindow) {
- focusedWindow.webContents.send("export_graph", item.label);
- }
-}
-
-// const db = new StigDB(ConfigurationStorageService.Instance.get().host, ConfigurationStorageService.Instance.get().name, window.cycore);
-// const to_save: CollectionElements = window.cycore.$('[!saved]');
-// const results:StixObject[] = []
-// to_save.forEach( (ele: CollectionElements, _i: number, _eles: CollectionElements) => {
-// const stix_obj = ele.data('raw_data');
-// db.updateDB(stix_obj)
-// .then(result=>{
-// results.push(...result);
-// })
-// .catch( (e) =>{
-// console.log(e)}
-// );
-// });
-
-function select_all(item: MenuItem, focusedWindow: BrowserWindow) {
- if (focusedWindow) { focusedWindow.webContents.send("select_all", item.label); }
-}
-
-const template: MenuItemConstructorOptions[] = [
- {
- label: 'File',
- submenu: [
- {
- label: 'Quit',
- role: 'quit',
- },
- ],
- },
- {
- label: 'Edit',
- submenu: [
- {
- label: 'Cut Text',
- accelerator: 'CmdOrCtrl+X',
- role: 'cut',
- },
- {
- label: 'Copy Text',
- accelerator: 'CmdOrCtrl+C',
- role: 'copy',
- },
- {
- label: 'Paste Text',
- accelerator: 'CmdOrCtrl+V',
- role: 'paste',
- },
- {
- label: 'Select All Text',
- accelerator: 'CmdOrCtrl+A',
- role: 'selectall',
- },
- {
- type: 'separator',
- },
- {
- label: 'Configure...',
- submenu: [
- {
- label: 'Database connection...',
- accelerator: 'CmdOrCtrl+,',
- click: (_, focusedWindow) => {
- if (focusedWindow) {
- openDatabaseConfigurationDialogMain(focusedWindow);
- }
- },
- },
- // {
- // label: 'Create New Database...',
- // click: (_, focusedWindow) => {
- // if (focusedWindow) {
- // newDatabaseDialog(focusedWindow);
- // }
- // },
- // },
- ],
- },
- ],
- },
- {
- label: 'Graph',
- submenu: [
- {
- label: 'Copy Selected Elements',
- click: copy_selected,
- accelerator: 'Shift+CmdOrCtrl+C',
- },
- {
- label: 'Cut Selected Elements',
- click: cut_selected,
- accelerator: 'Shift+CmdOrCtrl+X',
- },
- {
- label: 'Paste elements',
- click: paste_elements,
- accelerator: 'Shift+CmdOrCtrl+V',
- },
- {
- label: 'Commit All Elements',
- click: commit_all,
- },
- {
- label: 'Delete Selected From Database',
- click: delete_selected,
- },
- {
- label: 'Select All Elements',
- accelerator: 'Shift+CmdOrCtrl+A',
- click: select_all,
- },
- {
- label: 'Invert Selection',
- accelerator: 'Shift+CmdOrCtrl+I',
- click: invert_selection,
- },
- {
- label: 'Export...',
- submenu: [
- {
- label: 'Selected elements...',
- click: export_selected,
- },
- {
- label: 'All elements w/positions...',
- click: export_all,
- },
- {
- label: 'Export graph...',
- click: export_graph,
- },
- {
- label: 'Export positions...',
- click: (_, focusedWindow) => {focusedWindow.webContents.send("export_metadata")}
- },
- ],
- },
- ],
- },
- {
- label: 'Layout',
- id: 'layout',
- submenu: [
- {
- label: 'Cose',
- id: 'cose',
- click: change_layout,
- type: 'radio',
- checked: true,
- }, {
- label: 'Cola',
- id: 'cola',
- click: change_layout,
- type: 'radio',
- }, {
- label: 'Circle',
- id: 'circle',
- click: change_layout,
- type: 'radio',
- }, {
- label: 'Spread',
- id: 'spread',
- click: change_layout,
- type: 'radio',
- }, {
- label: 'Cose_Bilkent',
- id: 'cose_bilkent',
- click: change_layout,
- type: 'radio',
- }, {
- label: 'Klay',
- id: 'klay',
- click: change_layout,
- type: 'radio',
- }, {
- label: 'Dagre',
- id: 'dagre',
- click: change_layout,
- type: 'radio',
- },
- // {
- // label: 'Euler',
- // click: change_layout,
- // type: 'radio'
- // }, {
- // label: 'Ngraph',
- // click: change_layout,
- // type: 'radio'
- // },
- {
- label: 'Random',
- id: 'random',
- click: change_layout,
- type: 'radio',
- }, {
- label: 'Concentric',
- id: 'concentric',
- click: change_layout,
- type: 'radio',
- }, {
- label: 'Breadthfirst',
- id: 'breadthfirst',
- click: change_layout,
- type: 'radio',
- },
- {
- label: 'Grid',
- id: 'grid',
- click: change_layout,
- type: 'radio',
- },
- ],
- },
- {
- label: 'View',
- submenu: [{
- label: 'Reload',
- accelerator: 'CmdOrCtrl+R',
- click: (_, focusedWindow) => {
- if (focusedWindow) {
- // on reload, start fresh and close any old
- // open secondary windows
- if (focusedWindow.id === 1) {
- BrowserWindow.getAllWindows().forEach((win) => {
- if (win.id > 1) {
- win.close();
- }
- });
- }
- focusedWindow.reload();
- }
- },
- }, {
- label: 'Toggle Full Screen',
- accelerator: (() => {
- if (process.platform === 'darwin') {
- return 'Ctrl+Command+F';
- } else {
- return 'F11';
- }
- })(),
- click: (_, focusedWindow) => {
- if (focusedWindow) {
- focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
- }
- },
- }, {
- label: 'Toggle Developer Tools',
- accelerator: (() => {
- if (process.platform === 'darwin') {
- return 'Alt+Command+I';
- } else {
- return 'Ctrl+Shift+I';
- }
- })(),
- click: (_, focusedWindow) => {
- if (focusedWindow) {
- focusedWindow.webContents.toggleDevTools();
- }
- },
- }, {
- type: 'separator',
- }, {
- label: 'Window',
- role: 'window',
- submenu: [{
- label: 'Minimize',
- accelerator: 'CmdOrCtrl+M',
- role: 'minimize',
- }, {
- label: 'Close',
- accelerator: 'CmdOrCtrl+W',
- role: 'close',
- }, {
- type: 'separator',
- }, {
- label: 'Reopen Window',
- accelerator: 'CmdOrCtrl+Shift+T',
- enabled: false,
- // key: 'reopenMenuItem',
- click: () => {
- app.emit('activate');
- },
- }],
- }],
- },
- {
- label: 'Help',
- role: 'help',
- submenu: [{
- label: 'Learn More',
- click: () => {
- Electron.shell.openExternal('http://electron.atom.io');
- },
- }],
- }];
-
-function addUpdateMenuItems(items: MenuItemConstructorOptions[], position: number) {
- if (process.mas) { return; }
-
- const version = Electron.app.getVersion();
- // let updateItems: Partial.json
`
+ public _footer = "Host:
+//+// +//
Port:
+// +//Database Name:
+// +//Database User:
+// +//Database User Password:
+// +//DB Admin:
+// +//DB Admin Password:
+// +// +// +// `; + const body = `Host:
@@ -20,15 +39,10 @@ const body = `
Host:
Database Name:
-Database User:
+OrientDB Root User:
-Database User Password:
+OrientDB Root Password:
-DB Admin:
- -DB Admin Password:
- - `; @@ -69,8 +83,8 @@ class NewDatabaseDialog { $('#db_name').val(params.name); $('#username').val(params.username); $('#user_password').val(params.password); - $('#admin_user').val(params.admin_user); - $('#admin_password').val(params.admin_password); + // $('#admin_user').val(params.admin_user); + // $('#admin_password').val(params.admin_password); } private saveData() { @@ -80,12 +94,12 @@ class NewDatabaseDialog { name: $("#db_name").val() as string, username: $("#username").val() as string, password: $("#user_password").val() as string, - admin_user: $("#admin_user").val() as string, - admin_password: $("#admin_password").val() as string, + // admin_user: $("#admin_user").val() as string, + // admin_password: $("#admin_password").val() as string, usetoken: true, }; DatabaseConfigurationStorage.Instance.save(options); - new_database(options); + use_db(options) this.close(); } diff --git a/src/ui/process-hang-handler.ts b/src/ui/process-hang-handler.ts deleted file mode 100644 index 2d68b790..00000000 --- a/src/ui/process-hang-handler.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* -Copyright 2018 Southern California Edison Company - -ALL RIGHTS RESERVED - */ - -import { BrowserWindow, dialog } from "electron"; -import * as path from "path"; - -const processHangBtn = document.getElementById("process-hang"); - -processHangBtn.addEventListener("click", (_event) => { - const hangWinPath = "file://" + path.join(__dirname, "static/process_hang.html"); - let win = new BrowserWindow({ width: 400, height: 320 }); - - win.on("unresponsive", () => { - const options = { - buttons: ["Reload", "Close"], - message: "This process is hanging.", - title: "Renderer Process Hanging", - type: "info", - }; - dialog.showMessageBox(options, (index) => { - if (index === 0) { - win.reload(); - } else { - win.close(); - } - }); - }); - - win.on("close", () => { win = null; }); - win.loadURL(hangWinPath); - win.show(); -}); - -const processCrashBtn = document.getElementById("process-crash"); - -processCrashBtn.addEventListener("click", () => { - const crashWinPath = "file://" + path.join(__dirname, "static/process_crash.html"); - let win = new BrowserWindow({ width: 400, height: 320 }); - - win.webContents.on("crashed", () => { - const options = { - buttons: ["Reload", "Close"], - message: "This process has crashed.", - title: "Renderer Process Crashed", - type: "info", - }; - dialog.showMessageBox(options, (index) => { - if (index === 0) { win.reload(); } else { win.close(); } - }); - }); - - win.on("close", () => { win = null; }); - win.loadURL(crashWinPath); - win.show(); -}); diff --git a/src/ui/stix-editor.ts b/src/ui/stix-editor.ts index 22741ab3..6d7e0cd6 100644 --- a/src/ui/stix-editor.ts +++ b/src/ui/stix-editor.ts @@ -5,34 +5,35 @@ ALL RIGHTS RESERVED */ import cytoscape from 'cytoscape'; -import * as moment from 'moment'; -import { StigDB } from "../db"; +import moment from 'moment'; +// import { StigDB } from "../db"; import { StixNodeData } from '../stix'; import { schema_map } from '../stix/stix_schemas'; -type JSONEditorOptionsExtended