feat: non-blocking bulk-add, CORS hardening, credential preset access control (#31)
* devices: hide discovered neighbors that are already managed Discovered Devices showed every unresolved MikroTik neighbor, even when the neighbor was obviously the same device a managed node is reporting through a different link / MAC / alias. Since we already know every managed device interface MAC, primary IP, and system identity, we can flag those rows. - /api/devices/discovered now annotates each row with duplicate_of_device_id and duplicate_of_device_name when the neighbor matches a managed device by interface MAC, primary IP, or system identity. - Add a Hide duplicates of managed devices toggle (default on) above the table, with a count of how many matches were found. When enabled, the list hides matched rows; when disabled, matches stay visible but are dimmed and tagged Already managed so the origin is clear. - Suppress the Add to Manager action for rows that are already a managed device, since adding them would create a second record for the same hardware. Co-authored-by: Denis <denis-ev@users.noreply.github.com> * devices: safer duplicate handling, try-all safeguards, and timezone/firmware fixes Co-authored-by: Denis <denis-ev@users.noreply.github.com> * Non-blocking follow-ups: parsePort util, tests, bulk-add queue, preset rate limit Co-authored-by: Denis <denis-ev@users.noreply.github.com> * fix(security): tighten CORS, Redis rate limits, and preset access controls Require explicit CORS origins in production, align Socket.IO CORS with HTTP, default Docker Compose to local HTTPS origins, and remove the in-memory mutation limiter in favor of Redis. Also add operator-use flags for credential presets in the UI and harden bulk-add job access and client error messages. Co-authored-by: Denis <denis-ev@users.noreply.github.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com>
This commit is contained in:
Denis
Cursor Agent
Generated
+286
@@ -39,10 +39,12 @@
|
||||
"@types/nodemailer": "^6.4.14",
|
||||
"@types/pg": "^8.10.9",
|
||||
"@types/ssh2": "^1.11.17",
|
||||
"@types/supertest": "^7.2.0",
|
||||
"eslint": "^9.39.4",
|
||||
"eslint-plugin-security": "^4.0.0",
|
||||
"jest": "^29.7.0",
|
||||
"nodemon": "^3.0.2",
|
||||
"supertest": "^7.2.2",
|
||||
"ts-jest": "^29.4.9",
|
||||
"ts-node": "^10.9.2",
|
||||
"typescript": "^5.3.3",
|
||||
@@ -1551,6 +1553,29 @@
|
||||
"win32"
|
||||
]
|
||||
},
|
||||
"node_modules/@noble/hashes": {
|
||||
"version": "1.8.0",
|
||||
"resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
|
||||
"integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": "^14.21.3 || >=16"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://paulmillr.com/funding/"
|
||||
}
|
||||
},
|
||||
"node_modules/@paralleldrive/cuid2": {
|
||||
"version": "2.3.1",
|
||||
"resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.3.1.tgz",
|
||||
"integrity": "sha512-XO7cAxhnTZl0Yggq6jOgjiOHhbgcO4NqFqwSmQpjK3b6TEE6Uj/jfSk6wzYyemh3+I0sHirKSetjQwn5cZktFw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@noble/hashes": "^1.1.5"
|
||||
}
|
||||
},
|
||||
"node_modules/@sinclair/typebox": {
|
||||
"version": "0.27.10",
|
||||
"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.10.tgz",
|
||||
@@ -1696,6 +1721,13 @@
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/cookiejar": {
|
||||
"version": "2.1.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.5.tgz",
|
||||
"integrity": "sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/cors": {
|
||||
"version": "2.8.19",
|
||||
"resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz",
|
||||
@@ -1811,6 +1843,13 @@
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/methods": {
|
||||
"version": "1.1.4",
|
||||
"resolved": "https://registry.npmjs.org/@types/methods/-/methods-1.1.4.tgz",
|
||||
"integrity": "sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/mime": {
|
||||
"version": "1.3.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
|
||||
@@ -1947,6 +1986,30 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/superagent": {
|
||||
"version": "8.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-8.1.9.tgz",
|
||||
"integrity": "sha512-pTVjI73witn+9ILmoJdajHGW2jkSaOzhiFYF1Rd3EQ94kymLqB9PjD9ISg7WaALC7+dCHT0FGe9T2LktLq/3GQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/cookiejar": "^2.1.5",
|
||||
"@types/methods": "^1.1.4",
|
||||
"@types/node": "*",
|
||||
"form-data": "^4.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/supertest": {
|
||||
"version": "7.2.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/supertest/-/supertest-7.2.0.tgz",
|
||||
"integrity": "sha512-uh2Lv57xvggst6lCqNdFAmDSvoMG7M/HDtX4iUCquxQ5EGPtaPM5PL5Hmi7LCvOG8db7YaCPNJEeoI8s/WzIQw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/methods": "^1.1.4",
|
||||
"@types/superagent": "^8.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/ws": {
|
||||
"version": "8.18.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
|
||||
@@ -2454,6 +2517,13 @@
|
||||
"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/asap": {
|
||||
"version": "2.0.6",
|
||||
"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
|
||||
"integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/asn1": {
|
||||
"version": "0.2.6",
|
||||
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
|
||||
@@ -2463,6 +2533,13 @@
|
||||
"safer-buffer": "~2.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/asynckit": {
|
||||
"version": "0.4.0",
|
||||
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
|
||||
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/babel-jest": {
|
||||
"version": "29.7.0",
|
||||
"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
|
||||
@@ -3063,6 +3140,29 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/combined-stream": {
|
||||
"version": "1.0.8",
|
||||
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
|
||||
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"delayed-stream": "~1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.8"
|
||||
}
|
||||
},
|
||||
"node_modules/component-emitter": {
|
||||
"version": "1.3.1",
|
||||
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
|
||||
"integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/compressible": {
|
||||
"version": "2.0.18",
|
||||
"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
|
||||
@@ -3143,6 +3243,13 @@
|
||||
"integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cookiejar": {
|
||||
"version": "2.1.4",
|
||||
"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
|
||||
"integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cors": {
|
||||
"version": "2.8.6",
|
||||
"resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz",
|
||||
@@ -3271,6 +3378,16 @@
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/delayed-stream": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
|
||||
"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/denque": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
|
||||
@@ -3319,6 +3436,17 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/dezalgo": {
|
||||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
|
||||
"integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"asap": "^2.0.0",
|
||||
"wrappy": "1"
|
||||
}
|
||||
},
|
||||
"node_modules/diff": {
|
||||
"version": "4.0.4",
|
||||
"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz",
|
||||
@@ -3509,6 +3637,22 @@
|
||||
"node": ">= 0.4"
|
||||
}
|
||||
},
|
||||
"node_modules/es-set-tostringtag": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
|
||||
"integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"es-errors": "^1.3.0",
|
||||
"get-intrinsic": "^1.2.6",
|
||||
"has-tostringtag": "^1.0.2",
|
||||
"hasown": "^2.0.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.4"
|
||||
}
|
||||
},
|
||||
"node_modules/escalade": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
|
||||
@@ -3939,6 +4083,13 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/fast-safe-stringify": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
|
||||
"integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/fb-watchman": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
|
||||
@@ -4031,6 +4182,41 @@
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/form-data": {
|
||||
"version": "4.0.5",
|
||||
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
|
||||
"integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"asynckit": "^0.4.0",
|
||||
"combined-stream": "^1.0.8",
|
||||
"es-set-tostringtag": "^2.1.0",
|
||||
"hasown": "^2.0.2",
|
||||
"mime-types": "^2.1.12"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 6"
|
||||
}
|
||||
},
|
||||
"node_modules/formidable": {
|
||||
"version": "3.5.4",
|
||||
"resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz",
|
||||
"integrity": "sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@paralleldrive/cuid2": "^2.2.2",
|
||||
"dezalgo": "^1.0.4",
|
||||
"once": "^1.4.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://ko-fi.com/tunnckoCore/commissions"
|
||||
}
|
||||
},
|
||||
"node_modules/forwarded": {
|
||||
"version": "0.2.0",
|
||||
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
|
||||
@@ -4302,6 +4488,22 @@
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/has-tostringtag": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
|
||||
"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"has-symbols": "^1.0.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.4"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/hasown": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
|
||||
@@ -7203,6 +7405,90 @@
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/superagent": {
|
||||
"version": "10.3.0",
|
||||
"resolved": "https://registry.npmjs.org/superagent/-/superagent-10.3.0.tgz",
|
||||
"integrity": "sha512-B+4Ik7ROgVKrQsXTV0Jwp2u+PXYLSlqtDAhYnkkD+zn3yg8s/zjA2MeGayPoY/KICrbitwneDHrjSotxKL+0XQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"component-emitter": "^1.3.1",
|
||||
"cookiejar": "^2.1.4",
|
||||
"debug": "^4.3.7",
|
||||
"fast-safe-stringify": "^2.1.1",
|
||||
"form-data": "^4.0.5",
|
||||
"formidable": "^3.5.4",
|
||||
"methods": "^1.1.2",
|
||||
"mime": "2.6.0",
|
||||
"qs": "^6.14.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.18.0"
|
||||
}
|
||||
},
|
||||
"node_modules/superagent/node_modules/debug": {
|
||||
"version": "4.4.3",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
|
||||
"integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ms": "^2.1.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=6.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"supports-color": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/superagent/node_modules/mime": {
|
||||
"version": "2.6.0",
|
||||
"resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
|
||||
"integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"mime": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/superagent/node_modules/ms": {
|
||||
"version": "2.1.3",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
||||
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/supertest": {
|
||||
"version": "7.2.2",
|
||||
"resolved": "https://registry.npmjs.org/supertest/-/supertest-7.2.2.tgz",
|
||||
"integrity": "sha512-oK8WG9diS3DlhdUkcFn4tkNIiIbBx9lI2ClF8K+b2/m8Eyv47LSawxUzZQSNKUrVb2KsqeTDCcjAAVPYaSLVTA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"cookie-signature": "^1.2.2",
|
||||
"methods": "^1.1.2",
|
||||
"superagent": "^10.3.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.18.0"
|
||||
}
|
||||
},
|
||||
"node_modules/supertest/node_modules/cookie-signature": {
|
||||
"version": "1.2.2",
|
||||
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
|
||||
"integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=6.6.0"
|
||||
}
|
||||
},
|
||||
"node_modules/supports-color": {
|
||||
"version": "5.5.0",
|
||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
|
||||
|
||||
@@ -44,10 +44,12 @@
|
||||
"@types/nodemailer": "^6.4.14",
|
||||
"@types/pg": "^8.10.9",
|
||||
"@types/ssh2": "^1.11.17",
|
||||
"@types/supertest": "^7.2.0",
|
||||
"eslint": "^9.39.4",
|
||||
"eslint-plugin-security": "^4.0.0",
|
||||
"jest": "^29.7.0",
|
||||
"nodemon": "^3.0.2",
|
||||
"supertest": "^7.2.2",
|
||||
"ts-jest": "^29.4.9",
|
||||
"ts-node": "^10.9.2",
|
||||
"typescript": "^5.3.3",
|
||||
|
||||
@@ -287,6 +287,7 @@ CREATE TABLE IF NOT EXISTS credential_presets (
|
||||
created_at TIMESTAMPTZ DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ DEFAULT NOW()
|
||||
);
|
||||
ALTER TABLE credential_presets ADD COLUMN IF NOT EXISTS allow_operator_use BOOLEAN NOT NULL DEFAULT TRUE;
|
||||
|
||||
-- Wireless security profiles (WPA/WPA2/WPA3 config)
|
||||
CREATE TABLE IF NOT EXISTS wireless_security_profiles (
|
||||
|
||||
+11
-2
@@ -18,8 +18,14 @@ import { redis } from './config/redis';
|
||||
import { runMigrations } from './db/migrate';
|
||||
import { errorHandler } from './middleware/errorHandler';
|
||||
import { PollerService } from './services/PollerService';
|
||||
import {
|
||||
setBulkAddPollerService,
|
||||
startBulkAddWorker,
|
||||
stopBulkAddWorker,
|
||||
} from './services/DeviceBulkAddWorker';
|
||||
import { verifyToken } from './middleware/auth';
|
||||
import { decrypt } from './utils/crypto';
|
||||
import { corsMiddlewareOptions, socketIoCorsOptions } from './utils/corsOrigins';
|
||||
|
||||
import authRoutes from './routes/auth';
|
||||
import devicesRoutes, { setPollerService as setDevicesPoller } from './routes/devices';
|
||||
@@ -44,7 +50,7 @@ const PORT = parseInt(process.env.PORT || '3001', 10);
|
||||
|
||||
// ─── Socket.io ────────────────────────────────────────────────────────────────
|
||||
const io = new SocketServer(httpServer, {
|
||||
cors: { origin: '*', methods: ['GET', 'POST'] },
|
||||
cors: socketIoCorsOptions(),
|
||||
path: '/socket.io',
|
||||
});
|
||||
|
||||
@@ -168,7 +174,7 @@ terminalNs.on('connection', (socket) => {
|
||||
|
||||
// ─── Middleware ───────────────────────────────────────────────────────────────
|
||||
app.use(helmet({ contentSecurityPolicy: false }));
|
||||
app.use(cors({ origin: '*', credentials: true }));
|
||||
app.use(cors(corsMiddlewareOptions()));
|
||||
app.use(compression());
|
||||
app.use(express.json({ limit: '10mb' }));
|
||||
app.use(express.urlencoded({ extended: true }));
|
||||
@@ -234,9 +240,11 @@ async function start(): Promise<void> {
|
||||
const pollerService = new PollerService();
|
||||
pollerService.setSocketServer(io);
|
||||
setDevicesPoller(pollerService);
|
||||
setBulkAddPollerService(pollerService);
|
||||
setTopologyPoller(pollerService);
|
||||
setClientsPoller(pollerService);
|
||||
await pollerService.start();
|
||||
await startBulkAddWorker();
|
||||
|
||||
// Start HTTP server
|
||||
httpServer.listen(PORT, '0.0.0.0', () => {
|
||||
@@ -246,6 +254,7 @@ async function start(): Promise<void> {
|
||||
// Graceful shutdown
|
||||
const shutdown = async () => {
|
||||
console.log('Shutting down...');
|
||||
await stopBulkAddWorker();
|
||||
await pollerService.stop();
|
||||
await redis.quit().catch(() => {});
|
||||
await pool.end();
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
import { Request, Response, NextFunction } from 'express';
|
||||
import { redis } from '../config/redis';
|
||||
|
||||
/**
|
||||
* Fixed-window rate limit using Redis INCR (shared across API replicas).
|
||||
*/
|
||||
export function rateLimitRedis(options: {
|
||||
windowSec: number;
|
||||
max: number;
|
||||
keyPrefix: string;
|
||||
}): (req: Request, res: Response, next: NextFunction) => void {
|
||||
const { windowSec, max, keyPrefix } = options;
|
||||
return async (req: Request, res: Response, next: NextFunction): Promise<void> => {
|
||||
if (!['POST', 'PUT', 'PATCH', 'DELETE'].includes(req.method)) {
|
||||
next();
|
||||
return;
|
||||
}
|
||||
const uid = req.user?.userId;
|
||||
const key = `rl:${keyPrefix}:${uid != null ? `u:${uid}` : `ip:${req.ip || 'unknown'}`}`;
|
||||
try {
|
||||
const n = await redis.incr(key);
|
||||
if (n === 1) {
|
||||
await redis.expire(key, windowSec);
|
||||
}
|
||||
if (n > max) {
|
||||
const ttl = await redis.ttl(key);
|
||||
const retryAfterSec = Math.max(1, ttl > 0 ? ttl : windowSec);
|
||||
res.setHeader('Retry-After', String(retryAfterSec));
|
||||
res.status(429).json({ error: 'Too many requests. Please try again later.' });
|
||||
return;
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn('[rateLimitRedis] Redis error, allowing request:', (e as Error).message);
|
||||
}
|
||||
next();
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
jest.mock('../../config/database');
|
||||
jest.mock('../../config/redis', () => ({
|
||||
redis: {
|
||||
incr: jest.fn().mockResolvedValue(1),
|
||||
expire: jest.fn().mockResolvedValue(1),
|
||||
ttl: jest.fn().mockResolvedValue(60),
|
||||
},
|
||||
}));
|
||||
jest.mock('../../middleware/auth', () => ({
|
||||
requireAuth: (_req: unknown, _res: unknown, next: () => void) => next(),
|
||||
requireAdmin: (
|
||||
req: { user?: { role: string } },
|
||||
res: { status: (c: number) => { json: (b: unknown) => void } },
|
||||
next: () => void
|
||||
) => {
|
||||
if (req.user?.role !== 'admin') {
|
||||
res.status(403).json({ error: 'Admin access required' });
|
||||
return;
|
||||
}
|
||||
next();
|
||||
},
|
||||
}));
|
||||
|
||||
jest.mock('../../utils/crypto', () => ({
|
||||
encrypt: (s: string) => `enc:${s}`,
|
||||
}));
|
||||
|
||||
import request from 'supertest';
|
||||
import express from 'express';
|
||||
import credentialPresetsRoutes from '../credentialPresets';
|
||||
import { query, queryOne } from '../../config/database';
|
||||
|
||||
const mockedQuery = jest.mocked(query);
|
||||
const mockedQueryOne = jest.mocked(queryOne);
|
||||
|
||||
function makeApp(role: string) {
|
||||
const app = express();
|
||||
app.use(express.json());
|
||||
app.use((req, _res, next) => {
|
||||
(req as express.Request & { user?: { userId: number; username: string; role: string } }).user = {
|
||||
userId: 1,
|
||||
username: 'test',
|
||||
role,
|
||||
};
|
||||
next();
|
||||
});
|
||||
app.use('/', credentialPresetsRoutes);
|
||||
return app;
|
||||
}
|
||||
|
||||
describe('credentialPresets routes', () => {
|
||||
beforeEach(() => {
|
||||
jest.clearAllMocks();
|
||||
});
|
||||
|
||||
it('GET / returns public list', async () => {
|
||||
mockedQuery.mockResolvedValueOnce([
|
||||
{
|
||||
id: 1,
|
||||
name: 'Default',
|
||||
api_username: 'admin',
|
||||
api_password_encrypted: 'x',
|
||||
api_port: 8728,
|
||||
ssh_username: null,
|
||||
ssh_password_encrypted: null,
|
||||
ssh_port: null,
|
||||
notes: null,
|
||||
allow_operator_use: true,
|
||||
created_at: 't',
|
||||
updated_at: 't',
|
||||
},
|
||||
]);
|
||||
const app = makeApp('viewer');
|
||||
const res = await request(app).get('/');
|
||||
expect(res.status).toBe(200);
|
||||
expect(res.body[0]).toMatchObject({
|
||||
id: 1,
|
||||
name: 'Default',
|
||||
has_api_password: true,
|
||||
has_ssh_password: false,
|
||||
});
|
||||
expect(res.body[0].api_password_encrypted).toBeUndefined();
|
||||
});
|
||||
|
||||
it('POST / rejects non-admin', async () => {
|
||||
const app = makeApp('operator');
|
||||
const res = await request(app).post('/').send({
|
||||
name: 'x',
|
||||
api_username: 'a',
|
||||
api_password: 'p',
|
||||
});
|
||||
expect(res.status).toBe(403);
|
||||
});
|
||||
|
||||
it('POST / requires name, api_username, api_password', async () => {
|
||||
const app = makeApp('admin');
|
||||
const res = await request(app).post('/').send({ name: 'only' });
|
||||
expect(res.status).toBe(400);
|
||||
expect(String(res.body.error)).toMatch(/required/);
|
||||
});
|
||||
|
||||
it('POST / creates preset when admin', async () => {
|
||||
mockedQueryOne.mockResolvedValueOnce(null);
|
||||
mockedQuery.mockResolvedValueOnce([
|
||||
{
|
||||
id: 2,
|
||||
name: 'Lab',
|
||||
api_username: 'admin',
|
||||
api_password_encrypted: 'enc:p',
|
||||
api_port: 8728,
|
||||
ssh_username: null,
|
||||
ssh_password_encrypted: null,
|
||||
ssh_port: null,
|
||||
notes: null,
|
||||
allow_operator_use: true,
|
||||
created_at: 't',
|
||||
updated_at: 't',
|
||||
},
|
||||
]);
|
||||
const app = makeApp('admin');
|
||||
const res = await request(app).post('/').send({
|
||||
name: 'Lab',
|
||||
api_username: 'admin',
|
||||
api_password: 'secret',
|
||||
});
|
||||
expect(res.status).toBe(201);
|
||||
expect(res.body).toMatchObject({ id: 2, name: 'Lab', has_api_password: true });
|
||||
});
|
||||
});
|
||||
@@ -2,10 +2,17 @@ import { Router, Request, Response } from 'express';
|
||||
import { query, queryOne } from '../config/database';
|
||||
import { requireAuth, requireAdmin } from '../middleware/auth';
|
||||
import { encrypt } from '../utils/crypto';
|
||||
import { rateLimitRedis } from '../middleware/rateLimitRedis';
|
||||
|
||||
const router = Router();
|
||||
router.use(requireAuth);
|
||||
|
||||
const presetMutationLimiter = rateLimitRedis({
|
||||
windowSec: 60,
|
||||
max: 30,
|
||||
keyPrefix: 'credential-preset',
|
||||
});
|
||||
|
||||
export interface CredentialPresetRow {
|
||||
id: number;
|
||||
name: string;
|
||||
@@ -16,6 +23,8 @@ export interface CredentialPresetRow {
|
||||
ssh_password_encrypted: string | null;
|
||||
ssh_port: number | null;
|
||||
notes: string | null;
|
||||
/** When false, only admins may use this preset when adding/updating devices. */
|
||||
allow_operator_use: boolean;
|
||||
created_at: string;
|
||||
updated_at: string;
|
||||
}
|
||||
@@ -30,6 +39,7 @@ interface CredentialPresetPublic {
|
||||
ssh_username: string | null;
|
||||
ssh_port: number | null;
|
||||
notes: string | null;
|
||||
allow_operator_use: boolean;
|
||||
has_api_password: boolean;
|
||||
has_ssh_password: boolean;
|
||||
created_at: string;
|
||||
@@ -45,6 +55,7 @@ function toPublic(row: CredentialPresetRow): CredentialPresetPublic {
|
||||
ssh_username: row.ssh_username,
|
||||
ssh_port: row.ssh_port,
|
||||
notes: row.notes,
|
||||
allow_operator_use: row.allow_operator_use !== false,
|
||||
has_api_password: !!row.api_password_encrypted,
|
||||
has_ssh_password: !!row.ssh_password_encrypted,
|
||||
created_at: row.created_at,
|
||||
@@ -54,15 +65,20 @@ function toPublic(row: CredentialPresetRow): CredentialPresetPublic {
|
||||
|
||||
// GET /api/credential-presets — any authenticated user can list (the Add
|
||||
// Device modal needs this for its picker), but secrets are never exposed.
|
||||
router.get('/', async (_req: Request, res: Response) => {
|
||||
router.get('/', async (req: Request, res: Response) => {
|
||||
const role = req.user?.role;
|
||||
const rows = await query<CredentialPresetRow>(
|
||||
`SELECT * FROM credential_presets ORDER BY name ASC`
|
||||
);
|
||||
res.json(rows.map(toPublic));
|
||||
const filtered =
|
||||
role === 'admin'
|
||||
? rows
|
||||
: rows.filter((r) => (r as CredentialPresetRow).allow_operator_use !== false);
|
||||
res.json(filtered.map(toPublic));
|
||||
});
|
||||
|
||||
// POST /api/credential-presets — admin only
|
||||
router.post('/', requireAdmin, async (req: Request, res: Response) => {
|
||||
router.post('/', requireAdmin, presetMutationLimiter, async (req: Request, res: Response) => {
|
||||
const {
|
||||
name,
|
||||
api_username,
|
||||
@@ -72,6 +88,7 @@ router.post('/', requireAdmin, async (req: Request, res: Response) => {
|
||||
ssh_password,
|
||||
ssh_port,
|
||||
notes,
|
||||
allow_operator_use,
|
||||
} = req.body as {
|
||||
name?: string;
|
||||
api_username?: string;
|
||||
@@ -81,6 +98,7 @@ router.post('/', requireAdmin, async (req: Request, res: Response) => {
|
||||
ssh_password?: string | null;
|
||||
ssh_port?: number | null;
|
||||
notes?: string | null;
|
||||
allow_operator_use?: boolean;
|
||||
};
|
||||
|
||||
if (!name || !api_username || !api_password) {
|
||||
@@ -100,11 +118,13 @@ router.post('/', requireAdmin, async (req: Request, res: Response) => {
|
||||
const encApi = encrypt(api_password);
|
||||
const encSsh = ssh_password ? encrypt(ssh_password) : null;
|
||||
|
||||
const allowOp = allow_operator_use !== false;
|
||||
|
||||
const rows = await query<CredentialPresetRow>(
|
||||
`INSERT INTO credential_presets
|
||||
(name, api_username, api_password_encrypted, api_port,
|
||||
ssh_username, ssh_password_encrypted, ssh_port, notes)
|
||||
VALUES ($1,$2,$3,$4,$5,$6,$7,$8)
|
||||
ssh_username, ssh_password_encrypted, ssh_port, notes, allow_operator_use)
|
||||
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)
|
||||
RETURNING *`,
|
||||
[
|
||||
name,
|
||||
@@ -115,13 +135,14 @@ router.post('/', requireAdmin, async (req: Request, res: Response) => {
|
||||
encSsh,
|
||||
ssh_port ?? null,
|
||||
notes || null,
|
||||
allowOp,
|
||||
]
|
||||
);
|
||||
return res.status(201).json(toPublic(rows[0]));
|
||||
});
|
||||
|
||||
// PUT /api/credential-presets/:id — admin only
|
||||
router.put('/:id', requireAdmin, async (req: Request, res: Response) => {
|
||||
router.put('/:id', requireAdmin, presetMutationLimiter, async (req: Request, res: Response) => {
|
||||
const id = parseInt(req.params.id, 10);
|
||||
if (!Number.isFinite(id)) return res.status(400).json({ error: 'Invalid id' });
|
||||
|
||||
@@ -141,6 +162,7 @@ router.put('/:id', requireAdmin, async (req: Request, res: Response) => {
|
||||
ssh_port,
|
||||
notes,
|
||||
clear_ssh_password,
|
||||
allow_operator_use,
|
||||
} = req.body as {
|
||||
name?: string;
|
||||
api_username?: string;
|
||||
@@ -152,6 +174,7 @@ router.put('/:id', requireAdmin, async (req: Request, res: Response) => {
|
||||
notes?: string | null;
|
||||
// Explicit flag to remove a previously-saved SSH password
|
||||
clear_ssh_password?: boolean;
|
||||
allow_operator_use?: boolean;
|
||||
};
|
||||
|
||||
if (typeof name === 'string' && name && name !== existing.name) {
|
||||
@@ -177,8 +200,9 @@ router.put('/:id', requireAdmin, async (req: Request, res: Response) => {
|
||||
ssh_password_encrypted = $6,
|
||||
ssh_port = $7,
|
||||
notes = $8,
|
||||
allow_operator_use = COALESCE($9, allow_operator_use),
|
||||
updated_at = NOW()
|
||||
WHERE id = $9`,
|
||||
WHERE id = $10`,
|
||||
[
|
||||
name ?? null,
|
||||
api_username ?? null,
|
||||
@@ -188,6 +212,7 @@ router.put('/:id', requireAdmin, async (req: Request, res: Response) => {
|
||||
newSshPass,
|
||||
ssh_port === undefined ? existing.ssh_port : ssh_port,
|
||||
notes === undefined ? existing.notes : (notes || null),
|
||||
allow_operator_use === undefined ? null : allow_operator_use,
|
||||
id,
|
||||
]
|
||||
);
|
||||
@@ -200,7 +225,7 @@ router.put('/:id', requireAdmin, async (req: Request, res: Response) => {
|
||||
});
|
||||
|
||||
// DELETE /api/credential-presets/:id — admin only
|
||||
router.delete('/:id', requireAdmin, async (req: Request, res: Response) => {
|
||||
router.delete('/:id', requireAdmin, presetMutationLimiter, async (req: Request, res: Response) => {
|
||||
const id = parseInt(req.params.id, 10);
|
||||
if (!Number.isFinite(id)) return res.status(400).json({ error: 'Invalid id' });
|
||||
const result = await query(
|
||||
|
||||
+95
-172
@@ -1,4 +1,5 @@
|
||||
import { Router, Request, Response } from 'express';
|
||||
import { randomUUID } from 'crypto';
|
||||
import { query, queryOne } from '../config/database';
|
||||
import { requireAuth, requireWrite } from '../middleware/auth';
|
||||
import { encrypt, decrypt } from '../utils/crypto';
|
||||
@@ -6,11 +7,17 @@ import { RouterOSClient } from '../services/mikrotik/RouterOSClient';
|
||||
import { DeviceCollector, DeviceRow } from '../services/mikrotik/DeviceCollector';
|
||||
import { PollerService } from '../services/PollerService';
|
||||
import type { CredentialPresetRow } from './credentialPresets';
|
||||
import { createDeviceFromBody, type CreateDeviceInput, type CreateDeviceContext } from '../services/deviceCreation';
|
||||
import { parsePort } from '../utils/parsePort';
|
||||
import { safeConnectionError } from '../utils/safeClientError';
|
||||
import { redis } from '../config/redis';
|
||||
import { enqueueBulkAddJob, getBulkAddJobState } from '../services/DeviceBulkAddWorker';
|
||||
|
||||
// Resolve a credential preset id into decrypted credentials. Returns null if
|
||||
// no id was provided; throws a readable error if the id is invalid.
|
||||
async function loadCredentialPreset(
|
||||
id: number | null | undefined
|
||||
id: number | null | undefined,
|
||||
ctx?: CreateDeviceContext
|
||||
): Promise<{
|
||||
api_username: string;
|
||||
api_password: string;
|
||||
@@ -25,6 +32,12 @@ async function loadCredentialPreset(
|
||||
[id]
|
||||
);
|
||||
if (!preset) throw new Error(`Credential preset ${id} not found`);
|
||||
const allowOp = preset.allow_operator_use !== false;
|
||||
if (ctx?.requestingUserRole === 'operator' && !allowOp) {
|
||||
const err = new Error('This credential preset is restricted to administrators');
|
||||
(err as Error & { statusCode?: number }).statusCode = 403;
|
||||
throw err;
|
||||
}
|
||||
return {
|
||||
api_username: preset.api_username,
|
||||
api_password: decrypt(preset.api_password_encrypted),
|
||||
@@ -165,165 +178,71 @@ router.get('/discovered', async (_req: Request, res: Response) => {
|
||||
|
||||
// POST /api/devices
|
||||
router.post('/', requireWrite, async (req: Request, res: Response) => {
|
||||
const {
|
||||
name, ip_address, device_type = 'router', notes,
|
||||
credential_preset_id,
|
||||
} = req.body as { name?: string; ip_address?: string; device_type?: string; notes?: string; credential_preset_id?: number | null };
|
||||
const result = await createDeviceFromBody(req.body, pollerService, {
|
||||
requestingUserRole: req.user?.role,
|
||||
});
|
||||
return res.status(result.status).json(result.body);
|
||||
});
|
||||
|
||||
// If a preset is supplied, its credentials win over anything else in the
|
||||
// body — the client just needs to say "use preset 3". Anything the body
|
||||
// also sends (like ssh_username) is ignored in favor of preset values, so
|
||||
// "deploying" a preset always produces a consistent device record.
|
||||
let preset: Awaited<ReturnType<typeof loadCredentialPreset>> = null;
|
||||
try {
|
||||
preset = await loadCredentialPreset(credential_preset_id ?? null);
|
||||
} catch (err) {
|
||||
return res.status(400).json({ error: (err as Error).message });
|
||||
const BULK_ADD_META_TTL_SEC = 86400;
|
||||
|
||||
// POST /api/devices/bulk-add/jobs — enqueue Try-All style adds (survives tab close)
|
||||
router.post('/bulk-add/jobs', requireWrite, async (req: Request, res: Response) => {
|
||||
const { items } = req.body as { items?: unknown };
|
||||
if (!Array.isArray(items) || items.length === 0) {
|
||||
return res.status(400).json({ error: 'items must be a non-empty array' });
|
||||
}
|
||||
|
||||
const api_username: string | undefined = preset?.api_username ?? req.body.api_username;
|
||||
const api_password: string | undefined = preset?.api_password ?? req.body.api_password;
|
||||
const parsePort = (v: unknown, fallback: number): number => {
|
||||
if (v == null || v === '') return fallback;
|
||||
const n = typeof v === 'number' ? v : parseInt(String(v), 10);
|
||||
return Number.isFinite(n) ? n : fallback;
|
||||
};
|
||||
const api_port: number = preset?.api_port ?? parsePort(req.body.api_port, 8728);
|
||||
const ssh_username: string | null = preset ? preset.ssh_username : (req.body.ssh_username ?? null);
|
||||
const ssh_password: string | null = preset ? preset.ssh_password : (req.body.ssh_password ?? null);
|
||||
const ssh_port: number = preset?.ssh_port ?? parsePort(req.body.ssh_port, 22);
|
||||
const combineWithDeviceId =
|
||||
typeof req.body.combine_with_device_id === 'number' ? req.body.combine_with_device_id : null;
|
||||
const forceReplaceBySerial = req.body.force_replace_existing_by_serial === true;
|
||||
|
||||
if (!name || !ip_address || !api_username || !api_password) {
|
||||
return res.status(400).json({ error: 'name, ip_address, api_username, api_password are required' });
|
||||
if (items.length > 500) {
|
||||
return res.status(400).json({ error: 'items array exceeds maximum of 500' });
|
||||
}
|
||||
|
||||
// Test connection and detect hardware serial before saving
|
||||
const testClient = new RouterOSClient(ip_address, api_port, api_username, api_password, 10_000);
|
||||
let detectedSerial: string | null = null;
|
||||
try {
|
||||
await testClient.connect();
|
||||
const rb = await testClient.execute('/system/routerboard/print').catch(() => [] as Record<string, string>[]);
|
||||
detectedSerial = (rb[0]?.['serial-number'] || '').trim() || null;
|
||||
} catch (err) {
|
||||
return res.status(422).json({
|
||||
error: `Cannot connect to device: ${(err as Error).message}`,
|
||||
});
|
||||
} finally {
|
||||
testClient.disconnect();
|
||||
}
|
||||
|
||||
if (detectedSerial) {
|
||||
const existingBySerial = await queryOne<{
|
||||
id: number;
|
||||
name: string;
|
||||
ip_address: string;
|
||||
serial_number: string;
|
||||
}>(
|
||||
`SELECT id, name, ip_address, serial_number
|
||||
FROM devices
|
||||
WHERE serial_number = $1`,
|
||||
[detectedSerial]
|
||||
);
|
||||
|
||||
if (existingBySerial) {
|
||||
const shouldCombine =
|
||||
combineWithDeviceId != null && combineWithDeviceId === existingBySerial.id;
|
||||
if (!shouldCombine && !forceReplaceBySerial) {
|
||||
return res.status(409).json({
|
||||
error: 'duplicate_serial',
|
||||
code: 'duplicate_serial',
|
||||
existing_device: existingBySerial,
|
||||
candidate: {
|
||||
serial_number: detectedSerial,
|
||||
identity: name,
|
||||
ip_address,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
const encryptedPass = encrypt(api_password);
|
||||
const encryptedSshPass = ssh_password ? encrypt(ssh_password) : null;
|
||||
await query(
|
||||
`UPDATE devices SET
|
||||
name=COALESCE($1,name),
|
||||
ip_address=$2,
|
||||
api_port=$3,
|
||||
api_username=$4,
|
||||
api_password_encrypted=$5,
|
||||
ssh_port=$6,
|
||||
ssh_username=COALESCE($7,ssh_username),
|
||||
ssh_password_encrypted=COALESCE($8,ssh_password_encrypted),
|
||||
device_type=COALESCE($9,device_type),
|
||||
notes=COALESCE($10,notes),
|
||||
updated_at=NOW()
|
||||
WHERE id = $11`,
|
||||
[
|
||||
name,
|
||||
ip_address,
|
||||
api_port,
|
||||
api_username,
|
||||
encryptedPass,
|
||||
ssh_port,
|
||||
ssh_username,
|
||||
encryptedSshPass,
|
||||
device_type,
|
||||
notes || null,
|
||||
existingBySerial.id,
|
||||
]
|
||||
);
|
||||
|
||||
if (pollerService) {
|
||||
await pollerService.scheduleDeviceSync(existingBySerial.id, 'full');
|
||||
}
|
||||
|
||||
const updatedExisting = await queryOne(
|
||||
`SELECT id, name, ip_address, api_port, api_username, model, serial_number,
|
||||
firmware_version, ros_version, device_type, status, last_seen, notes, created_at
|
||||
FROM devices WHERE id = $1`,
|
||||
[existingBySerial.id]
|
||||
);
|
||||
if (!updatedExisting) {
|
||||
return res.status(500).json({
|
||||
error: 'Duplicate merge succeeded but device row could not be reloaded',
|
||||
device_id: existingBySerial.id,
|
||||
});
|
||||
}
|
||||
return res.status(200).json({
|
||||
...updatedExisting,
|
||||
merged_from_duplicate: true,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
const encryptedPass = encrypt(api_password);
|
||||
const encryptedSshPass = ssh_password ? encrypt(ssh_password) : null;
|
||||
|
||||
const rows = await query<{ id: number }>(
|
||||
`INSERT INTO devices (name, ip_address, api_port, api_username, api_password_encrypted,
|
||||
ssh_port, ssh_username, ssh_password_encrypted, device_type, notes, status)
|
||||
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,'unknown') RETURNING id`,
|
||||
[name, ip_address, api_port, api_username, encryptedPass,
|
||||
ssh_port, ssh_username || null, encryptedSshPass, device_type, notes || null]
|
||||
const jobId = randomUUID();
|
||||
const ownerUserId = req.user!.userId;
|
||||
await redis.set(
|
||||
`device-bulk-add:${jobId}:meta`,
|
||||
JSON.stringify({
|
||||
status: 'queued',
|
||||
total: items.length,
|
||||
processed: 0,
|
||||
owner_user_id: ownerUserId,
|
||||
created_at: new Date().toISOString(),
|
||||
}),
|
||||
'EX',
|
||||
BULK_ADD_META_TTL_SEC
|
||||
);
|
||||
await redis.set(`device-bulk-add:${jobId}:results`, '[]', 'EX', BULK_ADD_META_TTL_SEC);
|
||||
await enqueueBulkAddJob(jobId, items as CreateDeviceInput[]);
|
||||
return res.status(202).json({ job_id: jobId, total: items.length });
|
||||
});
|
||||
|
||||
const newId = rows[0].id;
|
||||
|
||||
// Trigger full sync in background
|
||||
if (pollerService) {
|
||||
await pollerService.scheduleDeviceSync(newId, 'full');
|
||||
// POST /api/devices/bulk-add/jobs/:jobId/cancel — request cooperative cancel
|
||||
router.post('/bulk-add/jobs/:jobId/cancel', requireWrite, async (req: Request, res: Response) => {
|
||||
const state = await getBulkAddJobState(req.params.jobId);
|
||||
if (!state.found) {
|
||||
return res.status(404).json({ error: 'Job not found or expired' });
|
||||
}
|
||||
const ownerId = state.meta.owner_user_id;
|
||||
if (typeof ownerId !== 'number' || ownerId !== req.user!.userId) {
|
||||
return res.status(403).json({ error: 'Forbidden' });
|
||||
}
|
||||
await redis.set(`device-bulk-add:${req.params.jobId}:cancel`, '1', 'EX', BULK_ADD_META_TTL_SEC);
|
||||
return res.json({ message: 'Cancel requested' });
|
||||
});
|
||||
|
||||
const device = await queryOne(
|
||||
`SELECT id, name, ip_address, api_port, api_username, model, serial_number,
|
||||
firmware_version, ros_version, device_type, status, last_seen, notes, created_at
|
||||
FROM devices WHERE id = $1`,
|
||||
[newId]
|
||||
);
|
||||
|
||||
return res.status(201).json(device);
|
||||
// GET /api/devices/bulk-add/jobs/:jobId — poll job status and incremental results
|
||||
router.get('/bulk-add/jobs/:jobId', requireWrite, async (req: Request, res: Response) => {
|
||||
const state = await getBulkAddJobState(req.params.jobId);
|
||||
if (!state.found) {
|
||||
return res.status(404).json({ error: 'Job not found or expired' });
|
||||
}
|
||||
const ownerId = state.meta.owner_user_id;
|
||||
if (typeof ownerId !== 'number' || ownerId !== req.user!.userId) {
|
||||
return res.status(403).json({ error: 'Forbidden' });
|
||||
}
|
||||
return res.json({
|
||||
job_id: req.params.jobId,
|
||||
...state.meta,
|
||||
results: state.results,
|
||||
});
|
||||
});
|
||||
|
||||
// GET /api/devices/:id
|
||||
@@ -392,35 +311,39 @@ router.put('/:id', requireWrite, async (req: Request, res: Response) => {
|
||||
credential_preset_id?: number | null;
|
||||
};
|
||||
|
||||
let preset: Awaited<ReturnType<typeof loadCredentialPreset>> = null;
|
||||
try {
|
||||
preset = await loadCredentialPreset(credential_preset_id ?? null);
|
||||
} catch (err) {
|
||||
return res.status(400).json({ error: (err as Error).message });
|
||||
}
|
||||
|
||||
// When a preset is applied, its values take precedence over anything else
|
||||
// in the body so "apply preset" has a single unambiguous meaning.
|
||||
const api_port = preset?.api_port ?? req.body.api_port;
|
||||
const api_username = preset?.api_username ?? req.body.api_username;
|
||||
const api_password = preset?.api_password ?? req.body.api_password;
|
||||
const ssh_port = preset?.ssh_port ?? req.body.ssh_port;
|
||||
const ssh_username = preset ? preset.ssh_username : req.body.ssh_username;
|
||||
const ssh_password = preset ? preset.ssh_password : req.body.ssh_password;
|
||||
|
||||
const existing = await queryOne<{
|
||||
id: number;
|
||||
ip_address: string;
|
||||
api_port: number;
|
||||
api_username: string;
|
||||
api_password_encrypted: string;
|
||||
ssh_port: number | null;
|
||||
}>(
|
||||
`SELECT id, ip_address, api_port, api_username, api_password_encrypted
|
||||
`SELECT id, ip_address, api_port, api_username, api_password_encrypted, ssh_port
|
||||
FROM devices WHERE id = $1`,
|
||||
[req.params.id]
|
||||
);
|
||||
if (!existing) return res.status(404).json({ error: 'Device not found' });
|
||||
|
||||
let preset: Awaited<ReturnType<typeof loadCredentialPreset>> = null;
|
||||
try {
|
||||
preset = await loadCredentialPreset(credential_preset_id ?? null, {
|
||||
requestingUserRole: req.user?.role,
|
||||
});
|
||||
} catch (err) {
|
||||
const status = (err as Error & { statusCode?: number }).statusCode ?? 400;
|
||||
return res.status(status).json({ error: (err as Error).message });
|
||||
}
|
||||
|
||||
// When a preset is applied, its values take precedence over anything else
|
||||
// in the body so "apply preset" has a single unambiguous meaning.
|
||||
const api_port = preset?.api_port ?? parsePort(req.body.api_port, existing.api_port);
|
||||
const api_username = preset?.api_username ?? req.body.api_username;
|
||||
const api_password = preset?.api_password ?? req.body.api_password;
|
||||
const ssh_port = preset?.ssh_port ?? parsePort(req.body.ssh_port, existing.ssh_port ?? 22);
|
||||
const ssh_username = preset ? preset.ssh_username : req.body.ssh_username;
|
||||
const ssh_password = preset ? preset.ssh_password : req.body.ssh_password;
|
||||
|
||||
// If the user is changing the IP (or port / username / password), verify the
|
||||
// RouterOS API is still reachable with the new values before persisting —
|
||||
// otherwise we could silently brick the device record.
|
||||
@@ -430,7 +353,7 @@ router.put('/:id', requireWrite, async (req: Request, res: Response) => {
|
||||
const presetReplacesApiCreds = !!preset;
|
||||
if (ipChanged || portChanged || userChanged || api_password || presetReplacesApiCreds) {
|
||||
const testIp = ip_address ?? existing.ip_address;
|
||||
const testPort = (typeof api_port === 'number' ? api_port : undefined) ?? existing.api_port;
|
||||
const testPort = api_port;
|
||||
const testUser = api_username ?? existing.api_username;
|
||||
const testPass = api_password ? api_password : decrypt(existing.api_password_encrypted);
|
||||
const testClient = new RouterOSClient(testIp, testPort, testUser, testPass, 10_000);
|
||||
@@ -439,7 +362,7 @@ router.put('/:id', requireWrite, async (req: Request, res: Response) => {
|
||||
testClient.disconnect();
|
||||
} catch (err) {
|
||||
return res.status(422).json({
|
||||
error: `Cannot connect to device with new settings: ${(err as Error).message}`,
|
||||
error: safeConnectionError('PUT /devices/:id', err),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,185 @@
|
||||
import { Queue, Worker, Job } from 'bullmq';
|
||||
import { createRedisConnection } from '../config/redis';
|
||||
import { redis } from '../config/redis';
|
||||
import { createDeviceFromBody, type CreateDeviceInput } from './deviceCreation';
|
||||
import type { PollerService } from './PollerService';
|
||||
|
||||
const QUEUE_NAME = 'bulk-add-devices';
|
||||
const JOB_TTL_SEC = 86400;
|
||||
|
||||
let pollerService: PollerService | null = null;
|
||||
let queue: Queue | null = null;
|
||||
let worker: Worker | null = null;
|
||||
|
||||
export function setBulkAddPollerService(p: PollerService): void {
|
||||
pollerService = p;
|
||||
}
|
||||
|
||||
function metaKey(jobId: string): string {
|
||||
return `device-bulk-add:${jobId}:meta`;
|
||||
}
|
||||
|
||||
function resultsKey(jobId: string): string {
|
||||
return `device-bulk-add:${jobId}:results`;
|
||||
}
|
||||
|
||||
export type BulkAddResultRow = {
|
||||
ip: string;
|
||||
identity: string;
|
||||
ok: boolean;
|
||||
message: string;
|
||||
};
|
||||
|
||||
interface BulkJobPayload {
|
||||
jobId: string;
|
||||
items: CreateDeviceInput[];
|
||||
}
|
||||
|
||||
async function readMeta(jobId: string): Promise<Record<string, unknown>> {
|
||||
const raw = await redis.get(metaKey(jobId));
|
||||
if (!raw) return {};
|
||||
try {
|
||||
return JSON.parse(raw) as Record<string, unknown>;
|
||||
} catch {
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
async function writeMeta(jobId: string, patch: Record<string, unknown>): Promise<void> {
|
||||
const cur = await readMeta(jobId);
|
||||
const next = { ...cur, ...patch };
|
||||
await redis.set(metaKey(jobId), JSON.stringify(next), 'EX', JOB_TTL_SEC);
|
||||
}
|
||||
|
||||
async function readResults(jobId: string): Promise<BulkAddResultRow[]> {
|
||||
const raw = await redis.get(resultsKey(jobId));
|
||||
if (!raw) return [];
|
||||
try {
|
||||
return JSON.parse(raw) as BulkAddResultRow[];
|
||||
} catch {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
async function appendResults(jobId: string, rows: BulkAddResultRow[]): Promise<void> {
|
||||
const cur = await readResults(jobId);
|
||||
const next = [...cur, ...rows];
|
||||
await redis.set(resultsKey(jobId), JSON.stringify(next), 'EX', JOB_TTL_SEC);
|
||||
}
|
||||
|
||||
async function processJob(job: Job<BulkJobPayload>): Promise<void> {
|
||||
const { jobId, items } = job.data;
|
||||
await writeMeta(jobId, { status: 'active', processed: 0 });
|
||||
const poller = pollerService;
|
||||
|
||||
for (let i = 0; i < items.length; i++) {
|
||||
const cancel = await redis.get(`device-bulk-add:${jobId}:cancel`);
|
||||
if (cancel) {
|
||||
await writeMeta(jobId, {
|
||||
status: 'cancelled',
|
||||
processed: i,
|
||||
current_name: null,
|
||||
cancelled_at: new Date().toISOString(),
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const item = items[i];
|
||||
const identity = item.name || item.ip_address || '';
|
||||
await writeMeta(jobId, {
|
||||
processed: i,
|
||||
current_name: identity,
|
||||
});
|
||||
|
||||
const result = await createDeviceFromBody(
|
||||
{
|
||||
...item,
|
||||
device_type: item.device_type || 'router',
|
||||
},
|
||||
poller
|
||||
);
|
||||
|
||||
let failMsg = 'Failed';
|
||||
if (!result.ok) {
|
||||
const b = result.body;
|
||||
if (b.code === 'duplicate_serial') {
|
||||
failMsg = 'Duplicate serial — review manually before combining';
|
||||
} else if (typeof b.error === 'string') {
|
||||
failMsg = b.error;
|
||||
}
|
||||
}
|
||||
const row: BulkAddResultRow = {
|
||||
ip: item.ip_address || '',
|
||||
identity,
|
||||
ok: result.ok,
|
||||
message: result.ok
|
||||
? (result.body.merged_from_duplicate ? 'Updated (duplicate serial)' : 'Added')
|
||||
: failMsg,
|
||||
};
|
||||
await appendResults(jobId, [row]);
|
||||
await writeMeta(jobId, { processed: i + 1 });
|
||||
}
|
||||
|
||||
await writeMeta(jobId, {
|
||||
status: 'completed',
|
||||
processed: items.length,
|
||||
current_name: null,
|
||||
completed_at: new Date().toISOString(),
|
||||
});
|
||||
}
|
||||
|
||||
export async function enqueueBulkAddJob(jobId: string, items: CreateDeviceInput[]): Promise<void> {
|
||||
if (!queue) {
|
||||
queue = new Queue(QUEUE_NAME, { connection: createRedisConnection() });
|
||||
}
|
||||
await queue.add('run', { jobId, items } satisfies BulkJobPayload, {
|
||||
attempts: 1,
|
||||
removeOnComplete: { age: 3600, count: 100 },
|
||||
removeOnFail: { age: 86400 },
|
||||
});
|
||||
}
|
||||
|
||||
export async function getBulkAddJobState(jobId: string): Promise<{
|
||||
found: boolean;
|
||||
meta: Record<string, unknown>;
|
||||
results: BulkAddResultRow[];
|
||||
}> {
|
||||
const meta = await readMeta(jobId);
|
||||
if (!meta || Object.keys(meta).length === 0) {
|
||||
return { found: false, meta: {}, results: [] };
|
||||
}
|
||||
const results = await readResults(jobId);
|
||||
return { found: true, meta, results };
|
||||
}
|
||||
|
||||
export async function startBulkAddWorker(): Promise<void> {
|
||||
if (worker) return;
|
||||
worker = new Worker<BulkJobPayload>(
|
||||
QUEUE_NAME,
|
||||
async (job) => {
|
||||
try {
|
||||
await processJob(job);
|
||||
} catch (err) {
|
||||
const { jobId } = job.data;
|
||||
console.error('[BulkAddWorker] job failed:', job?.id, err);
|
||||
await writeMeta(jobId, {
|
||||
status: 'failed',
|
||||
error: 'Batch job failed. Check server logs for details.',
|
||||
failed_at: new Date().toISOString(),
|
||||
});
|
||||
throw err;
|
||||
}
|
||||
},
|
||||
{ connection: createRedisConnection(), concurrency: 1 }
|
||||
);
|
||||
worker.on('failed', (job, err) => {
|
||||
console.error('[BulkAddWorker] job failed:', job?.id, err);
|
||||
});
|
||||
}
|
||||
|
||||
export async function stopBulkAddWorker(): Promise<void> {
|
||||
await worker?.close();
|
||||
worker = null;
|
||||
await queue?.close();
|
||||
queue = null;
|
||||
}
|
||||
@@ -0,0 +1,242 @@
|
||||
import { query, queryOne } from '../config/database';
|
||||
import { encrypt, decrypt } from '../utils/crypto';
|
||||
import { parsePort } from '../utils/parsePort';
|
||||
import { safeConnectionError } from '../utils/safeClientError';
|
||||
import { RouterOSClient } from './mikrotik/RouterOSClient';
|
||||
import type { PollerService } from './PollerService';
|
||||
import type { CredentialPresetRow } from '../routes/credentialPresets';
|
||||
|
||||
export type CreateDeviceContext = {
|
||||
/** JWT role of the caller ('admin' | 'operator' | 'viewer'). Preset use may be restricted for operators. */
|
||||
requestingUserRole?: string;
|
||||
};
|
||||
|
||||
async function loadCredentialPreset(
|
||||
id: number | null | undefined,
|
||||
ctx?: CreateDeviceContext
|
||||
): Promise<{
|
||||
api_username: string;
|
||||
api_password: string;
|
||||
api_port: number | null;
|
||||
ssh_username: string | null;
|
||||
ssh_password: string | null;
|
||||
ssh_port: number | null;
|
||||
} | null> {
|
||||
if (id === null || id === undefined) return null;
|
||||
const preset = await queryOne<CredentialPresetRow>(
|
||||
`SELECT * FROM credential_presets WHERE id = $1`,
|
||||
[id]
|
||||
);
|
||||
if (!preset) throw new Error(`Credential preset ${id} not found`);
|
||||
const allowOp = (preset as CredentialPresetRow & { allow_operator_use?: boolean }).allow_operator_use !== false;
|
||||
if (ctx?.requestingUserRole === 'operator' && !allowOp) {
|
||||
const err = new Error('This credential preset is restricted to administrators');
|
||||
(err as Error & { statusCode?: number }).statusCode = 403;
|
||||
throw err;
|
||||
}
|
||||
return {
|
||||
api_username: preset.api_username,
|
||||
api_password: decrypt(preset.api_password_encrypted),
|
||||
api_port: preset.api_port,
|
||||
ssh_username: preset.ssh_username,
|
||||
ssh_password: preset.ssh_password_encrypted ? decrypt(preset.ssh_password_encrypted) : null,
|
||||
ssh_port: preset.ssh_port,
|
||||
};
|
||||
}
|
||||
|
||||
export interface CreateDeviceInput {
|
||||
name?: string;
|
||||
ip_address?: string;
|
||||
device_type?: string;
|
||||
notes?: string;
|
||||
credential_preset_id?: number | null;
|
||||
api_username?: string;
|
||||
api_password?: string;
|
||||
api_port?: unknown;
|
||||
ssh_username?: string | null;
|
||||
ssh_password?: string | null;
|
||||
ssh_port?: unknown;
|
||||
combine_with_device_id?: number;
|
||||
force_replace_existing_by_serial?: boolean;
|
||||
}
|
||||
|
||||
export type CreateDeviceResult =
|
||||
| { ok: true; status: 200 | 201; body: Record<string, unknown> }
|
||||
| { ok: false; status: number; body: Record<string, unknown> };
|
||||
|
||||
/**
|
||||
* Shared device creation logic used by POST /api/devices and bulk-add worker.
|
||||
*/
|
||||
export async function createDeviceFromBody(
|
||||
input: CreateDeviceInput,
|
||||
pollerService: PollerService | null,
|
||||
ctx?: CreateDeviceContext
|
||||
): Promise<CreateDeviceResult> {
|
||||
const {
|
||||
name,
|
||||
ip_address,
|
||||
device_type = 'router',
|
||||
notes,
|
||||
credential_preset_id,
|
||||
} = input;
|
||||
|
||||
let preset: Awaited<ReturnType<typeof loadCredentialPreset>> = null;
|
||||
try {
|
||||
preset = await loadCredentialPreset(credential_preset_id ?? null, ctx);
|
||||
} catch (err) {
|
||||
const status = (err as Error & { statusCode?: number }).statusCode ?? 400;
|
||||
return { ok: false, status, body: { error: (err as Error).message } };
|
||||
}
|
||||
|
||||
const api_username: string | undefined = preset?.api_username ?? input.api_username;
|
||||
const api_password: string | undefined = preset?.api_password ?? input.api_password;
|
||||
const api_port: number = preset?.api_port ?? parsePort(input.api_port, 8728);
|
||||
const ssh_username: string | null = preset ? preset.ssh_username : (input.ssh_username ?? null);
|
||||
const ssh_password: string | null = preset ? preset.ssh_password : (input.ssh_password ?? null);
|
||||
const ssh_port: number = preset?.ssh_port ?? parsePort(input.ssh_port, 22);
|
||||
const combineWithDeviceId =
|
||||
typeof input.combine_with_device_id === 'number' ? input.combine_with_device_id : null;
|
||||
const forceReplaceBySerial = input.force_replace_existing_by_serial === true;
|
||||
|
||||
if (!name || !ip_address || !api_username || !api_password) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 400,
|
||||
body: { error: 'name, ip_address, api_username, api_password are required' },
|
||||
};
|
||||
}
|
||||
|
||||
const testClient = new RouterOSClient(ip_address, api_port, api_username, api_password, 10_000);
|
||||
let detectedSerial: string | null = null;
|
||||
try {
|
||||
await testClient.connect();
|
||||
const rb = await testClient.execute('/system/routerboard/print').catch(() => [] as Record<string, string>[]);
|
||||
detectedSerial = (rb[0]?.['serial-number'] || '').trim() || null;
|
||||
} catch (err) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 422,
|
||||
body: { error: safeConnectionError('createDeviceFromBody', err) },
|
||||
};
|
||||
} finally {
|
||||
testClient.disconnect();
|
||||
}
|
||||
|
||||
if (detectedSerial) {
|
||||
const existingBySerial = await queryOne<{
|
||||
id: number;
|
||||
name: string;
|
||||
ip_address: string;
|
||||
serial_number: string;
|
||||
}>(
|
||||
`SELECT id, name, ip_address, serial_number
|
||||
FROM devices
|
||||
WHERE serial_number = $1`,
|
||||
[detectedSerial]
|
||||
);
|
||||
|
||||
if (existingBySerial) {
|
||||
const shouldCombine =
|
||||
combineWithDeviceId != null && combineWithDeviceId === existingBySerial.id;
|
||||
if (!shouldCombine && !forceReplaceBySerial) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 409,
|
||||
body: {
|
||||
error: 'duplicate_serial',
|
||||
code: 'duplicate_serial',
|
||||
existing_device: existingBySerial,
|
||||
candidate: {
|
||||
serial_number: detectedSerial,
|
||||
identity: name,
|
||||
ip_address,
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
const encryptedPass = encrypt(api_password);
|
||||
const encryptedSshPass = ssh_password ? encrypt(ssh_password) : null;
|
||||
await query(
|
||||
`UPDATE devices SET
|
||||
name=COALESCE($1,name),
|
||||
ip_address=$2,
|
||||
api_port=$3,
|
||||
api_username=$4,
|
||||
api_password_encrypted=$5,
|
||||
ssh_port=$6,
|
||||
ssh_username=COALESCE($7,ssh_username),
|
||||
ssh_password_encrypted=COALESCE($8,ssh_password_encrypted),
|
||||
device_type=COALESCE($9,device_type),
|
||||
notes=COALESCE($10,notes),
|
||||
updated_at=NOW()
|
||||
WHERE id = $11`,
|
||||
[
|
||||
name,
|
||||
ip_address,
|
||||
api_port,
|
||||
api_username,
|
||||
encryptedPass,
|
||||
ssh_port,
|
||||
ssh_username,
|
||||
encryptedSshPass,
|
||||
device_type,
|
||||
notes || null,
|
||||
existingBySerial.id,
|
||||
]
|
||||
);
|
||||
|
||||
if (pollerService) {
|
||||
await pollerService.scheduleDeviceSync(existingBySerial.id, 'full');
|
||||
}
|
||||
|
||||
const updatedExisting = await queryOne(
|
||||
`SELECT id, name, ip_address, api_port, api_username, model, serial_number,
|
||||
firmware_version, ros_version, device_type, status, last_seen, notes, created_at
|
||||
FROM devices WHERE id = $1`,
|
||||
[existingBySerial.id]
|
||||
);
|
||||
if (!updatedExisting) {
|
||||
return {
|
||||
ok: false,
|
||||
status: 500,
|
||||
body: {
|
||||
error: 'Duplicate merge succeeded but device row could not be reloaded',
|
||||
device_id: existingBySerial.id,
|
||||
},
|
||||
};
|
||||
}
|
||||
return {
|
||||
ok: true,
|
||||
status: 200,
|
||||
body: { ...updatedExisting, merged_from_duplicate: true },
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
const encryptedPass = encrypt(api_password);
|
||||
const encryptedSshPass = ssh_password ? encrypt(ssh_password) : null;
|
||||
|
||||
const rows = await query<{ id: number }>(
|
||||
`INSERT INTO devices (name, ip_address, api_port, api_username, api_password_encrypted,
|
||||
ssh_port, ssh_username, ssh_password_encrypted, device_type, notes, status)
|
||||
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,'unknown') RETURNING id`,
|
||||
[name, ip_address, api_port, api_username, encryptedPass,
|
||||
ssh_port, ssh_username || null, encryptedSshPass, device_type, notes || null]
|
||||
);
|
||||
|
||||
const newId = rows[0].id;
|
||||
|
||||
if (pollerService) {
|
||||
await pollerService.scheduleDeviceSync(newId, 'full');
|
||||
}
|
||||
|
||||
const device = await queryOne(
|
||||
`SELECT id, name, ip_address, api_port, api_username, model, serial_number,
|
||||
firmware_version, ros_version, device_type, status, last_seen, notes, created_at
|
||||
FROM devices WHERE id = $1`,
|
||||
[newId]
|
||||
);
|
||||
|
||||
return { ok: true, status: 201, body: device as Record<string, unknown> };
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
import {
|
||||
corsMiddlewareOptions,
|
||||
resetCorsResolvedCacheForTests,
|
||||
socketIoCorsOptions,
|
||||
} from '../corsOrigins';
|
||||
|
||||
describe('corsOrigins', () => {
|
||||
const prev = { ...process.env };
|
||||
|
||||
afterEach(() => {
|
||||
process.env = { ...prev };
|
||||
resetCorsResolvedCacheForTests();
|
||||
});
|
||||
|
||||
it('uses wildcard in test when CORS_ORIGIN is unset', () => {
|
||||
process.env.NODE_ENV = 'test';
|
||||
delete process.env.CORS_ORIGIN;
|
||||
expect(corsMiddlewareOptions()).toMatchObject({
|
||||
origin: '*',
|
||||
credentials: false,
|
||||
});
|
||||
expect(socketIoCorsOptions()).toMatchObject({
|
||||
origin: '*',
|
||||
credentials: false,
|
||||
});
|
||||
});
|
||||
|
||||
it('parses comma-separated CORS_ORIGIN in production', () => {
|
||||
process.env.NODE_ENV = 'production';
|
||||
process.env.CORS_ORIGIN = 'https://a.example.com, https://b.example.com ';
|
||||
const cors = corsMiddlewareOptions();
|
||||
expect(cors.credentials).toBe(true);
|
||||
expect(typeof cors.origin).toBe('function');
|
||||
const originFn = cors.origin as (
|
||||
o: string | undefined,
|
||||
fn: (e: Error | null, ok?: boolean) => void,
|
||||
) => void;
|
||||
originFn(undefined, (err, ok) => {
|
||||
expect(err).toBeNull();
|
||||
expect(ok).toBe(true);
|
||||
});
|
||||
originFn('https://a.example.com', (err, ok) => {
|
||||
expect(err).toBeNull();
|
||||
expect(ok).toBe(true);
|
||||
});
|
||||
originFn('https://evil.com', (err, ok) => {
|
||||
expect(err).toBeNull();
|
||||
expect(ok).toBe(false);
|
||||
});
|
||||
expect(socketIoCorsOptions()).toEqual({
|
||||
origin: ['https://a.example.com', 'https://b.example.com'],
|
||||
methods: ['GET', 'POST'],
|
||||
credentials: true,
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,20 @@
|
||||
import { parsePort } from '../parsePort';
|
||||
|
||||
describe('parsePort', () => {
|
||||
it('returns fallback for null, undefined, empty string', () => {
|
||||
expect(parsePort(null, 8728)).toBe(8728);
|
||||
expect(parsePort(undefined, 22)).toBe(22);
|
||||
expect(parsePort('', 8728)).toBe(8728);
|
||||
});
|
||||
|
||||
it('parses numbers and numeric strings', () => {
|
||||
expect(parsePort(8729, 8728)).toBe(8729);
|
||||
expect(parsePort('8729', 8728)).toBe(8729);
|
||||
expect(parsePort('22', 22)).toBe(22);
|
||||
});
|
||||
|
||||
it('returns fallback for NaN and non-numeric strings', () => {
|
||||
expect(parsePort('abc', 8728)).toBe(8728);
|
||||
expect(parsePort(NaN, 22)).toBe(22);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,103 @@
|
||||
import type { CorsOptions } from 'cors';
|
||||
|
||||
/** Browser dev servers and typical local access through nginx. */
|
||||
const DEFAULT_DEV_ORIGINS = [
|
||||
'http://localhost:3000',
|
||||
'http://127.0.0.1:3000',
|
||||
'http://localhost:5173',
|
||||
'http://127.0.0.1:5173',
|
||||
'http://localhost',
|
||||
'http://127.0.0.1',
|
||||
'https://localhost',
|
||||
'https://127.0.0.1',
|
||||
];
|
||||
|
||||
type Resolved =
|
||||
| { kind: 'wildcard' }
|
||||
| { kind: 'list'; allowed: string[] };
|
||||
|
||||
function parseList(raw: string): string[] {
|
||||
return raw.split(',').map((s) => s.trim()).filter(Boolean);
|
||||
}
|
||||
|
||||
function resolveCors(): Resolved {
|
||||
const nodeEnv = process.env.NODE_ENV || 'development';
|
||||
const raw = process.env.CORS_ORIGIN?.trim();
|
||||
|
||||
if (raw === '*') {
|
||||
if (nodeEnv === 'production') {
|
||||
console.error(
|
||||
'CORS_ORIGIN=* is not allowed in production. Set a comma-separated list of browser origins (e.g. https://manager.example.com).',
|
||||
);
|
||||
process.exit(1);
|
||||
}
|
||||
return { kind: 'wildcard' };
|
||||
}
|
||||
|
||||
if (!raw) {
|
||||
if (nodeEnv === 'production') {
|
||||
console.error(
|
||||
'CORS_ORIGIN is required in production (comma-separated origins, e.g. https://manager.example.com).',
|
||||
);
|
||||
process.exit(1);
|
||||
}
|
||||
if (nodeEnv === 'test') {
|
||||
return { kind: 'wildcard' };
|
||||
}
|
||||
return { kind: 'list', allowed: DEFAULT_DEV_ORIGINS };
|
||||
}
|
||||
|
||||
return { kind: 'list', allowed: parseList(raw) };
|
||||
}
|
||||
|
||||
let resolvedCache: Resolved | null = null;
|
||||
|
||||
function getResolved(): Resolved {
|
||||
if (!resolvedCache) resolvedCache = resolveCors();
|
||||
return resolvedCache;
|
||||
}
|
||||
|
||||
/** Clears memoized CORS resolution (for Jest when env changes between cases). */
|
||||
export function resetCorsResolvedCacheForTests(): void {
|
||||
resolvedCache = null;
|
||||
}
|
||||
|
||||
/** Express `cors` middleware options (no `origin: *` with `credentials: true`). */
|
||||
export function corsMiddlewareOptions(): CorsOptions {
|
||||
const resolved = getResolved();
|
||||
if (resolved.kind === 'wildcard') {
|
||||
return { origin: '*', credentials: false };
|
||||
}
|
||||
const allowed = resolved.allowed;
|
||||
return {
|
||||
origin(origin, callback) {
|
||||
if (!origin) {
|
||||
callback(null, true);
|
||||
return;
|
||||
}
|
||||
if (allowed.includes(origin)) {
|
||||
callback(null, true);
|
||||
return;
|
||||
}
|
||||
callback(null, false);
|
||||
},
|
||||
credentials: true,
|
||||
};
|
||||
}
|
||||
|
||||
/** Socket.IO server `cors` field — must align with HTTP CORS. */
|
||||
export function socketIoCorsOptions(): {
|
||||
origin: string | string[];
|
||||
methods: string[];
|
||||
credentials: boolean;
|
||||
} {
|
||||
const resolved = getResolved();
|
||||
if (resolved.kind === 'wildcard') {
|
||||
return { origin: '*', methods: ['GET', 'POST'], credentials: false };
|
||||
}
|
||||
return {
|
||||
origin: resolved.allowed,
|
||||
methods: ['GET', 'POST'],
|
||||
credentials: true,
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
/**
|
||||
* Parse API/SSH port from request bodies (string or number). Invalid values
|
||||
* fall back to the provided default (matches existing device routes behavior).
|
||||
*/
|
||||
export function parsePort(value: unknown, fallback: number): number {
|
||||
if (value == null || value === '') return fallback;
|
||||
const n = typeof value === 'number' ? value : parseInt(String(value), 10);
|
||||
return Number.isFinite(n) ? n : fallback;
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
/**
|
||||
* Return a short, stable message for API clients; log full detail server-side only.
|
||||
*/
|
||||
export function safeConnectionError(context: string, err: unknown): string {
|
||||
const raw = err instanceof Error ? err.message : String(err);
|
||||
console.warn(`[${context}]`, raw);
|
||||
return 'Cannot connect to device. Check IP, port, credentials, and that the API service is reachable.';
|
||||
}
|
||||
Reference in New Issue
Block a user