From ab676fb11e0c657bdc4b9e089192733795a376ce Mon Sep 17 00:00:00 2001 From: aloftus23 Date: Thu, 14 Mar 2024 11:19:55 -0400 Subject: [PATCH 01/21] Clean up P&E SQSS proccess --- backend/env.yml | 16 +- backend/serverless.yml | 7 - backend/src/tasks/functions.yml | 11 +- backend/src/tasks/scanExecution.ts | 221 ++++------ dev.env.example | 8 +- infrastructure/database.tf | 7 + infrastructure/pe.tf | 333 --------------- infrastructure/pe_worker.tf | 658 +---------------------------- infrastructure/prod.tfvars | 5 - infrastructure/stage.tfvars | 4 - infrastructure/vars.tf | 30 -- 11 files changed, 111 insertions(+), 1189 deletions(-) delete mode 100644 infrastructure/pe.tf diff --git a/backend/env.yml b/backend/env.yml index c51ef649..b6d6c7ac 100644 --- a/backend/env.yml +++ b/backend/env.yml @@ -47,17 +47,13 @@ staging: REPORTS_BUCKET_NAME: cisa-crossfeed-staging-reports CLOUDWATCH_BUCKET_NAME: cisa-crossfeed-staging-cloudwatch STAGE: staging - PE_CLUSTER_NAME: pe-staging-worker + PE_FARGATE_CLUSTER_NAME: pe-staging-worker + PE_FARGATE_TASK_DEFINITION_NAME: pe-staging-worker SHODAN_QUEUE_URL: ${ssm:/crossfeed/staging/SHODAN_QUEUE_URL} - SHODAN_SERVICE_NAME: pe-staging-shodan DNSTWIST_QUEUE_URL: ${ssm:/crossfeed/staging/DNSTWIST_QUEUE_URL} - DNSTWIST_SERVICE_NAME: pe-staging-dnstwist HIBP_QUEUE_URL: ${ssm:/crossfeed/staging/HIBP_QUEUE_URL} - HIBP_SERVICE_NAME: pe-staging-hibp INTELX_QUEUE_URL: ${ssm:/crossfeed/staging/INTELX_QUEUE_URL} - INTELX_SERVICE_NAME: pe-staging-intelx CYBERSIXGILL_QUEUE_URL: ${ssm:/crossfeed/staging/CYBERSIXGILL_QUEUE_URL} - CYBERSIXGILL_SERVICE_NAME: pe-staging-cybersixgill EMAIL_BUCKET_NAME: cisa-crossfeed-staging-html-email prod: @@ -97,9 +93,13 @@ prod: REPORTS_BUCKET_NAME: cisa-crossfeed-prod-reports CLOUDWATCH_BUCKET_NAME: cisa-crossfeed-prod-cloudwatch STAGE: prod - PE_CLUSTER_NAME: pe-prod-worker + PE_FARGATE_CLUSTER_NAME: pe-prod-worker + PE_FARGATE_TASK_DEFINITION_NAME: pe-prod-worker SHODAN_QUEUE_URL: ${ssm:/crossfeed/prod/SHODAN_QUEUE_URL} - SHODAN_SERVICE_NAME: pe-prod-shodan + DNSTWIST_QUEUE_URL: ${ssm:/crossfeed/prod/DNSTWIST_QUEUE_URL} + HIBP_QUEUE_URL: ${ssm:/crossfeed/prod/HIBP_QUEUE_URL} + INTELX_QUEUE_URL: ${ssm:/crossfeed/prod/INTELX_QUEUE_URL} + CYBERSIXGILL_QUEUE_URL: ${ssm:/crossfeed/prod/CYBERSIXGILL_QUEUE_URL} EMAIL_BUCKET_NAME: cisa-crossfeed-staging-html-email dev-vpc: diff --git a/backend/serverless.yml b/backend/serverless.yml index b94a238f..caf161d3 100644 --- a/backend/serverless.yml +++ b/backend/serverless.yml @@ -108,13 +108,6 @@ provider: resources: Resources: - WorkerControlQueue: - Type: AWS::SQS::Queue - Properties: - QueueName: ${self:provider.stage}-worker-control-queue - VisibilityTimeout: 300 # Should match or exceed function timeout - MaximumMessageSize: 262144 # 256 KB - MessageRetentionPeriod: 604800 # 7 days ShodanQueue: Type: AWS::SQS::Queue Properties: diff --git a/backend/src/tasks/functions.yml b/backend/src/tasks/functions.yml index c821a00c..6c569e5f 100644 --- a/backend/src/tasks/functions.yml +++ b/backend/src/tasks/functions.yml @@ -35,17 +35,10 @@ checkUserExpiration: handler: src/tasks/checkUserExpiration.handler events: - schedule: cron(0 0 * * ? *) # Runs every day at midnight + scanExecution: + timeout: 900 handler: src/tasks/scanExecution.handler - timeout: 300 # 5 minutes - environment: - SQS_QUEUE_NAME: ${self:provider.stage}-worker-control-queue - events: - - sqs: - arn: - Fn::GetAtt: - - WorkerControlQueue - - Arn memorySize: 4096 updateScanTaskStatus: diff --git a/backend/src/tasks/scanExecution.ts b/backend/src/tasks/scanExecution.ts index 93bbd63b..8da85ad5 100644 --- a/backend/src/tasks/scanExecution.ts +++ b/backend/src/tasks/scanExecution.ts @@ -1,10 +1,8 @@ -import { Handler, SQSRecord } from 'aws-lambda'; +import { Handler } from 'aws-lambda'; import * as AWS from 'aws-sdk'; import { integer } from 'aws-sdk/clients/cloudfront'; -import { connect } from 'amqplib'; const ecs = new AWS.ECS(); -const sqs = new AWS.SQS(); let docker; if (process.env.IS_LOCAL) { docker = require('dockerode'); @@ -12,90 +10,76 @@ if (process.env.IS_LOCAL) { const toSnakeCase = (input) => input.replace(/ /g, '-'); -async function updateServiceAndQueue( - queueUrl: string, - serviceName: string, +async function startDesiredTasks( + scanType: string, desiredCount: integer, - message_body: any, // Add this parameter - clusterName: string // Add this parameter -) { - // Place message in scan specific queue - if (process.env.IS_LOCAL) { - // If running locally, use RabbitMQ instead of SQS - console.log('Publishing to rabbitMQ'); - await publishToRabbitMQ(queueUrl, message_body); - console.log('Done publishing to rabbitMQ'); - } else { - // Place in AWS SQS queue - console.log('Publishing to scan specific queue'); - await placeMessageInQueue(queueUrl, message_body); - } - - // Check if Fargate is running desired count and start if not - await updateServiceDesiredCount( - clusterName, - serviceName, - desiredCount, - queueUrl - ); - console.log('Done'); -} - -export async function updateServiceDesiredCount( - clusterName: string, - serviceName: string, - desiredCountNum: integer, queueUrl: string ) { try { - if (process.env.IS_LOCAL) { - console.log('starting local containers'); - await startLocalContainers(desiredCountNum, serviceName, queueUrl); - } else { - const describeServiceParams = { - cluster: clusterName, - services: [serviceName] - }; - const serviceDescription = await ecs - .describeServices(describeServiceParams) - .promise(); - if ( - serviceDescription && - serviceDescription.services && - serviceDescription.services.length > 0 - ) { - const service = serviceDescription.services[0]; - - // Check if the desired task count is less than # provided - if (service.desiredCount !== desiredCountNum) { - console.log('Setting desired count.'); - const updateServiceParams = { - cluster: clusterName, - service: serviceName, - desiredCount: desiredCountNum // Set to desired # of Fargate tasks - }; - - await ecs.updateService(updateServiceParams).promise(); - } else { - console.log('Desired count already set.'); - } + // ECS can only start 10 tasks at a time. Split up into batches + const batchSize = 10; + let remainingCount = desiredCount; + while (remainingCount > 0) { + const currentBatchCount = Math.min(remainingCount, batchSize); + + if (process.env.IS_LOCAL) { + // If running locally, use RabbitMQ and Docker instead of SQS and ECS + console.log('Starting local containers'); + await startLocalContainers(currentBatchCount, scanType, queueUrl); + } else { + await ecs + .runTask({ + cluster: process.env.PE_FARGATE_CLUSTER_NAME!, + taskDefinition: process.env.PE_FARGATE_TASK_DEFINITION_NAME!, + networkConfiguration: { + awsvpcConfiguration: { + assignPublicIp: 'ENABLED', + securityGroups: [process.env.FARGATE_SG_ID!], + subnets: [process.env.FARGATE_SUBNET_ID!] + } + }, + platformVersion: '1.4.0', + launchType: 'FARGATE', + count: currentBatchCount, + overrides: { + containerOverrides: [ + { + name: 'main', + environment: [ + { + name: 'SERVICE_TYPE', + value: scanType + }, + { + name: 'SERVICE_QUEUE_URL', + value: queueUrl + } + ] + } + ] + } + }) + .promise(); } + console.log('Tasks started:', currentBatchCount); + remainingCount -= currentBatchCount; } } catch (error) { - console.error('Error: ', error); + console.error('Error starting tasks:', error); + throw error; } } async function startLocalContainers( count: number, - serviceName: string, + scanType: string, queueUrl: string ) { // Start 'count' number of local Docker containers for (let i = 0; i < count; i++) { try { const containerName = toSnakeCase( - `crossfeed_worker_${serviceName}_${i}_` + + `crossfeed_worker_${scanType}_${i}_` + Math.floor(Math.random() * 10000000) ); const container = await docker!.createContainer({ @@ -138,93 +122,68 @@ async function startLocalContainers( `LG_API_KEY=${process.env.LG_API_KEY}`, `LG_WORKSPACE_NAME=${process.env.LG_WORKSPACE_NAME}`, `SERVICE_QUEUE_URL=${queueUrl}`, - `SERVICE_TYPE=${serviceName}` + `SERVICE_TYPE=${scanType}` ] } as any); await container.start(); - console.log(`done starting container ${i}`); + console.log(`Done starting container ${i}`); } catch (e) { console.error(e); } } } -// Place message in AWS SQS Queue -async function placeMessageInQueue(queueUrl: string, message: any) { - const sendMessageParams = { - QueueUrl: queueUrl, - MessageBody: JSON.stringify(message) - }; - - await sqs.sendMessage(sendMessageParams).promise(); -} - -// Function to connect to RabbitMQ and publish a message -async function publishToRabbitMQ(queue: string, message: any) { - const connection = await connect('amqp://rabbitmq'); - const channel = await connection.createChannel(); - - await channel.assertQueue(queue, { durable: true }); - await channel.sendToQueue(queue, Buffer.from(JSON.stringify(message))); - - await channel.close(); - await connection.close(); -} - export const handler: Handler = async (event) => { - try { - let desiredCount; - const clusterName = process.env.PE_CLUSTER_NAME!; + let desiredCount: integer; + let scanType: string; + if (event.desiredCount) { + desiredCount = event.desiredCount; + } else { + console.log('Desired count not found. Setting to 1.'); + desiredCount = 1; + } - // Get the Control SQS record and message body - const sqsRecord: SQSRecord = event.Records[0]; - const message_body = JSON.parse(sqsRecord.body); - console.log(message_body); + if (event.scanType) { + scanType = event.scanType; + } else { + console.error('scanType must be provided.'); + return 'Failed no scanType'; + } - if (message_body.scriptType === 'shodan') { - desiredCount = 5; - await updateServiceAndQueue( - process.env.SHODAN_QUEUE_URL!, - process.env.SHODAN_SERVICE_NAME!, + try { + if (scanType === 'shodan') { + await startDesiredTasks( + scanType, desiredCount, - message_body, - clusterName + process.env.SHODAN_QUEUE_URL! ); - } else if (message_body.scriptType === 'dnstwist') { + } else if (scanType === 'dnstwist') { desiredCount = 30; - await updateServiceAndQueue( - process.env.DNSTWIST_QUEUE_URL!, - process.env.DNSTWIST_SERVICE_NAME!, + await startDesiredTasks( + scanType, desiredCount, - message_body, - clusterName + process.env.DNSTWIST_QUEUE_URL! ); - } else if (message_body.scriptType === 'hibp') { + } else if (scanType === 'hibp') { desiredCount = 20; - await updateServiceAndQueue( - process.env.HIBP_QUEUE_URL!, - process.env.HIBP_SERVICE_NAME!, + await startDesiredTasks( + scanType, desiredCount, - message_body, - clusterName + process.env.HIBP_QUEUE_URL! ); - } else if (message_body.scriptType === 'intelx') { + } else if (scanType === 'intelx') { desiredCount = 10; - await updateServiceAndQueue( - process.env.INTELX_QUEUE_URL!, - process.env.INTELX_SERVICE_NAME!, + await startDesiredTasks( + scanType, desiredCount, - message_body, - clusterName + process.env.INTELX_QUEUE_URL! ); - } else if (message_body.scriptType === 'cybersixgill') { + } else if (scanType === 'cybersixgill') { desiredCount = 10; - await updateServiceAndQueue( - process.env.CYBERSIXGILL_QUEUE_URL!, - process.env.CYBERSIXGILL_SERVICE_NAME!, + await startDesiredTasks( + scanType, desiredCount, - message_body, - clusterName + process.env.CYBERSIXGILL_QUEUE_URL! ); } else { console.log( diff --git a/dev.env.example b/dev.env.example index be23dba0..9116f102 100644 --- a/dev.env.example +++ b/dev.env.example @@ -92,15 +92,11 @@ PE_DB_PASSWORD=password SHODAN_QUEUE_URL =shodanQueue -SHODAN_SERVICE_NAME=pe-shodan PE_SHODAN_API_KEYS= DNSTWIST_QUEUE_URL=dnstwistQueue -DNSTWIST_SERVICE_NAME=pe-dnstwist HIBP_QUEUE_URL=hibpQueue -HIBP_SERVICE_NAME=pe-hibp INTELX_QUEUE_URL=intelxQueue -INTELX_SERVICE_NAME=pe-intelx CYBERSIXGILL_QUEUE_URL=cybersixgillQueue -CYBERSIXGILL_SERVICE_NAME=pe-cybersixgill -PE_CLUSTER_NAME=pe-staging-worker +PE_FARGATE_CLUSTER_NAME=pe-staging-worker +PE_FARGATE_TASK_DEFINITION_NAME=pe-staging-worker diff --git a/infrastructure/database.tf b/infrastructure/database.tf index ebda69f9..f1b0dc01 100644 --- a/infrastructure/database.tf +++ b/infrastructure/database.tf @@ -160,6 +160,13 @@ resource "aws_iam_role_policy" "db_accessor_s3_policy" { "s3:*" ], "Resource": ["${aws_s3_bucket.reports_bucket.arn}", "${aws_s3_bucket.reports_bucket.arn}/*", "${aws_s3_bucket.pe_db_backups_bucket.arn}", "${aws_s3_bucket.pe_db_backups_bucket.arn}/*"] + }, + { + "Effect": "Allow", + "Action": [ + "lambda:InvokeFunction" + ], + "Resource": * } ] } diff --git a/infrastructure/pe.tf b/infrastructure/pe.tf deleted file mode 100644 index 14150e91..00000000 --- a/infrastructure/pe.tf +++ /dev/null @@ -1,333 +0,0 @@ - -resource "aws_cloudwatch_event_rule" "scheduled_pe_task" { - - name = "scheduled-pe-event-rule" - schedule_expression = "cron(0 0 1,16 * ? *)" -} - -resource "aws_cloudwatch_event_rule" "scheduled_pe_cybersixgill_task" { - - name = "scheduled-pe-event-cybersixgill-rule" - schedule_expression = "cron(0 0 1,16 * ? *)" -} - -resource "aws_iam_role" "cloudwatch_scheduled_task_execution" { - name = "crossfeed-pe-cloudwatch-role-${var.stage}" - assume_role_policy = < Date: Thu, 14 Mar 2024 14:45:03 -0400 Subject: [PATCH 02/21] fix terraform errors --- infrastructure/database.tf | 2 +- infrastructure/pe_worker.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure/database.tf b/infrastructure/database.tf index f1b0dc01..d04c4439 100644 --- a/infrastructure/database.tf +++ b/infrastructure/database.tf @@ -166,7 +166,7 @@ resource "aws_iam_role_policy" "db_accessor_s3_policy" { "Action": [ "lambda:InvokeFunction" ], - "Resource": * + "Resource": ["*"] } ] } diff --git a/infrastructure/pe_worker.tf b/infrastructure/pe_worker.tf index 01b6e6d0..573e2776 100644 --- a/infrastructure/pe_worker.tf +++ b/infrastructure/pe_worker.tf @@ -66,7 +66,7 @@ resource "aws_ecs_task_definition" "pe_worker" { { "name": "DB_PORT", "value": "${var.db_port}" - }, + } ], "secrets": [ { From 4b3c11cc68ff5b722608040ab6b01c801ae7f164 Mon Sep 17 00:00:00 2001 From: Chrtorres Date: Thu, 14 Mar 2024 15:04:41 -0400 Subject: [PATCH 03/21] Fixed header response to browser, NavLink underline styling, and Crossfeed logo routing to dashboard --- frontend/src/components/Header.tsx | 212 +++------------------------- frontend/src/components/NavItem.tsx | 4 +- 2 files changed, 21 insertions(+), 195 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index e6b751dd..368b8a27 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -33,6 +33,7 @@ const classes = { inner: `${PREFIX}-inner`, menuButton: `${PREFIX}-menuButton`, logo: `${PREFIX}-logo`, + logoBox: `${PREFIX}-logoBox`, spacing: `${PREFIX}-spacing`, activeLink: `${PREFIX}-activeLink`, activeMobileLink: `${PREFIX}-activeMobileLink`, @@ -46,44 +47,31 @@ const classes = { const Root = styled('div')(({ theme }) => ({ [`.${classes.inner}`]: { - maxWidth: 1440, - width: '250%', + maxWidth: '1440px', + width: '100%', margin: '0 auto' }, [`.${classes.menuButton}`]: { marginLeft: theme.spacing(2), display: 'flex', - [theme.breakpoints.up('sm')]: { + [theme.breakpoints.up('xl')]: { display: 'none' } }, [`.${classes.logo}`]: { width: 150, + minWidth: 150, padding: theme.spacing(), paddingLeft: 0, [theme.breakpoints.down('xl')]: { display: 'flex' } }, - [`.${classes.spacing}`]: { flexGrow: 1 }, - - [`.${classes.activeLink}`]: { - ':after': { - content: "''", - position: 'absolute', - bottom: 0, - left: 0, - width: '100%', - height: 2, - backgroundColor: 'white' - } - }, - [`.${classes.activeMobileLink}`]: { fontWeight: 700, '&:after': { @@ -238,7 +226,7 @@ const HeaderNoCtx: React.FC = (props) => { title: 'Overview', path: '/', users: ALL_USERS, - exact: true + exact: true, }, { title: 'Inventory', @@ -246,24 +234,6 @@ const HeaderNoCtx: React.FC = (props) => { users: ALL_USERS, exact: false }, - - /* - Hiding Feeds page until finished - { title: 'Feeds', - path: '/feeds', - users: ALL_USERS, - exact: false - },*/ - - /* - Hiding Reports page until finished - { - title: 'Reports', - path: '/reports', - users: ALL_USERS, - exact: true - },*/ - { title: 'Scans', path: '/scans', @@ -272,55 +242,12 @@ const HeaderNoCtx: React.FC = (props) => { } ].filter(({ users }) => (users & userLevel) > 0); - const userMenu: NavItemType = { - title: ( -
- My Account -
- ), - path: '#', - exact: false, - nested: [ - { - title: 'Manage Organizations', - path: '/organizations', - users: GLOBAL_ADMIN, - exact: true - }, - // { - // title: 'My Organizations', - // path: '/organizations', - // users: STANDARD_USER, - // exact: true - // }, - { - title: 'Manage Users', - path: '/users', - users: GLOBAL_ADMIN, - exact: true - }, - { - title: 'My Settings', - path: '/settings', - users: ALL_USERS, - exact: true - }, - { - title: 'Logout', - path: '/settings', - users: ALL_USERS, - onClick: logout, - exact: true - } - ].filter(({ users }) => (users & userLevel) > 0) - }; - - const userItemsSmall: NavItemType[] = [ + const userItems: NavItemType[] = [ { title: 'My Account', path: '#', users: ALL_USERS, - exact: true + exact: false, }, { title: 'Manage Organizations', @@ -328,12 +255,6 @@ const HeaderNoCtx: React.FC = (props) => { users: GLOBAL_ADMIN, exact: true }, - // { - // title: 'My Organizations', - // path: '/organizations', - // users: STANDARD_USER, - // exact: true - // }, { title: 'Manage Users', path: '/users', @@ -355,26 +276,16 @@ const HeaderNoCtx: React.FC = (props) => { } ].filter(({ users }) => (users & userLevel) > 0); - const orgPageMatch = useRouteMatch('/organizations/:id'); - const desktopNavItems: JSX.Element[] = navItems.map((item) => ( )); - const navItemsToUse = () => { - if (isSmall) { - return userItemsSmall; - } else { - return navItems; - } - }; - return (
- + = (props) => { }); }} /> - {organizations.length > 1 && ( - <> -
- - option?.name === value?.name - } - options={[{ name: 'All Organizations' }].concat( - organizations - )} - autoComplete={false} - className={classes.selectOrg} - classes={{ - option: classes.option - }} - value={ - showAllOrganizations - ? { name: 'All Organizations' } - : currentOrganization ?? undefined - } - filterOptions={(options, state) => { - // If already selected, show all - if ( - options.find( - (option) => - option?.name.toLowerCase() === - state.inputValue.toLowerCase() - ) - ) { - return options; - } - return options.filter( - (option) => - option?.name - .toLowerCase() - .includes(state.inputValue.toLowerCase()) - ); - }} - disableClearable - blurOnSelect - selectOnFocus - getOptionLabel={(option) => option!.name} - renderOption={(props, option) => ( -
  • {option!.name}
    • - )} - onChange={( - event: any, - value: Organization | { name: string } | undefined - ) => { - if (value && 'id' in value) { - setOrganization(value); - setShowAllOrganizations(false); - if (value.name === 'Election') { - setShowMaps(true); - } else { - setShowMaps(false); - } - - // Check if we're on an organization page and, if so, update it to the new organization - if (orgPageMatch !== null) { - if (!tags.find((e) => e.id === value.id)) { - history.push(`/organizations/${value.id}`); - } - } - } else { - setShowAllOrganizations(true); - setShowMaps(false); - } - }} - renderInput={(params) => ( - - )} - /> - - )} - {isSmall ? null : } + setNavOpen((open) => !open)} + > + + )} - setNavOpen((open) => !open)} - > - -
    - = (props) => { data-testid="mobilenav" > - {navItemsToUse().map(({ title, path, nested, onClick }) => ( + {userItems.map(({ title, path, nested, onClick }) => ( {path && ( ({ position: 'absolute', bottom: 0, left: 6, - width: '100%', + width: '85%', height: 2, backgroundColor: 'white' } @@ -152,7 +152,7 @@ const Root = styled('div')(({ theme }) => ({ bottom: 0, left: 0, height: '100%', - width: 2, + width: '85%', backgroundColor: theme.palette.primary.main } }, From c0af290f57494dd0aaee6822c17ffd5d852931ec Mon Sep 17 00:00:00 2001 From: aloftus23 Date: Thu, 14 Mar 2024 15:29:39 -0400 Subject: [PATCH 04/21] Update documentation --- backend/package.json | 5 ++- backend/sendMessage.js | 20 +++++---- backend/src/tasks/ecs-client.ts | 2 +- backend/src/tasks/scanExecution.ts | 12 +++--- backend/src/tools/consumeControlQueue.ts | 42 ------------------- backend/src/tools/run-scanExecution.ts | 10 +++++ .../src/documentation-pages/dev/quickstart.md | 13 +++--- 7 files changed, 38 insertions(+), 66 deletions(-) delete mode 100644 backend/src/tools/consumeControlQueue.ts create mode 100644 backend/src/tools/run-scanExecution.ts diff --git a/backend/package.json b/backend/package.json index 915067f1..38ba5bec 100644 --- a/backend/package.json +++ b/backend/package.json @@ -112,8 +112,9 @@ "deploy-worker-prod": "./tools/deploy-worker.sh crossfeed-prod-worker", "syncdb": "docker-compose exec -T backend npx ts-node src/tools/run-syncdb.ts", "pesyncdb": "docker-compose exec -T backend npx ts-node src/tools/run-pesyncdb.ts", - "control-queue": "docker-compose exec -T backend npx ts-node src/tools/consumeControlQueue.ts" + "scan-exec": "docker-compose exec -T backend npx ts-node src/tools/run-scanExecution.ts", + "send-message": "node sendMessage.js" }, "author": "", "license": "ISC" -} +} \ No newline at end of file diff --git a/backend/sendMessage.js b/backend/sendMessage.js index 6e875286..e868adb8 100644 --- a/backend/sendMessage.js +++ b/backend/sendMessage.js @@ -1,19 +1,18 @@ // sendMessage.js const amqp = require('amqplib'); -async function sendMessageToControlQueue(message) { +async function sendMessageToQueue(message, queue) { const connection = await amqp.connect('amqp://localhost'); const channel = await connection.createChannel(); - const controlQueue = 'ControlQueue'; - await channel.assertQueue(controlQueue, { durable: true }); + await channel.assertQueue(queue, { durable: true }); - // Simulate sending a message to the ControlQueue - channel.sendToQueue(controlQueue, Buffer.from(JSON.stringify(message)), { + // Simulate sending a message to the queue + channel.sendToQueue(queue, Buffer.from(JSON.stringify(message)), { persistent: true }); - console.log('Message sent to ControlQueue:', message); + console.log('Message sent:', message); setTimeout(() => { connection.close(); @@ -22,7 +21,12 @@ async function sendMessageToControlQueue(message) { // Simulate sending a message const message = { - scriptType: 'shodan', + scriptType: 'dnstwist', org: 'DHS' }; -sendMessageToControlQueue(message); +const queue = 'dnstwistQueue'; +sendMessageToQueue(message, queue); +sendMessageToQueue(message, queue); +sendMessageToQueue(message, queue); +sendMessageToQueue(message, queue); +sendMessageToQueue(message, queue); diff --git a/backend/src/tasks/ecs-client.ts b/backend/src/tasks/ecs-client.ts index 7b9e806e..fdc62d58 100644 --- a/backend/src/tasks/ecs-client.ts +++ b/backend/src/tasks/ecs-client.ts @@ -81,7 +81,7 @@ class ECSClient { // In order to use the host name "db" to access the database from the // crossfeed-worker image, we must launch the Docker container with // the Crossfeed backend network. - NetworkMode: 'crossfeed_backend', + NetworkMode: 'xfd_backend', Memory: 4000000000 // Limit memory to 4 GB. We do this locally to better emulate fargate memory conditions. TODO: In the future, we could read the exact memory from SCAN_SCHEMA to better emulate memory requirements for each scan. }, Env: [ diff --git a/backend/src/tasks/scanExecution.ts b/backend/src/tasks/scanExecution.ts index 8da85ad5..a90bf12b 100644 --- a/backend/src/tasks/scanExecution.ts +++ b/backend/src/tasks/scanExecution.ts @@ -3,9 +3,11 @@ import * as AWS from 'aws-sdk'; import { integer } from 'aws-sdk/clients/cloudfront'; const ecs = new AWS.ECS(); -let docker; +let docker: any; + if (process.env.IS_LOCAL) { - docker = require('dockerode'); + const Docker = require('dockerode'); + docker = new Docker(); } const toSnakeCase = (input) => input.replace(/ /g, '-'); @@ -90,7 +92,7 @@ async function startLocalContainers( // In order to use the host name "db" to access the database from the // crossfeed-worker image, we must launch the Docker container with // the Crossfeed backend network. - NetworkMode: 'crossfeed_backend', + NetworkMode: 'xfd_backend', Memory: 4000000000 // Limit memory to 4 GB. We do this locally to better emulate fargate memory conditions. TODO: In the future, we could read the exact memory from SCAN_SCHEMA to better emulate memory requirements for each scan. }, Env: [ @@ -158,28 +160,24 @@ export const handler: Handler = async (event) => { process.env.SHODAN_QUEUE_URL! ); } else if (scanType === 'dnstwist') { - desiredCount = 30; await startDesiredTasks( scanType, desiredCount, process.env.DNSTWIST_QUEUE_URL! ); } else if (scanType === 'hibp') { - desiredCount = 20; await startDesiredTasks( scanType, desiredCount, process.env.HIBP_QUEUE_URL! ); } else if (scanType === 'intelx') { - desiredCount = 10; await startDesiredTasks( scanType, desiredCount, process.env.INTELX_QUEUE_URL! ); } else if (scanType === 'cybersixgill') { - desiredCount = 10; await startDesiredTasks( scanType, desiredCount, diff --git a/backend/src/tools/consumeControlQueue.ts b/backend/src/tools/consumeControlQueue.ts deleted file mode 100644 index 87289464..00000000 --- a/backend/src/tools/consumeControlQueue.ts +++ /dev/null @@ -1,42 +0,0 @@ -// Script to setup Control Queue locally so when messages are sent to it, -// the scanExecution lambda is triggered -import { handler as scanExecution } from '../tasks/scanExecution'; -const amqp = require('amqplib'); -import * as dotenv from 'dotenv'; -import * as path from 'path'; - -async function consumeControlQueue() { - // Load the environment variables from the .env file - const envPath = path.resolve(__dirname, '../../.env'); - dotenv.config({ path: envPath }); - console.log(process.env.SHODAN_QUEUE_URL); - - // Connect to RabbitMQ - const connection = await amqp.connect('amqp://rabbitmq'); - const channel = await connection.createChannel(); - const controlQueue = 'ControlQueue'; - - await channel.assertQueue(controlQueue, { durable: true }); - - console.log('Waiting for messages from ControlQueue...'); - - channel.consume(controlQueue, (message) => { - if (message !== null) { - const payload = JSON.parse(message.content.toString()); - - // Trigger your local Lambda function here - console.log('Received message:', payload); - - // Call scanExecution with the payload from message - scanExecution( - { Records: [{ body: JSON.stringify(payload) }] }, - {} as any, - () => null - ); - - channel.ack(message); - } - }); -} - -consumeControlQueue(); diff --git a/backend/src/tools/run-scanExecution.ts b/backend/src/tools/run-scanExecution.ts new file mode 100644 index 00000000..8e0fccab --- /dev/null +++ b/backend/src/tools/run-scanExecution.ts @@ -0,0 +1,10 @@ +// Script to execute the scanExecution function +import { handler as scanExecution } from '../tasks/scanExecution'; + +async function localScanExecution() { + console.log('Starting...'); + const payload = { scanType: 'dnstwist', desiredCount: 3 }; + scanExecution(payload, {} as any, () => null); +} + +localScanExecution(); diff --git a/docs/src/documentation-pages/dev/quickstart.md b/docs/src/documentation-pages/dev/quickstart.md index c6744d18..4af374cc 100644 --- a/docs/src/documentation-pages/dev/quickstart.md +++ b/docs/src/documentation-pages/dev/quickstart.md @@ -62,22 +62,23 @@ This quickstart describes the initial setup required to run an instance of Cross npm run pesyncdb ``` -4. Start the RabbitMQ listener. This will listen for any messages sent to the queue and - trigger the scanExecution.ts function. This will stay running with this message: "Waiting for messages from ControlQueue..." +4. Send messages to RabbitMQ queue. First, edit backend/nodeMessage.js to run the desired scan and + organization. Then run below:" ```bash cd backend - npm run control-queue + npm run send-message ``` -5. Run sendMessage.js to send a sample message to the queue. Feel free to edit this file - while testing. +4. Invoke scans by running below. You can edit the backend/src/tools/run-scanExecution.ts to run the desired scan type." ```bash cd backend - node sendMessage.js + npm run scan-exec ``` +5. Observe logs in docker containers. + ### Running tests To run tests, first make sure you have already started Crossfeed with `npm start` (or, at bare minimum, that the database container is running). Then run: From b0b00f259a6457d8707a9bdc8b933f7a80d02dab Mon Sep 17 00:00:00 2001 From: aloftus23 Date: Thu, 14 Mar 2024 15:37:49 -0400 Subject: [PATCH 05/21] run docs lint --- docs/src/documentation-pages/dev/quickstart.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/documentation-pages/dev/quickstart.md b/docs/src/documentation-pages/dev/quickstart.md index 4af374cc..03335c7c 100644 --- a/docs/src/documentation-pages/dev/quickstart.md +++ b/docs/src/documentation-pages/dev/quickstart.md @@ -70,14 +70,14 @@ This quickstart describes the initial setup required to run an instance of Cross npm run send-message ``` -4. Invoke scans by running below. You can edit the backend/src/tools/run-scanExecution.ts to run the desired scan type." +5. Invoke scans by running below. You can edit the backend/src/tools/run-scanExecution.ts to run the desired scan type." ```bash cd backend npm run scan-exec ``` -5. Observe logs in docker containers. +6. Observe logs in docker containers. ### Running tests From 268c9842c5f37429eeec6be2fb9124de7a881b4a Mon Sep 17 00:00:00 2001 From: Chrtorres Date: Mon, 18 Mar 2024 10:15:28 -0400 Subject: [PATCH 06/21] Removed unused variables --- frontend/src/components/Header.tsx | 64 +++-------------------------- frontend/src/components/NavItem.tsx | 1 - 2 files changed, 5 insertions(+), 60 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 368b8a27..dab3ce9e 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -8,7 +8,6 @@ import { Drawer, ListItem, List, - TextField, useMediaQuery, useTheme } from '@mui/material'; @@ -35,10 +34,8 @@ const classes = { logo: `${PREFIX}-logo`, logoBox: `${PREFIX}-logoBox`, spacing: `${PREFIX}-spacing`, - activeLink: `${PREFIX}-activeLink`, activeMobileLink: `${PREFIX}-activeMobileLink`, link: `${PREFIX}-link`, - userLink: `${PREFIX}-userLink`, lgNav: `${PREFIX}-lgNav`, mobileNav: `${PREFIX}-mobileNav`, selectOrg: `${PREFIX}-selectOrg`, @@ -95,23 +92,6 @@ const Root = styled('div')(({ theme }) => ({ borderBottom: '2px solid transparent', fontWeight: 600 }, - - [`.${classes.userLink}`]: { - [theme.breakpoints.down('md')]: { - display: 'flex' - }, - [theme.breakpoints.up('lg')]: { - display: 'flex', - alignItems: 'center', - marginLeft: '1rem', - '& svg': { - marginRight: theme.spacing() - }, - border: 'none', - textDecoration: 'none' - } - }, - [`.${classes.lgNav}`]: { display: 'flex', [theme.breakpoints.down('sm')]: { @@ -122,38 +102,6 @@ const Root = styled('div')(({ theme }) => ({ [`.${classes.mobileNav}`]: { padding: `${theme.spacing(2)} ${theme.spacing()}px` }, - - [`.${classes.selectOrg}`]: { - border: '1px solid #FFFFFF', - borderRadius: '5px', - width: '200px', - padding: '3px', - marginLeft: '20px', - '& svg': { - color: 'white' - }, - '& input': { - color: 'white', - width: '100%' - }, - '& input:focus': { - outlineWidth: 0 - }, - '& fieldset': { - borderStyle: 'none' - }, - '& div div': { - paddingTop: '0 !important' - }, - '& div div div': { - marginTop: '-3px !important' - }, - height: '45px' - }, - - [` .${classes.option}`]: { - fontSize: 15 - } })); const GLOBAL_ADMIN = 2; @@ -190,7 +138,6 @@ const HeaderNoCtx: React.FC = (props) => { >([]); const [tags, setTags] = useState([]); const theme = useTheme(); - const isSmall = useMediaQuery(theme.breakpoints.down('md')); let userLevel = 0; if (user && user.isRegistered) { @@ -226,7 +173,7 @@ const HeaderNoCtx: React.FC = (props) => { title: 'Overview', path: '/', users: ALL_USERS, - exact: true, + exact: true }, { title: 'Inventory', @@ -247,7 +194,7 @@ const HeaderNoCtx: React.FC = (props) => { title: 'My Account', path: '#', users: ALL_USERS, - exact: false, + exact: false }, { title: 'Manage Organizations', @@ -283,9 +230,9 @@ const HeaderNoCtx: React.FC = (props) => { return ( -
    + {/*
    */} - + = (props) => { />
    {desktopNavItems.slice()}
    -
    {userLevel > 0 && ( @@ -322,7 +268,7 @@ const HeaderNoCtx: React.FC = (props) => { )} -
    + {/*
    */} ({ [`& .${classesNav.userLink}`]: { display: 'flex', alignItems: 'center', - '& svg': { marginRight: theme.spacing() } From dd36b9cc68d80fccef51761b603af5f1aa0d0f44 Mon Sep 17 00:00:00 2001 From: Chrtorres Date: Mon, 18 Mar 2024 10:17:00 -0400 Subject: [PATCH 07/21] Removed Spacing errors --- frontend/src/components/Header.tsx | 74 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index dab3ce9e..b7ca7a9d 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -101,7 +101,7 @@ const Root = styled('div')(({ theme }) => ({ [`.${classes.mobileNav}`]: { padding: `${theme.spacing(2)} ${theme.spacing()}px` - }, + } })); const GLOBAL_ADMIN = 2; @@ -231,43 +231,43 @@ const HeaderNoCtx: React.FC = (props) => { {/*
    */} - - - Crossfeed Icon Navigate Home - -
    {desktopNavItems.slice()}
    -
    + + + Crossfeed Icon Navigate Home + +
    {desktopNavItems.slice()}
    +
    - {userLevel > 0 && ( - <> - { - if (location.pathname !== '/inventory') - history.push('/inventory?q=' + value); - setSearchTerm(value, { - shouldClearFilters: false, - autocompleteResults: false - }); - }} - /> - setNavOpen((open) => !open)} - > - - - - )} - + {userLevel > 0 && ( + <> + { + if (location.pathname !== '/inventory') + history.push('/inventory?q=' + value); + setSearchTerm(value, { + shouldClearFilters: false, + autocompleteResults: false + }); + }} + /> + setNavOpen((open) => !open)} + > + + + + )} + {/*
    */} Date: Mon, 18 Mar 2024 12:20:24 -0400 Subject: [PATCH 08/21] Corrected unused variables and removed filter org logic --- frontend/src/components/Header.tsx | 78 +++++++++++++++--------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index b7ca7a9d..b66fa6dd 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -101,7 +101,7 @@ const Root = styled('div')(({ theme }) => ({ [`.${classes.mobileNav}`]: { padding: `${theme.spacing(2)} ${theme.spacing()}px` - } + }, })); const GLOBAL_ADMIN = 2; @@ -230,45 +230,45 @@ const HeaderNoCtx: React.FC = (props) => { return ( - {/*
    */} - - - Crossfeed Icon Navigate Home - -
    {desktopNavItems.slice()}
    -
    - - {userLevel > 0 && ( - <> - { - if (location.pathname !== '/inventory') - history.push('/inventory?q=' + value); - setSearchTerm(value, { - shouldClearFilters: false, - autocompleteResults: false - }); - }} +
    + + + Crossfeed Icon Navigate Home - setNavOpen((open) => !open)} - > - - - - )} - - {/*
    */} + +
    {desktopNavItems.slice()}
    +
    + + {userLevel > 0 && ( + <> + { + if (location.pathname !== '/inventory') + history.push('/inventory?q=' + value); + setSearchTerm(value, { + shouldClearFilters: false, + autocompleteResults: false + }); + }} + /> + setNavOpen((open) => !open)} + > + + + + )} + +
    Date: Tue, 19 Mar 2024 10:50:34 -0400 Subject: [PATCH 09/21] Corrected lint issues: Unused Varibales --- frontend/src/components/Header.tsx | 55 +++--------------------------- 1 file changed, 5 insertions(+), 50 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index b66fa6dd..37c34637 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, useState } from 'react'; +import React, { useState } from 'react'; import { styled } from '@mui/material/styles'; import { NavLink, Link, useHistory, useLocation } from 'react-router-dom'; import { @@ -7,24 +7,15 @@ import { IconButton, Drawer, ListItem, - List, - useMediaQuery, - useTheme + List } from '@mui/material'; -import { - Menu as MenuIcon, - AccountCircle as UserIcon, - ArrowDropDown -} from '@mui/icons-material'; +import { Menu as MenuIcon } from '@mui/icons-material'; import { NavItem } from './NavItem'; -import { useRouteMatch } from 'react-router-dom'; import { useAuthContext } from 'context'; import logo from '../assets/crossfeed.svg'; import { withSearch } from '@elastic/react-search-ui'; import { ContextType } from 'context/SearchProvider'; import { SearchBar } from 'components'; -import { Autocomplete } from '@mui/material'; -import { Organization, OrganizationTag } from 'types'; const PREFIX = 'Header'; @@ -32,13 +23,11 @@ const classes = { inner: `${PREFIX}-inner`, menuButton: `${PREFIX}-menuButton`, logo: `${PREFIX}-logo`, - logoBox: `${PREFIX}-logoBox`, spacing: `${PREFIX}-spacing`, activeMobileLink: `${PREFIX}-activeMobileLink`, link: `${PREFIX}-link`, lgNav: `${PREFIX}-lgNav`, mobileNav: `${PREFIX}-mobileNav`, - selectOrg: `${PREFIX}-selectOrg`, option: `${PREFIX}-option` }; @@ -101,7 +90,7 @@ const Root = styled('div')(({ theme }) => ({ [`.${classes.mobileNav}`]: { padding: `${theme.spacing(2)} ${theme.spacing()}px` - }, + } })); const GLOBAL_ADMIN = 2; @@ -122,22 +111,8 @@ const HeaderNoCtx: React.FC = (props) => { const history = useHistory(); const location = useLocation(); - const { - currentOrganization, - setOrganization, - showAllOrganizations, - setShowAllOrganizations, - setShowMaps, - user, - logout, - apiGet - } = useAuthContext(); + const { user, logout } = useAuthContext(); const [navOpen, setNavOpen] = useState(false); - const [organizations, setOrganizations] = useState< - (Organization | OrganizationTag)[] - >([]); - const [tags, setTags] = useState([]); - const theme = useTheme(); let userLevel = 0; if (user && user.isRegistered) { @@ -148,26 +123,6 @@ const HeaderNoCtx: React.FC = (props) => { } } - const fetchOrganizations = useCallback(async () => { - try { - const rows = await apiGet('/v2/organizations/'); - let tags: (OrganizationTag | Organization)[] = []; - if (userLevel === GLOBAL_ADMIN) { - tags = await apiGet('/organizations/tags'); - await setTags(tags as OrganizationTag[]); - } - await setOrganizations(tags.concat(rows)); - } catch (e) { - console.log(e); - } - }, [apiGet, setOrganizations, userLevel]); - - React.useEffect(() => { - if (userLevel > 0) { - fetchOrganizations(); - } - }, [fetchOrganizations, userLevel]); - const navItems: NavItemType[] = [ { title: 'Overview', From aa589664094cc044d615f90470e870ccf384ffb9 Mon Sep 17 00:00:00 2001 From: Chrtorres Date: Tue, 19 Mar 2024 14:43:47 -0400 Subject: [PATCH 10/21] Updated header tests/snapshots to reflect removed Nav items --- .../__snapshots__/header.spec.tsx.snap | 44 ++-------------- .../src/components/__tests__/header.spec.tsx | 50 +++---------------- 2 files changed, 11 insertions(+), 83 deletions(-) diff --git a/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap b/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap index 83e5f878..a09bf2bf 100644 --- a/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap +++ b/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap @@ -3,7 +3,7 @@ exports[`Header component matches snapshot 1`] = `
    -
    - -
    - - My Account - -
    -     -
    +
    + + My Account + +
    + +
    diff --git a/frontend/src/components/__tests__/header.spec.tsx b/frontend/src/components/__tests__/header.spec.tsx index 659723d6..d9493ac5 100644 --- a/frontend/src/components/__tests__/header.spec.tsx +++ b/frontend/src/components/__tests__/header.spec.tsx @@ -14,13 +14,8 @@ describe('Header component', () => { }); it('can expand drawer', async () => { - const { getByLabelText, getByTestId, queryByTestId } = render(
    ); + const { queryByTestId } = render(
    ); expect(queryByTestId('mobilenav')).not.toBeInTheDocument(); - expect(getByLabelText('toggle mobile menu')).toBeInTheDocument(); - fireEvent.click(getByLabelText('toggle mobile menu')); - await waitFor(() => { - expect(getByTestId('mobilenav')).toBeInTheDocument(); - }); }); it('shows no links for unauthenticated user', () => { From 0d97302e49c0a87aa0b2cc17406ccac4c0628e90 Mon Sep 17 00:00:00 2001 From: aloftus23 Date: Wed, 27 Mar 2024 08:36:14 -0400 Subject: [PATCH 15/21] remove author and license from package.json --- backend/package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/package.json b/backend/package.json index c6dc8bf4..37e27223 100644 --- a/backend/package.json +++ b/backend/package.json @@ -118,7 +118,5 @@ "test": "jest --detectOpenHandles", "test-python": "pytest" }, - "version": "1.0.0", - "author": "", - "license": "ISC" + "version": "1.0.0" } \ No newline at end of file From f1ad4f97302736f8e6ecb2cfbd2275c8118d45c0 Mon Sep 17 00:00:00 2001 From: aloftus23 Date: Wed, 27 Mar 2024 10:00:12 -0400 Subject: [PATCH 16/21] Add magic number comment --- backend/src/tasks/functions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/tasks/functions.yml b/backend/src/tasks/functions.yml index 122d0b38..712a9e3c 100644 --- a/backend/src/tasks/functions.yml +++ b/backend/src/tasks/functions.yml @@ -41,7 +41,7 @@ checkUserExpiration: - schedule: cron(0 0 * * ? *) # Runs every day at midnight scanExecution: - timeout: 900 + timeout: 900 # 15 minutes handler: src/tasks/scanExecution.handler memorySize: 4096 From 83bbe6cb8a3264a90685e23a3c8634cf5135e647 Mon Sep 17 00:00:00 2001 From: aloftus23 Date: Wed, 27 Mar 2024 10:30:33 -0400 Subject: [PATCH 17/21] fix lint --- backend/package.json | 2 +- backend/src/tasks/functions.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/package.json b/backend/package.json index 37e27223..bc563f50 100644 --- a/backend/package.json +++ b/backend/package.json @@ -119,4 +119,4 @@ "test-python": "pytest" }, "version": "1.0.0" -} \ No newline at end of file +} diff --git a/backend/src/tasks/functions.yml b/backend/src/tasks/functions.yml index 712a9e3c..bd5ee23b 100644 --- a/backend/src/tasks/functions.yml +++ b/backend/src/tasks/functions.yml @@ -41,7 +41,7 @@ checkUserExpiration: - schedule: cron(0 0 * * ? *) # Runs every day at midnight scanExecution: - timeout: 900 # 15 minutes + timeout: 900 # 15 minutes handler: src/tasks/scanExecution.handler memorySize: 4096 From 2bacc0d6ac26d9d9715eaef99e8181b7d2246bd6 Mon Sep 17 00:00:00 2001 From: Amelia Vance Date: Wed, 27 Mar 2024 11:29:07 -0400 Subject: [PATCH 18/21] Update user type permission views in Header.tsx --- frontend/src/components/Header.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 767b4df6..ace0f480 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -184,9 +184,12 @@ const HeaderNoCtx: React.FC = (props) => { let userLevel = 0; if (user && user.isRegistered) { - if (user.userType === 'standard' || user.userType === 'globalView') { + if (user.userType === 'standard') { userLevel = STANDARD_USER; - } else if (user.userType === 'globalAdmin') { + } else if ( + user.userType === 'globalAdmin' || + user.userType === 'globalView' + ) { userLevel = GLOBAL_ADMIN; } else if (user.userType === 'regionalAdmin') { userLevel = REGIONAL_ADMIN; From e3c126168d8bfb3fed86f5f790d270e16a9c02c6 Mon Sep 17 00:00:00 2001 From: Amelia Vance Date: Wed, 27 Mar 2024 11:29:46 -0400 Subject: [PATCH 19/21] Update user type permission views in Users.tsx --- frontend/src/pages/Users/Users.tsx | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/frontend/src/pages/Users/Users.tsx b/frontend/src/pages/Users/Users.tsx index f9ce36bd..a6140e28 100644 --- a/frontend/src/pages/Users/Users.tsx +++ b/frontend/src/pages/Users/Users.tsx @@ -92,21 +92,28 @@ export const Users: React.FC = () => { const fetchUsers = useCallback(async () => { try { const rows = await apiGet(`/users/`); - rows.forEach((obj) => { - obj.lastLoggedInString = obj.lastLoggedIn - ? `${formatDistanceToNow(parseISO(obj.lastLoggedIn))} ago` + rows.forEach((row) => { + row.lastLoggedInString = row.lastLoggedIn + ? `${formatDistanceToNow(parseISO(row.lastLoggedIn))} ago` : 'None'; - obj.dateToUSigned = obj.dateAcceptedTerms - ? `${formatDistanceToNow(parseISO(obj.dateAcceptedTerms))} ago` + row.dateToUSigned = row.dateAcceptedTerms + ? `${formatDistanceToNow(parseISO(row.dateAcceptedTerms))} ago` : 'None'; - obj.orgs = obj.roles - ? obj.roles + row.orgs = row.roles + ? row.roles .filter((role) => role.approved) .map((role) => role.organization.name) .join(', ') : 'None'; }); - setUsers(rows); + if (user?.userType === 'globalAdmin') { + setUsers(rows); + } else if (user?.userType === 'regionalAdmin' && user?.regionId) { + rows.filter((row) => row.regionId === user.regionId); + setUsers(rows); + } else if (user) { + setUsers([user]); + } setErrorStates({ ...errorStates, getUsersError: '' }); } catch (e: any) { setErrorStates({ ...errorStates, getUsersError: e.message }); From 65e3e86b4c3abad7debce0e90c5df8fb8160a9f6 Mon Sep 17 00:00:00 2001 From: Amelia Vance Date: Wed, 27 Mar 2024 11:30:29 -0400 Subject: [PATCH 20/21] Update alert message in OrganizationList.tsx --- frontend/src/components/OrganizationList/OrganizationList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/OrganizationList/OrganizationList.tsx b/frontend/src/components/OrganizationList/OrganizationList.tsx index eb1b4601..5639cc40 100644 --- a/frontend/src/components/OrganizationList/OrganizationList.tsx +++ b/frontend/src/components/OrganizationList/OrganizationList.tsx @@ -105,7 +105,7 @@ export const OrganizationList: React.FC<{ {organizations?.length === 0 ? ( - No organizations found. + Unable to load organizations. ) : ( Date: Wed, 27 Mar 2024 13:12:21 -0400 Subject: [PATCH 21/21] Remove unused imports and variables from header.spec.tsx --- frontend/src/components/__tests__/header.spec.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/__tests__/header.spec.tsx b/frontend/src/components/__tests__/header.spec.tsx index d9493ac5..7b1189d8 100644 --- a/frontend/src/components/__tests__/header.spec.tsx +++ b/frontend/src/components/__tests__/header.spec.tsx @@ -1,7 +1,6 @@ import React from 'react'; -import { render, fireEvent, testUser, testOrganization } from 'test-utils'; +import { render, testUser, testOrganization } from 'test-utils'; import { Header } from '../Header'; -import { waitFor } from '@testing-library/react'; jest.mock('@elastic/react-search-ui', () => ({ withSearch: () => (comp: any) => comp @@ -46,7 +45,7 @@ describe('Header component', () => { }); it('shows correct links for ORG_ADMIN', () => { - const { getByText, queryByText } = render(
    , { + const { getByText } = render(
    , { authContext: { user: { ...testUser, userType: 'standard', isRegistered: true }, currentOrganization: { ...testOrganization }