-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat(lib/nameserver): added, with tests * feat(routes/nameserver): added, with tests * group: updated validate names (_res, _req) * update validate version
- Loading branch information
Showing
19 changed files
with
588 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| import Mysql from './mysql.js' | ||
| import { mapToDbColumn } from './util.js' | ||
|
|
||
| const nsDbMap = { id: 'nt_nameserver_id', gid: 'nt_group_id' } | ||
| const boolFields = ['deleted', 'export_serials'] | ||
|
|
||
| class Nameserver { | ||
| constructor() { | ||
| this.mysql = Mysql | ||
| } | ||
|
|
||
| async create(args) { | ||
| if (args.id) { | ||
| const g = await this.get({ id: args.id }) | ||
| if (g.length === 1) return g[0].id | ||
| } | ||
|
|
||
| if (args.export.type) { | ||
| args = JSON.parse(JSON.stringify(args)) | ||
| const rows = await Mysql.execute( | ||
| ...Mysql.select('SELECT id FROM nt_nameserver_export_type', { | ||
| name: args.export.type, | ||
| }), | ||
| ) | ||
| args.export_type_id = rows[0].id | ||
| delete args.export.type | ||
| } | ||
|
|
||
| return await Mysql.execute( | ||
| ...Mysql.insert( | ||
| `nt_nameserver`, | ||
| mapToDbColumn(objectToDb(args), nsDbMap), | ||
| ), | ||
| ) | ||
| } | ||
|
|
||
| async get(args) { | ||
| if (args.name !== undefined) { | ||
| args['ns.name'] = args.name | ||
| delete args.name | ||
| } | ||
| const rows = await Mysql.execute( | ||
| ...Mysql.select( | ||
| `SELECT ns.nt_nameserver_id AS id | ||
| , ns.nt_group_id AS gid | ||
| , ns.name | ||
| , ns.ttl | ||
| , ns.description | ||
| , ns.address | ||
| , ns.address6 | ||
| , ns.remote_login | ||
| , ns.logdir | ||
| , ns.datadir | ||
| , ns.export_interval | ||
| , ns.export_serials | ||
| , ns.export_status | ||
| , ns.deleted | ||
| , t.name AS export_type | ||
| FROM nt_nameserver ns | ||
| JOIN nt_nameserver_export_type t ON ns.export_type_id=t.id`, | ||
| mapToDbColumn(args, nsDbMap), | ||
| ), | ||
| ) | ||
| for (const r of rows) { | ||
| for (const b of boolFields) { | ||
| r[b] = r[b] === 1 | ||
| } | ||
| } | ||
| return dbToObject(rows) | ||
| } | ||
|
|
||
| async put(args) { | ||
| if (!args.id) return false | ||
| const id = args.id | ||
| delete args.id | ||
| // Mysql.debug(1) | ||
| const r = await Mysql.execute( | ||
| ...Mysql.update( | ||
| `nt_nameserver`, | ||
| `nt_nameserver_id=${id}`, | ||
| mapToDbColumn(args, nsDbMap), | ||
| ), | ||
| ) | ||
| // console.log(r) | ||
| return r.changedRows === 1 | ||
| } | ||
|
|
||
| async delete(args) { | ||
| await Mysql.execute( | ||
| `UPDATE nt_nameserver SET deleted=? WHERE nt_nameserver_id=?`, | ||
| [args.deleted ?? 1, args.id], | ||
| ) | ||
| return true | ||
| } | ||
|
|
||
| async destroy(args) { | ||
| return await Mysql.execute( | ||
| ...Mysql.delete(`nt_nameserver`, { nt_nameserver_id: args.id }), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| export default new Nameserver() | ||
|
|
||
| function dbToObject(rows) { | ||
| for (const row of rows) { | ||
| for (const f of [ | ||
| 'description', | ||
| 'address6', | ||
| 'remote_login', | ||
| 'datadir', | ||
| 'logdir', | ||
| 'export_status', | ||
| ]) { | ||
| if ([undefined, null].includes(row[f])) row[f] = '' | ||
| } | ||
| for (const f of ['export']) { | ||
| for (const p of ['type', 'interval', 'serials', 'status']) { | ||
| if (row[`${f}_${p}`] !== undefined) { | ||
| if (row[f] === undefined) row[f] = {} | ||
| row[f][p] = row[`${f}_${p}`] | ||
| delete row[`${f}_${p}`] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return rows | ||
| } | ||
|
|
||
| function objectToDb(row) { | ||
| row = JSON.parse(JSON.stringify(row)) // don't mutate the original | ||
|
|
||
| for (const f of ['export']) { | ||
| for (const p of ['interval', 'serials', 'status']) { | ||
| if (row[f] === undefined) continue | ||
| if (row[f][p] === undefined) continue | ||
| row[`${f}_${p}`] = row[f][p] | ||
| delete row[f][p] | ||
| } | ||
| delete row[f] | ||
| } | ||
| return row | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| import assert from 'node:assert/strict' | ||
| import { describe, it, after, before } from 'node:test' | ||
|
|
||
| import Nameserver from './nameserver.js' | ||
|
|
||
| import testCase from './test/nameserver.json' with { type: 'json' } | ||
|
|
||
| before(async () => { | ||
| await Nameserver.destroy({ id: testCase.id }) | ||
| await Nameserver.create(testCase) | ||
| }) | ||
|
|
||
| after(async () => { | ||
| await Nameserver.destroy({ id: testCase.id }) | ||
| Nameserver.mysql.disconnect() | ||
| }) | ||
|
|
||
| describe('nameserver', function () { | ||
| it('gets nameserver by id', async () => { | ||
| const g = await Nameserver.get({ id: testCase.id }) | ||
| assert.deepEqual(g[0], testCase) | ||
| }) | ||
|
|
||
| it('gets nameserver by name', async () => { | ||
| const g = await Nameserver.get({ name: testCase.name }) | ||
| assert.deepEqual(g[0], testCase) | ||
| }) | ||
|
|
||
| it('changes a nameserver', async () => { | ||
| assert.ok( | ||
| await Nameserver.put({ id: testCase.id, name: 'b.ns.example.com.' }), | ||
| ) | ||
| const ns = await Nameserver.get({ id: testCase.id }) | ||
| assert.deepEqual(ns[0].name, 'b.ns.example.com.') | ||
| assert.ok(await Nameserver.put({ id: testCase.id, name: testCase.name })) | ||
| }) | ||
|
|
||
| it('deletes a nameserver', async () => { | ||
| assert.ok(await Nameserver.delete({ id: testCase.id })) | ||
| let g = await Nameserver.get({ id: testCase.id, deleted: 1 }) | ||
| assert.equal(g[0]?.deleted, true) | ||
| await Nameserver.delete({ id: testCase.id, deleted: 0 }) // restore | ||
| g = await Nameserver.get({ id: testCase.id }) | ||
| assert.equal(g[0].deleted, false) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "id": 4096, | ||
| "gid": 4096, | ||
| "name": "a.ns.example.com.", | ||
| "description": "", | ||
| "address": "1.2.3.4", | ||
| "address6": "2001:DB8::1", | ||
| "remote_login": "nsd", | ||
| "logdir": "/foo", | ||
| "datadir": "/bar", | ||
| "export": { | ||
| "interval": 0, | ||
| "serials": true, | ||
| "status": "last run:03-05 15:25<br>last cp :09-20 12:59", | ||
| "type": "NSD" | ||
| }, | ||
| "ttl": 3600, | ||
| "deleted": false | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.