summaryrefslogtreecommitdiffstats
path: root/server/api/groups.js
diff options
context:
space:
mode:
authorJannik Schönartz2019-03-07 20:20:25 +0100
committerJannik Schönartz2019-03-07 20:20:25 +0100
commit0999302d99156200ff174d5ec56d6831c8afd332 (patch)
tree56dfcf175c3d5b15dd44eb8d156e4448caaa5455 /server/api/groups.js
parent[server/ipranges] Forgot to commit the lib. ¯\_(ツ)_/¯ (diff)
downloadbas-0999302d99156200ff174d5ec56d6831c8afd332.tar.gz
bas-0999302d99156200ff174d5ec56d6831c8afd332.tar.xz
bas-0999302d99156200ff174d5ec56d6831c8afd332.zip
[server] New clients are automaticly added to the groups of the fitting subranges
Add conflict models Sequelize string operators depricated fix IPv4 is now saved as decimal in the database Add host to config instead of hardcoding Rename ip.js lib to iphelper.js
Diffstat (limited to 'server/api/groups.js')
-rw-r--r--server/api/groups.js14
1 files changed, 6 insertions, 8 deletions
diff --git a/server/api/groups.js b/server/api/groups.js
index 6dbddc7..9a17c92 100644
--- a/server/api/groups.js
+++ b/server/api/groups.js
@@ -2,7 +2,7 @@
var path = require('path')
var db = require(path.join(__appdir, 'lib', 'sequelize'))
var groupUtil = require(path.join(__appdir, 'lib', 'grouputil'))
-const ip = require(path.join(__appdir, 'lib', 'ip'))
+const ipHelper = require(path.join(__appdir, 'lib', 'iphelper'))
var express = require('express')
const { decorateApp } = require('@awaitjs/express')
var router = decorateApp(express.Router())
@@ -22,8 +22,8 @@ router.getAsync('/:id', async (req, res) => {
if (group) {
// Convert ipranges in readable strings.
group.ipranges.forEach(iprange => {
- iprange.startIp = ip.toString(iprange.startIp)
- iprange.endIp = ip.toString(iprange.endIp)
+ iprange.startIp = ipHelper.toIPv4(iprange.startIp)
+ iprange.endIp = ipHelper.toIPv4(iprange.endIp)
})
if (all) res.status(200).send({ ...group.get({ plain: true }), ...await groupUtil.getAllChildren([group]) })
else res.status(200).send(group)
@@ -68,12 +68,10 @@ router.postAsync(['', '/:id'], async (req, res) => {
}
// Update existing ipranges and create the new ones
req.body.ipranges.forEach(iprange => {
- if (!iprange.startIp || !iprange.endIp) return
-
// Convert valid ip addresses to integer values.
- if (!ip.isIpv4(iprange.startIp) || !ip.isIpv4(iprange.endIp)) return
- iprange.startIp = ip.toInt(iprange.startIp)
- iprange.endIp = ip.toInt(iprange.endIp)
+ if (!ipHelper.isIPv4(iprange.startIp) || !ipHelper.isIPv4(iprange.endIp)) return
+ iprange.startIp = ipHelper.toDecimal(iprange.startIp)
+ iprange.endIp = ipHelper.toDecimal(iprange.endIp)
if (iprange.id) {
if (iprangeIdMap[iprange.id]) {
promises.push(iprangeIdMap[iprange.id].update(iprange))