Update runtime, build, and dev packages (#128)

.moon/toolchain.yml

@@ -10,7 +10,7 @@ $schema: 'https://moonrepo.dev/schemas/toolchain.json'
 node:
   # The version to use. Must be a semantic version that includes major, minor, and patch.
   # We suggest using the latest active LTS version: https://nodejs.org/en/about/releases
-  version: '16.19.1'
+  version: '16.20.0'
 
   # The package manager to use when managing dependencies.
   # Accepts "npm" (default), "pnpm", or "yarn".
@@ -41,7 +41,7 @@ node:
 
   # Sync `node.version` to a 3rd-party version manager's config file.
   # Accepts "nodenv" (.node-version), "nvm" (.nvmrc), or none.
-  # syncVersionManagerConfig: 'nvm'
+  syncVersionManagerConfig: 'nvm'
 
 # Configures how moon integrates with TypeScript.
 typescript:

.nvmrc

@@ -1 +1 @@
-v18.13
+v16.20.0

applications/client/src/store/graphql/ImageModel.base.ts

@@ -12,7 +12,7 @@ import { QueryBuilder } from 'mk-gql';
  */
 export class ImageModelBase extends Model({
 	__typename: tProp('Image'),
-	fileType: prop<string | null>().withSetter(),
+	fileType: prop<string>().withSetter(),
 	id: prop<string>().withSetter(),
 	url: prop<string | null>().withSetter(),
 }) {

applications/client/src/store/graphql/LinkModel.base.ts

@@ -29,7 +29,7 @@ export class LinkModelBase extends Model({
 	endTime: prop<any | null>().withSetter(),
 	id: prop<string>().withSetter(),
 	/** Was this Link manually created */
-	manual: prop<boolean | null>().withSetter(),
+	manual: prop<boolean>().withSetter(),
 	/** The display name of the link */
 	name: prop<string | null>().withSetter(),
 	origin: prop<Ref<BeaconModel> | null>().withSetter(),

applications/client/vite.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'vite';
-import react from '@vitejs/plugin-react';
+import react from '@vitejs/plugin-react-swc';
 import checker from 'vite-plugin-checker';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
@@ -14,22 +14,7 @@ export default defineConfig(() => ({
 	plugins: [
 		react({
 			jsxImportSource: '@emotion/react',
-			babel: {
-				plugins: [
-					['@babel/plugin-proposal-decorators', { legacy: true }],
-					['@babel/plugin-proposal-class-properties', { loose: true }],
-					[
-						'@emotion',
-						{
-							// sourceMap is on by default but source maps are dead code eliminated in production
-							sourceMap: true,
-							autoLabel: 'dev-only',
-							labelFormat: '[local]',
-							cssPropOptimization: true,
-						},
-					],
-				],
-			},
+			tsDecorators: true,
 		}),
 		tsconfigPaths({}),
 		checker({

applications/redeye-e2e/src/integration/e2e/redteam/command-count.cy.js

@@ -84,7 +84,11 @@ describe('Command counts', () => {
 						commandIds(beaconId: $beaconId, campaignId: $campaignId, commandIds: $commandIds, commandType: $commandType, hostId: $hostId, operatorId: $operatorId, sort: $sort)
 					  }`;
 
-							const variables = `{"campaignId": "${returnedUrl}", "hostId": "${nameHost1}", "sort": { "sortBy": "time", "direction": "ASC"}}`;
+							const variables = {
+								campaignId: returnedUrl,
+								hostId: nameHost1,
+								sort: { sortBy: 'time', direction: 'ASC' },
+							};
 							graphqlRequest(query, variables).then((res) => {
 								// cy.log(res.body.data.commandIds);
 								expect(res.body.data.commandIds).length(countHost1);
@@ -120,7 +124,11 @@ describe('Command counts', () => {
 						commandIds(beaconId: $beaconId, campaignId: $campaignId, commandIds: $commandIds, commandType: $commandType, hostId: $hostId, operatorId: $operatorId, sort: $sort)
 					  }`;
 
-							const variables = `{"campaignId": "${returnedUrl}", "hostId": "${nameHost2}", "sort": { "sortBy": "time", "direction": "ASC"}}`;
+							const variables = {
+								campaignId: returnedUrl,
+								hostId: nameHost2,
+								sort: { sortBy: 'time', direction: 'ASC' },
+							};
 							graphqlRequest(query, variables).then((res) => {
 								// cy.log(res.body.data.commandIds);
 								expect(res.body.data.commandIds).length(countHost2);

applications/redeye-e2e/src/integration/e2e/redteam/graphql/beacons.cy.js

@@ -17,7 +17,7 @@ describe('Query Beacons', () => {
         id
       }
     }`;
-			const variables = `{"campaignId": "${returnedUrl}"}`;
+			const variables = { campaignId: returnedUrl };
 			graphqlRequest(query, variables).then((res) => {
 				const comp = res.body.data.beacons;
 				expect(comp.length).to.eq(6);

applications/redeye-e2e/src/integration/e2e/redteam/graphql/commandTypes.cy.js

@@ -17,7 +17,7 @@ describe('Query CommandTypes', () => {
         id
       }
     }`;
-			const variables = `{"campaignId": "${returnedUrl}"}`;
+			const variables = { campaignId: returnedUrl };
 			graphqlRequest(query, variables).then((res) => {
 				const comp = res.body.data.commandTypes;
 				//23 Unique Command Types

applications/redeye-e2e/src/integration/e2e/redteam/graphql/commands.skip.js

@@ -20,15 +20,15 @@ describe('Query Commands & CommandsIds', () => {
 			const query = `query commandIds($beaconId: String, $campaignId: String!, $commandIds: [String!], $commandType: String, $hostId: String, $operatorId: String, $sort: SortType) { 
           commandIds(beaconId: $beaconId, campaignId: $campaignId, commandIds: $commandIds, commandType: $commandType, hostId: $hostId, operatorId: $operatorId, sort: $sort) 
         }`;
-			const variables = `{"campaignId": "${returnedUrl}", "commandType": "elevate", "sort": { "sortBy": "time", "direction": "ASC"}}`;
+			const variables = { campaignId: returnedUrl, commandType: 'elevate', sort: { sortBy: 'time', direction: 'ASC' } };
 			graphqlRequest(query, variables).then((res) => {
 				let cmdId = res.body.data.commandIds.toString();
 				cy.log(cmdId);
 
 				const query1 = `query commands($beaconId: String, $campaignId: String!, $commandIds: [String!], $commandType: String, $hostId: String, $operatorId: String, $sort: SortType) {
           commands(beaconId: $beaconId, campaignId: $campaignId, commandIds: $commandIds, commandType: $commandType, hostId: $hostId, operatorId: $operatorId, sort: $sort)
         }`;
-				const variables1 = `{"campaignId": "${returnedUrl}",  "commandIds": ["a1117439-359c-4b28-a634-1a43912d0d6a"] "}`;
+				const variables1 = { campaignId: returnedUrl, commandIds: ['a1117439-359c-4b28-a634-1a43912d0d6a'] };
 				graphqlRequest(query1, variables1).then((res1) => {
 					cy.log(res1.body);
 				});

applications/redeye-e2e/src/integration/e2e/redteam/graphql/deleteCampaigns.cy.js

@@ -23,7 +23,7 @@ describe('Delete Campaign', () => {
         mutation deleteCampaign($campaignId: String!) {
          deleteCampaign(campaignId: $campaignId) 
       }`;
-			const variables = `{"campaignId": "${campToDelete}"}`;
+			const variables = { campaignId: campToDelete };
 			mutRequest(mutation, variables).then((res) => {
 				cy.log(res);
 			});

applications/redeye-e2e/src/integration/e2e/redteam/graphql/globalOperators.cy.js

@@ -14,7 +14,7 @@ describe('Query Global Operators', () => {
         name
       }
     }`;
-		const variables = `{"password": "937038570"}`;
+		const variables = { password: '937038570' };
 		graphqlRequest(query, variables).then((response) => {
 			const res = response.body.data.globalOperators;
 			const match = Cypress._.find(res, { id: 'cypress' });

applications/redeye-e2e/src/integration/e2e/redteam/graphql/hosts.cy.js

@@ -17,7 +17,7 @@ describe('Query Hosts', () => {
         id
       }
     }`;
-			const variables = `{"campaignId": "${returnedUrl}"}`;
+			const variables = { campaignId: returnedUrl };
 			graphqlRequest(query, variables).then((res) => {
 				const comp = res.body.data.hosts;
 				expect(comp.length).to.eq(3);

applications/redeye-e2e/src/integration/e2e/redteam/graphql/links.cy.js

@@ -17,7 +17,7 @@ describe('Get All Links', () => {
         id
       }
     }`;
-			const variables = `{"campaignId": "${returnedUrl}"}`;
+			const variables = { campaignId: returnedUrl };
 			graphqlRequest(query, variables).then((res) => {
 				const search = res.body.data.links;
 				cy.log(search);

applications/redeye-e2e/src/integration/e2e/redteam/graphql/operators.cy.js

@@ -18,7 +18,7 @@ describe('Query Operators', () => {
       }
     }`;
 
-			const variables = `{"campaignId": "${returnedUrl}" }`;
+			const variables = { campaignId: returnedUrl };
 			graphqlRequest(query, variables).then((res) => {
 				const resp = res.body.data.operators[0];
 				cy.log(resp);

applications/redeye-e2e/src/integration/e2e/redteam/graphql/presentationItems.cy.js

@@ -19,7 +19,7 @@ describe('Query Presentation Items', () => {
         id
       }
     }`;
-			const variables = `{"campaignId": "${returnedUrl}"}`;
+			const variables = { campaignId: returnedUrl };
 			graphqlRequest(query, variables).then((res) => {
 				const comp = res.body.data.presentationItems;
 				cy.log(comp);

applications/redeye-e2e/src/integration/e2e/redteam/graphql/searchCommands.cy.js

@@ -20,7 +20,7 @@ describe('Search Request', () => {
         inputText
       }
     }`;
-			const variables = `{"campaignId": "${returnedUrl}", "searchQuery": "exit"}`;
+			const variables = { campaignId: returnedUrl, searchQuery: 'exit' };
 			graphqlRequest(query, variables).then((res) => {
 				const search = res.body.data.searchCommands;
 				cy.log(search);

applications/redeye-e2e/src/integration/e2e/redteam/graphql/servers.cy.js

@@ -18,7 +18,7 @@ describe('Query Servers', () => {
       }
     }`;
 
-			const variables = `{"campaignId": "${returnedUrl}", "username": "seb" }`;
+			const variables = { campaignId: returnedUrl, username: 'seb' };
 			graphqlRequest(query, variables).then((res) => {
 				expect(res.body.data.servers.length).to.eq(1);
 			});

applications/redeye-e2e/src/support/commands.js

@@ -203,7 +203,7 @@ Cypress.Commands.add('deleteCampaignGraphQL', (name) => {
     mutation deleteCampaign($campaignId: String!) {
      deleteCampaign(campaignId: $campaignId) 
   }`;
-		const variables = `{"campaignId": "${campToDelete}"}`;
+		const variables = { campaignId: campToDelete };
 		mutRequest(mutation, variables).then((res) => {
 			cy.log(res);
 		});

applications/redeye-e2e/src/support/graphqlCommands.js

@@ -12,7 +12,7 @@ Cypress.Commands.add('uploadLogs', (creatorName, folderName) => {
     }
   }`;
 
-	const variables = `{"creatorName": "${creatorName}", "name": "${folderName}"}`;
+	const variables = { creatorName: creatorName, name: folderName };
 	mutRequest(mutation, variables).then((res) => {
 		let camp = res.body.data.createCampaign.id;
 
@@ -24,7 +24,7 @@ Cypress.Commands.add('uploadLogs', (creatorName, folderName) => {
       }
 		}`;
 		cy.task('getPath', { dirPath: path.join(__dirname, '..', 'fixtures', 'smalldata') }).then((logPath) => {
-			const variables1 = `{"campaignId": "${camp}", "name": "200817", "path": "${logPath}"}`;
+			const variables1 = { campaignId: camp, name: '200817', path: logPath };
 			mutRequest(mutation2, variables1).then((res) => {
 				cy.log(res);
 			});
@@ -42,7 +42,7 @@ Cypress.Commands.add('uploadLogs', (creatorName, folderName) => {
 		      serversParse(campaignId: $campaignId)
 		  }`;
 
-			const variables = `{"campaignId": "${camp}"}`;
+			const variables = { campaignId: camp };
 			mutRequest(mutation1, variables).then((res) => {
 				cy.log(res);
 			});

applications/server/schema.graphql

@@ -149,12 +149,7 @@ type File {
   md5: String
 }
 
-"""
-Designates if this is an upload or download
-    UPLOAD: File was put on or replace on a target host
-    DOWNLOAD: File was taken from a target host
-  
-"""
+"Designates if this is an upload or download\n    UPLOAD: File was put on or replace on a target host\n    DOWNLOAD: File was taken from a target host\n  "
 enum FileFlag {
   DOWNLOAD
   UPLOAD
@@ -195,7 +190,7 @@ type HostMeta {
 }
 
 type Image {
-  fileType: String
+  fileType: String!
   id: String!
   url: String
 }
@@ -207,7 +202,7 @@ type Link {
   id: String!
 
   """Was this Link manually created"""
-  manual: Boolean
+  manual: Boolean!
 
   """The display name of the link"""
   name: String
@@ -638,4 +633,4 @@ type TimelineCommandCountTuple {
 
   """The number of commands run during this time interval"""
   commandCount: Float!
-}
+}

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

@@ -4,37 +4,37 @@ import { anonymizeService } from './anonymize.service';
 
 @InputType()
 class FindReplaceInput {
-	@Field(() => String, { defaultValue: '' })
+	@Field(() => String, { defaultValue: '', nullable: true })
 	find: string = '';
 
-	@Field(() => String, { defaultValue: '' })
+	@Field(() => String, { defaultValue: '', nullable: true })
 	replace: string = '';
 }
 
 @InputType()
 export class AnonymizationInput {
-	@Field(() => Boolean, { defaultValue: false })
+	@Field(() => Boolean, { defaultValue: false, nullable: true })
 	removePasswordsHashes: boolean = false;
 
-	@Field(() => Boolean, { defaultValue: false })
+	@Field(() => Boolean, { defaultValue: false, nullable: true })
 	removeHidden: boolean = false;
 
-	@Field(() => Boolean, { defaultValue: false })
+	@Field(() => Boolean, { defaultValue: false, nullable: true })
 	removeKeystrokes: boolean = false;
 
-	@Field(() => Boolean, { defaultValue: false })
+	@Field(() => Boolean, { defaultValue: false, nullable: true })
 	removeScreenshots: boolean = false;
 
-	@Field(() => Boolean, { defaultValue: false })
+	@Field(() => Boolean, { defaultValue: false, nullable: true })
 	replaceUsernames: boolean = false;
 
-	@Field(() => Boolean, { defaultValue: false })
+	@Field(() => Boolean, { defaultValue: false, nullable: true })
 	replaceHostnames: boolean = false;
 
-	@Field(() => Boolean, { defaultValue: false })
+	@Field(() => Boolean, { defaultValue: false, nullable: true })
 	replaceDomainsAndIps: boolean = false;
 
-	@Field(() => [FindReplaceInput])
+	@Field(() => [FindReplaceInput], { nullable: true })
 	findReplace: FindReplaceInput[] = [];
 }