Release 0.9.1

Author: GoldingAustin

applications/client/src/store/graphql/BeaconModel.ts

@@ -67,7 +67,7 @@ export class BeaconModel extends ExtendedModel(BeaconModelBase, {}) {
 
 	@computed get computedBeaconName(): string {
 		const meta = this.meta[0]?.current;
-		if (!meta) return this.beaconName;
+		if (!meta) return this.displayName ?? this.beaconName;
 		const {
 			// id,
 			// pid,
@@ -77,7 +77,7 @@ export class BeaconModel extends ExtendedModel(BeaconModelBase, {}) {
 			// listener, // 'http';
 		} = meta;
 		// return [process, username].join(' · '); // <- TODO!
-		return [username].join(' · ');
+		return [this.displayName ?? this.beaconName, username].filter(Boolean).join(' · ');
 	}
 
 	@computed get computedName(): string {

applications/server/src/machines/parser.machine.ts

@@ -10,6 +10,7 @@ import { exec, execFile } from 'child_process';
 import path from 'path';
 import type { GraphQLContext } from '../types';
 import { parserService } from './parser.service';
+import { escapeFilePath } from '@redeye/parser-core';
 
 type ParserContext = {
 	queuedCampaigns: { campaignId: string; parserName: string }[];
@@ -172,7 +173,15 @@ type ParsingScriptArgs = {
 };
 const invokeParsingScript = ({ projectDatabasePath, loggingFolderPath, maxProcesses }: ParsingScriptArgs) => {
 	return new Promise<void>((resolve, reject) => {
-		const args = [`campaign`, `-d`, projectDatabasePath, `-p`, loggingFolderPath, `-t`, `${maxProcesses - 1}`];
+		const args = [
+			`campaign`,
+			`-d`,
+			escapeFilePath(projectDatabasePath),
+			`-p`,
+			escapeFilePath(loggingFolderPath),
+			`-t`,
+			`${maxProcesses - 1}`,
+		];
 
 		const execCallBack = (error: unknown, stdout: unknown, stderror: unknown) => {
 			if (error || stderror) {

applications/server/src/machines/parser.service.ts

@@ -22,7 +22,12 @@ import * as readline from 'node:readline';
 import path from 'path';
 import { getRuntimeDir } from '../util';
 import type { ParserInfo, ParserOutput } from '@redeye/parser-core';
-import { createLoggerInstance, ParserMessageTypes, getParserPrefixAndMessage } from '@redeye/parser-core';
+import {
+	createLoggerInstance,
+	ParserMessageTypes,
+	getParserPrefixAndMessage,
+	escapeFilePath,
+} from '@redeye/parser-core';
 import type { ChildProcess } from 'child_process';
 import { exec, execFile } from 'child_process';
 import type { EndpointContext, EntityManager } from '../types';
@@ -105,7 +110,7 @@ async function parsePaths(em: EntityManager, path: string, parserName: string) {
 		beacons: {},
 		operators: {},
 	};
-	const data = await invokeParser<ParserOutput>(parserName, ['parse-campaign', `--folder`, path]);
+	const data = await invokeParser<ParserOutput>(parserName, ['parse-campaign', `--folder`, escapeFilePath(path)]);
 	if (data.servers) {
 		for (const parsedServer of Object.values(data.servers)) {
 			created.servers[parsedServer.name] =

applications/server/src/routes/parserFileValidation.ts

@@ -3,6 +3,7 @@ import type { EndpointContext } from '../types';
 import { withTempDir } from '../util';
 import path from 'path';
 import { invokeParser } from '../machines/parser.service';
+import { escapeFilePath } from '@redeye/parser-core';
 
 export function parserFileValidation(app: Router, context: EndpointContext) {
 	app.post<{ parserName: string }, any, Express.Request>('/parser/:parserName/validate-files', async (req, res) => {
@@ -18,7 +19,7 @@ export function parserFileValidation(app: Router, context: EndpointContext) {
 				return await invokeParser(parserName, [
 					'validate-files',
 					'--folder',
-					path.join(dir, rootDir[0]).replace(/(\s+)/g, '\\$1'),
+					escapeFilePath(path.join(dir, rootDir[0])),
 				]);
 			});
 			return res.send(validated);

applications/server/src/routes/uploadCampaign.ts

@@ -96,7 +96,7 @@ export function uploadCampaign(app: Router, context: EndpointContext) {
 
 		const logFiles = Array.isArray(req.files.file) ? req.files.file : [req.files.file];
 		const em = await connectToProjectEmOrFail(campaignId, context);
-		const parentDir = path.resolve(getRootPath(), 'campaign', campaignId);
+		const parentDir = path.resolve(getRootPath(), 'campaign', campaignId, 'logs');
 		for (const logFile of logFiles) await logFile.mv(path.join(parentDir, logFile.name.replace(/:/gi, '/')));
 		const servers: Server[] = [];
 		const newServers = JSON.parse(req.body.servers as unknown as string);

applications/server/src/util.ts

@@ -31,7 +31,7 @@ export const getDbPath = (databaseMode: DatabaseMode): string => {
 };
 
 export const getDatabaseFolderPath = (campaignId: string, databaseMode: DatabaseMode): string =>
-	`${getDbPath(databaseMode)}/campaign/${campaignId}`;
+	path.resolve(getDbPath(databaseMode), 'campaign', campaignId);
 
 export const getFullCampaignDbPath = (campaignId: string, databaseMode: DatabaseMode): string =>
-	`${getDatabaseFolderPath(campaignId, databaseMode)}/db.redeye`;
+	path.resolve(getDatabaseFolderPath(campaignId, databaseMode), 'db.redeye');

docs/parser-guide/Create Parser Guide.md

@@ -408,7 +408,8 @@ Now that we've gone over how to identify what data to extract and how to format
 import fileSystem from 'fs';
 
 function parseLogFile() {
-	const logFile = fileSystem.readFileSync(`${process.argv[4]}/c2-log-files.txt`, 'utf8'); // Read the log file from the path passed in the command
+  const logPath = process.argv[4].replaceAll('"', ""); // Get the path and remove the quotes around it
+	const logFile = fileSystem.readFileSync(`${logPath}/c2-log-files.txt`, 'utf8'); // Read the log file from the path passed in the command
 	const lines = logFile.split('\n'); // Split the log file into lines
 	const output = {
 		// Create an empty object to store our output

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "redeye",
 	"productName": "RedEye",
-	"version": "0.9.0",
+	"version": "0.9.1",
 	"private": true,
 	"workspaces": [
 		"applications/**",

parsers/brute-ratel-parser/src/parse-campaign.command.ts

@@ -10,7 +10,8 @@ export const registerCampaignCommand = (program: Command) => {
 	const campaignCommand = program.command('parse-campaign');
 	campaignCommand.option(
 		'-f, --folder </absolute/path/to/folder>',
-		'The folder containing a Brute Ratel campaign, includes autosave.profile and logs folder'
+		'The folder containing a Brute Ratel campaign, includes autosave.profile and logs folder',
+		(value) => value.replaceAll('"', '')
 	);
 
 	campaignCommand.action(campaignCommandAction);

parsers/brute-ratel-parser/src/validate-files.command.ts

@@ -13,7 +13,8 @@ export const registerValidateFilesCommand = (program: Command) => {
 	const validateFilesCommand = program.command('validate-files');
 	validateFilesCommand.option(
 		'-f, --folder </absolute/path/to/folder>',
-		'A folder containing the Brute Ratel log files'
+		'A folder containing the Brute Ratel log files',
+		(value) => value.replaceAll('"', '')
 	);
 	validateFilesCommand.action(async (options) => {
 		writeParserMessage(ParserMessageTypes.Data, await validate(options));