diff --git a/package.json b/package.json index a1e7b16..a193c2b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ipwhitelist", - "version": "0.1.2", + "version": "0.1.3", "description": "IP WhiteList microservice for cloud provider", "main": "server.js", "scripts": { diff --git a/v2/src/export/index.js b/v2/src/export/index.js index fb16327..e83cf2a 100644 --- a/v2/src/export/index.js +++ b/v2/src/export/index.js @@ -60,20 +60,23 @@ function createExportRouter() { return router; } -function padIP(cidr) { - const [ip, mask] = cidr.split('/'); - const octets = ip.split('.').map(o => o.padStart(3, ' ')); - return octets.join('.') + ' / ' + mask; -} - function renderTable(cidrs) { - const rows = cidrs.map(c => '' + padIP(c) + '').join('\n'); + const rows = cidrs.map(c => { + const [ip, mask] = c.split('/'); + const [a, b, c2, d] = ip.split('.'); + return '' + + '' + a.padStart(3, ' ') + '' + + '' + b.padStart(3, ' ') + '' + + '' + c2.padStart(3, ' ') + '' + + '' + d.padStart(3, ' ') + '' + + ' / ' + mask + '' + + ''; + }).join('\n'); return 'WhiteList Export' + '' + '

WhiteList — ' + cidrs.length + ' записей

' + '' + rows + '
'