Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1f02610
commence with epic and add some comments for plan-of-clam-scan..
Feb 6, 2026
4ec0180
flesh out clamav handling, new md document in service dir under docs-…
Feb 7, 2026
6ad56ef
updating the logging for controller and clamav files..
Feb 9, 2026
ad7d172
stable pix clamav server association has been made, files are being s…
Feb 9, 2026
034fd5d
code clean-up for 1752 wiring up clamav-pix server and testing both g…
Feb 9, 2026
73d5605
fixing the front-end to show images after clamav save...
Feb 11, 2026
8d8b4ac
add guard to keep session open after bad-virus-type file is attached,…
Feb 11, 2026
7cac693
more code clean-up..
Feb 11, 2026
d176986
updating multi-file checking for clean and virulent files, and gracef…
Feb 18, 2026
ab1b21c
prevent mage from crashing-stopping when a virulent bad file is uploa…
Feb 18, 2026
ceb996b
create clam-av-url variable for docker compose yml file, and filter i…
Mar 3, 2026
ab2f83c
create clam-av-url variable for docker compose yml file, and filter i…
Mar 3, 2026
a16ed1c
Update new branch with all attachemnt work... Merge branch 'attach-sc…
Mar 3, 2026
82bd7e9
add partial pushes and consoles for both clean and dirty uploads, bac…
Mar 5, 2026
a15d4e4
integrate pre-scan clamav for png, txt, and eicar files..
Mar 5, 2026
28f7606
add multi-file ClamAV scanning with proper virus detection and storage..
Mar 5, 2026
9fde736
try to address upload hangs until refresh..
Mar 9, 2026
9a21382
corrected backend messaging and added filestream-resume func to web-ts..
Mar 10, 2026
c34e7bc
remove dead-wood imports and test multiple files both clean and dirty…
Mar 10, 2026
a5cdf62
code clean up and log removals..
Mar 10, 2026
14ce234
POC: attachment upload with toast alerts and console logs for testing..
Mar 17, 2026
ea43271
had to debug processing, things were hanging and status was causing i…
Mar 18, 2026
b39cfe4
Updated docker-compose.yml and package-lock.json..
Mar 18, 2026
ec6d165
using docker-kube to point to for clamav..
Mar 19, 2026
74da2fb
catching back up with env and messaging..
Mar 19, 2026
930caf9
adding new alerts before we get to toasters..
Mar 19, 2026
374b143
got the rejection alert to show when needed, still lots more to do, b…
Mar 20, 2026
ee8a058
getting single and multi file toasts to show up correctly, more fine-…
Mar 20, 2026
e874d2d
further dev work on toasts, placement and sizing...
Mar 20, 2026
b88a899
after rebuild-all several upadates to package files occurred..
Mar 22, 2026
5a84fe9
alter warning message and remove clamav mention..
Mar 23, 2026
c9616de
getting both toasters to render in an offset manner for readablility..
Mar 23, 2026
9269ef4
got basic messages working and looking ok and postioned ok and handli…
Mar 23, 2026
594c1aa
adding back in 3 attempts loop for graceful edge case avoidance..
Mar 26, 2026
5710519
fixing reject file removal after save-refresh issue, very involved, b…
Mar 27, 2026
5c7913a
fixing up tests and build for upcoming pr..
Mar 30, 2026
378e38e
Merge branch 'develop' into predisk-scanning-1756
S-S-T Mar 30, 2026
fbd2c9d
add sftp web package-lock.json
Mar 30, 2026
33c94d2
fix ObservationEditAttachmentComponent test missing HttpClient provider
Mar 30, 2026
e9c3f9a
fix admin ObservationEditAttachmentComponent test missing HttpClient
Mar 30, 2026
fdb6e7f
code and file cleanup..
Mar 31, 2026
faf9d2d
code clean up final before pr begins..
Mar 31, 2026
30b0e03
Merge branch 'predisk-scanning-1756' into 1874-failed-attch-ios-trail
Apr 8, 2026
061496c
Add ClamAV rejection placeholder and update attachment response struc…
Apr 8, 2026
7813afe
adding a conditional for local verses test-mage space instances re pa…
Apr 9, 2026
f433d9d
adding test-mage changes to allow testing in test space..
Apr 14, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
"sourceMaps": true
},
{
"name": "Attach to MAGE Service",
"type": "node",
"request": "attach",
"name": "Attach to MAGE Service",
"port": 9229, // For Node.js inspect
"port": 9229,
"restart": true,
"skipFiles": [
"<node_internals>/**"
],
"cwd": "${workspaceFolder}/service"
},
{
"name": "mage server instance",
"name": "Debug MAGE Backend",
"type": "node",
"request": "launch",
"runtimeExecutable": "npm",
Expand All @@ -44,7 +44,6 @@
},
"cwd": "${workspaceFolder}/instance",
"console": "integratedTerminal",
"preLaunchTask": "service:build",
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/service/lib/**/*.js",
Expand All @@ -57,18 +56,18 @@
{
"name": "Debug Backend + WebApp",
"configurations": [
"Attach to MAGE Service",
"Debug MAGE Backend",
"Launch WebApp"
Comment thread
S-S-T marked this conversation as resolved.
],
"stopAll": true
},
{
"name": "Debug Backend + AdminApp",
"configurations": [
"Attach to MAGE Service",
"Debug MAGE Backend",
"Launch AdminApp"
],
"stopAll": true
}
]
}
}
46 changes: 14 additions & 32 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,56 +1,38 @@
version: "3"
services:

