summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJannik Schönartz2019-12-01 19:31:01 +0100
committerJannik Schönartz2019-12-01 19:31:01 +0100
commitde3c9f57041a5622080a1cf7732ef5994b885d10 (patch)
tree1944d9e33eaa80e89b21aaa0118305151479a66b
parent[configloader] enabled new configloader (diff)
downloadbas-de3c9f57041a5622080a1cf7732ef5994b885d10.tar.gz
bas-de3c9f57041a5622080a1cf7732ef5994b885d10.tar.xz
bas-de3c9f57041a5622080a1cf7732ef5994b885d10.zip
[server/log] Add iprange log when a group was edited
-rw-r--r--server/api/groups.js12
-rw-r--r--server/api/ipranges.js6
-rw-r--r--server/lib/confighelper.js2
-rw-r--r--webapp/src/components/LogModuleEntry.vue3
4 files changed, 20 insertions, 3 deletions
diff --git a/server/api/groups.js b/server/api/groups.js
index bdc560b..88e7da8 100644
--- a/server/api/groups.js
+++ b/server/api/groups.js
@@ -142,10 +142,22 @@ router.postAsync(['', '/:id'], async (req, res) => {
if (iprange.id) {
if (iprangeIdMap[iprange.id]) {
promises.push(iprangeIdMap[iprange.id].update(iprange))
+ log({
+ category: 'IPRANGE_EDIT',
+ description: '[' + iprange.id + '] IP range successfully edited from ' + ipHelper.toIPv4(iprange.startIp) + ' to ' + ipHelper.toIPv4(iprange.endIp),
+ groupId: group.id,
+ userId: req.user.id
+ })
delete iprangeIdMap[iprange.id]
}
} else {
promises.push(group.createIprange(iprange))
+ log({
+ category: 'IPRANGE_CREATE',
+ description: '[' + iprange.id + '] IP range successfully created from ' + ipHelper.toIPv4(iprange.startIp) + ' to ' + ipHelper.toIPv4(iprange.endIp),
+ groupId: group.id,
+ userId: req.user.id
+ })
}
})
// Destroy the deleted ipranges
diff --git a/server/api/ipranges.js b/server/api/ipranges.js
index fe66fd5..7750658 100644
--- a/server/api/ipranges.js
+++ b/server/api/ipranges.js
@@ -91,7 +91,8 @@ router.postAsync(['', '/:id'], async (req, res) => {
await log({
category: 'IPRANGE_CREATE',
description: 'IP range from ' + iphelper.toIPv4(req.body.startIp) + ' to ' + iphelper.toIPv4(req.body.endIp) + ' successfully created',
- userId: req.user.id
+ userId: req.user.id,
+ groupId: iprange.groupId
})
action = 'created'
} else if (req.params.id > 0) {
@@ -102,7 +103,8 @@ router.postAsync(['', '/:id'], async (req, res) => {
await log({
category: 'IPRANGE_EDIT',
description: '[' + iprange.id + '] IP range successfully edited from ' + iphelper.toIPv4(req.body.startIp) + ' to ' + iphelper.toIPv4(req.body.endIp),
- userId: req.user.id
+ userId: req.user.id,
+ groupId: iprange.groupId
})
}
} else {
diff --git a/server/lib/confighelper.js b/server/lib/confighelper.js
index 6773bd0..bb43b6a 100644
--- a/server/lib/confighelper.js
+++ b/server/lib/confighelper.js
@@ -281,7 +281,7 @@ async function _createDynamicMenu (configInfos, noScript) {
function getDefaultConfig (client) {
let script = '#!ipxe\r\n\r\n'
script += ':start\r\n'
- script += 'menu ' + 'Client is successfully registrated' + '\r\n'
+ script += 'menu ' + 'Client is successfully registered' + '\r\n'
script += 'item --gap BAS-ID: ' + client.id + '\r\n'
script += 'item --gap Name: ' + client.name + '\r\n'
script += 'item --gap\r\n'
diff --git a/webapp/src/components/LogModuleEntry.vue b/webapp/src/components/LogModuleEntry.vue
index d633a47..a037e79 100644
--- a/webapp/src/components/LogModuleEntry.vue
+++ b/webapp/src/components/LogModuleEntry.vue
@@ -4,6 +4,7 @@
"id": "ID",
"name": "Name",
"description": "Description",
+ "config": "Config",
"ip": "IP",
"mac": "MAC",
"uuid": "UUID",
@@ -14,6 +15,7 @@
"id": "ID",
"name": "Name",
"description": "Beschreibung",
+ "config": "Konfiguration",
"ip": "IP",
"mac": "MAC",
"uuid": "UUID",
@@ -68,6 +70,7 @@
<tr><td class="snapshot-key">{{ $t('id') }}</td><td>{{ item.groupSnapshot.id }}</td></tr>
<tr><td class="snapshot-key">{{ $t('name') }}</td><td>{{ item.groupSnapshot.name }}</td></tr>
<tr><td class="snapshot-key">{{ $t('description') }}</td><td style="white-space: pre;">{{ item.groupSnapshot.description }}</td></tr>
+ <tr><td class="snapshot-key">{{ $t('config') }}</td><td style="white-space: pre;">{{ item.groupSnapshot.configId || "-" }}</td></tr>
</table>
</v-card-text></v-card>
</template>