mage-db:
image: bitnami/mongodb:6.0.13
image: mongo:6.0.4
container_name: mage-db
ports:
- 27017:27017
volumes:
- ./database/data:/bitnami/mongodb
- ./database/log:/opt/bitnami/mongodb/logs
# Uncomment the following ports block to allow the mongo client on your
# host machine to connect to MongoDB in the Docker container.
# ports:
# - 27017:27017
Comment thread
S-S-T marked this conversation as resolved.
- ./database/data:/data/db
- ./database/log:/data/log
networks:
- mage.net
restart: unless-stopped

mage-server:
depends_on: [ mage-db ]
build:
context: ./
# dockerfile: Dockerfile-debug
image: mage:local
# entrypoint: ["./node_modules/.bin/mage.service", "--plugin", "@ngageoint/mage.image.service"] Uncomment to specify new entrypoint commands
platform: linux/amd64
volumes:
- ./server/resources:/var/lib/mage
# Comment the ports block to disallow connections directly to the node
# server when running the mage-web-proxy below.
- ./web-app/dist:/home/mage/instance/node_modules/@ngageoint/web-app/dist
ports:
- 4242:4242
# Uncomment to allow debuggers to attach the Node process inside the
# container on port 14242
# - 14242:14242
networks:
- mage.net
environment:
MAGE_MONGO_URL: mongodb://mage-db:27017/magedb
MAGE_MONGO_URL: MAGE_MONGO_URL=mongodb://127.0.0.1:27017/magedb
# MAGE_MONGO_URL: mongodb://mage-db:27017/magedb
MAGE_TOKEN_EXPIRATION: "28800"
# NOTE: default INSECURE salt value, recommend generate new UUID before deployment, **NOT** after deployment
SFTP_PLUGIN_CONFIG_SALT: "A0E6D3B4-25BD-4DD6-BBC9-B367931966AB"

# Uncomment the following block to enable the TLS reverse proxy. You will
# also need to generate the key and certificate as the README describes.
# mage-web-proxy:
# image: nginx
# volumes:
# - ./web/nginx.conf:/etc/nginx/nginx.conf
# - ./web/mage-web.crt:/etc/nginx/ssl/web.crt
# - ./web/mage-web.key:/etc/nginx/ssl/web.key
# ports:
# - 4280:80
# - 4243:4243
# networks:
# - mage.net
Comment thread
S-S-T marked this conversation as resolved.
CLAM_AV_URL: tcp://host.docker.internal:3310 # Mac host connection for ClamAV
restart: unless-stopped

networks:
mage.net:
driver: bridge
driver: bridge
15 changes: 8 additions & 7 deletions instance/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@
},
"homepage": "https://github.com/ngageoint/mage-server",
"dependencies": {
"@ngageoint/mage.arcgis.service": "../plugins/arcgis/service",
"@ngageoint/mage.arcgis.web-app": "../plugins/arcgis/web-app/dist/main",
"@ngageoint/mage.sftp.web": "../plugins/sftp/web/dist/main",
"@ngageoint/mage.sftp.service": "../plugins/sftp/service",
"@ngageoint/mage.nga-msi": "../plugins/nga-msi",
"@ngageoint/mage.arcgis.service": "file:../plugins/arcgis/service",
"@ngageoint/mage.arcgis.web-app": "file:../plugins/arcgis/web-app/dist/main",
"@ngageoint/mage.nga-msi": "file:../plugins/nga-msi",
"@ngageoint/mage.service": "../service",
"@ngageoint/mage.web-app": "../web-app/dist"
"@ngageoint/mage.sftp.service": "file:../plugins/sftp/service",
"@ngageoint/mage.sftp.web": "file:../plugins/sftp/web/dist/main",
Comment on lines -27 to +32
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change these, is it related to the actual work?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were pulled in automatically during a rebuild on preceding branch 1756, not an intentional dependency addition. The key commit is b88a899f

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, so npm install or something changed this to use file:?

Why doesn't this "../web-app/dist" get the same treatment? Does it break something in the build/install?

    "@ngageoint/mage.sftp.web": "file:../plugins/sftp/web/dist/main", 
    "@ngageoint/mage.web-app": "../web-app/dist",

"@ngageoint/mage.web-app": "../web-app/dist",
"better-sqlite3": "^11.10.0"
}
}
}
Loading
Loading