move http config into conf.d/http.yml

conf.d/http.yml

@@ -0,0 +1,4 @@
+
+default:
+  host: localhost
+  port: 3000

lib/config.js

@@ -38,8 +38,7 @@ function applyDefaults(cfg = {}, defaults = {}) {
   for (const d in defaults) {
     if (cfg[d] === undefined) {
       cfg[d] = defaults[d]
-    }
-    else if (typeof cfg[d] === 'object' && typeof defaults[d] === 'object') {
+    } else if (typeof cfg[d] === 'object' && typeof defaults[d] === 'object') {
       cfg[d] = applyDefaults(cfg[d], defaults[d])
     }
   }

lib/session.js

@@ -1,12 +1,5 @@
-// const crypto = require('crypto')
-// const { createHmac, pbkdf2 } = require('node:crypto')
-
 const Mysql = require('./mysql')
 
-// const User  = require('./user')
-
-// const validate = require('@nictool/nt-validate')
-
 class Session {
   constructor() {}
 

lib/user.js

@@ -1,15 +1,15 @@
-// const crypto = require('crypto')
-const { createHmac, pbkdf2 } = require('node:crypto')
+const crypto = require('node:crypto')
+const validate = require('@nictool/nt-validate')
 
 const mysql = require('./mysql')
 
-const validate = require('@nictool/nt-validate')
-
 class User {
-  constructor() {}
+  constructor(args) {
+    this.debug = args?.debug ?? false
+  }
 
   async authenticate(authTry) {
-    // console.log(authTry)
+    if (this.debug) console.log(authTry)
     let [username, group] = authTry.username.split('@')
     if (!group) group = 'NicTool'
 
@@ -64,11 +64,11 @@ class User {
     )
   }
 
-  async delete(args) {
+  async delete(args, val) {
     const u = await this.read({ nt_user_id: args.nt_user_id })
     if (u.length === 1) {
-      await mysql.execute(`UPDATE nt_user SET deleted=1 WHERE nt_user_id=?`, [
-        u[0].nt_user_id,
+      await mysql.execute(`UPDATE nt_user SET deleted=? WHERE nt_user_id=?`, [
+        val ?? 1, u[0].nt_user_id,
       ])
     }
   }
@@ -106,7 +106,7 @@ class User {
   async hashAuthPbkdf2(pass, salt) {
     return new Promise((resolve, reject) => {
       // match the defaults for NicTool 2.x
-      pbkdf2(pass, salt, 5000, 32, 'sha512', (err, derivedKey) => {
+      crypto.pbkdf2(pass, salt, 5000, 32, 'sha512', (err, derivedKey) => {
         if (err) return reject(err)
         resolve(derivedKey.toString('hex'))
       })
@@ -118,16 +118,16 @@ class User {
 
     if (salt) {
       const hashed = await this.hashAuthPbkdf2(passTry, salt)
-      // console.log(`hashed: (${hashed === passDb}) ${hashed}`)
+      if (this.debug) console.log(`hashed: (${hashed === passDb}) ${hashed}`)
       return hashed === passDb
     }
 
     // Check for HMAC SHA-1 password
     if (/^[0-9a-f]{40}$/.test(passDb)) {
-      const digest = createHmac('sha1', username.toLowerCase())
+      const digest = crypto.createHmac('sha1', username.toLowerCase())
         .update(passTry)
         .digest('hex')
-      // console.log(`digest: (${digest === passDb}) ${digest}`)
+      if (this.debug) console.log(`digest: (${digest === passDb}) ${digest}`)
       return digest === passDb
     }
 
@@ -142,7 +142,7 @@ class User {
     AND s.nt_user_session = ?`
 
     const session = await mysql.execute(query, [sessionId])
-    console.log(session)
+    if (this.debug) console.log(session)
     return session[0]
   }
 }

lib/util.js

@@ -12,13 +12,8 @@ exports.setEnv = () => {
   console.log(`NODE_ENV: ${process.env.NODE_ENV}`)
 }
 
-// exports.meta = {
-//   api: {
-//     version: require('../package.json').version,
-//   }
-// }
-
-// exports.asInt = function (i) {
-//   if (parseInt(i, 10)) return parseInt(i, 10)
-//   return
-// }
+exports.meta = {
+  api: {
+    version: require('../package.json').version,
+  },
+}

routes/index.js

@@ -1,24 +1,26 @@
 'use strict'
 
-const hapi = require('@hapi/hapi')
-// const hoek = require('@hapi/hoek')
 const path = require('node:path')
+
+const hapi = require('@hapi/hapi')
 const qs = require('qs')
+// const hoek = require('@hapi/hoek')
 // const validate = require('@nictool/nt-validate')
 
 const util = require('../lib/util')
 util.setEnv()
 const config = require('../lib/config')
 const user = require('../lib/user')
-// const session = require('../lib/session')
 const UserRoutes = require('./user')
 
 let server
 
 const setup = async () => {
+  const httpCfg = await config.get('http')
+
   server = hapi.server({
-    port: 3000,
-    host: 'localhost',
+    port: httpCfg.port,
+    host: httpCfg.host,
     query: {
       parser: (query) => qs.parse(query),
     },

test/config.js

@@ -20,6 +20,13 @@ describe('config', function () {
       assert.deepEqual(cfg, mysqlTestCfg)
     })
 
+    it(`loads mysql cov config (from cache)`, async function () {
+      process.env.NODE_DEBUG = 1
+      const cfg = await config.get('mysql', 'cov')
+      assert.deepEqual(cfg, mysqlTestCfg)
+      process.env.NODE_DEBUG = ''
+    })
+
     it(`loads session test config`, async function () {
       const cfg = await config.get('session', 'test')
       assert.deepEqual(cfg, sessCfg)
@@ -29,6 +36,11 @@ describe('config', function () {
       const cfg = config.getSync('session', 'test')
       assert.deepEqual(cfg, sessCfg)
     })
+
+    it(`loads http test config syncronously`, function () {
+      const cfg = config.getSync('http', 'test')
+      assert.deepEqual(cfg, httpCfg)
+    })
   })
 })
 
@@ -50,7 +62,12 @@ const sessCfg = {
     isSecure: false,
     name: 'sid-nictool',
     password: '^NicTool.Is,The#Best_Dns-Manager$',
-    path: '/'
+    path: '/',
   },
-  keepAlive: false
+  keepAlive: false,
+}
+
+const httpCfg = {
+  host: 'localhost',
+  port: 3000,
 }

test/mysql.js

@@ -9,6 +9,14 @@ describe('mysql', () => {
     assert.ok(this.dbh.connection.connectionId)
   })
 
+  if (process.env.NODE_ENV='cov') {
+    it('is noisy when debug=true', async () => {
+      mysql.debug(true)
+      await mysql.execute(`SHOW DATABASES`)
+      await mysql.select(`SELECT * FROM nt_group`)
+    })
+  }
+
   it('disconnects', async () => {
     assert.ok(this.dbh.connection.connectionId)
     await mysql.disconnect(this.dbh)

test/user.js

@@ -28,7 +28,7 @@ after(async () => {
 
 describe('user', function () {
   describe('read', function () {
-    it('finds existing user by nt_user_id', async function () {
+    it('finds existing user by nt_user_id', async () => {
       const u = await user.read({ nt_user_id: 4096 })
       // console.log(u)
       assert.deepEqual(u[0], {
@@ -42,7 +42,7 @@ describe('user', function () {
       })
     })
 
-    it('finds existing user by username', async function () {
+    it('finds existing user by username', async () => {
       const u = await user.read({ username: 'unit-test' })
       // console.log(u)
       assert.deepEqual(u[0], {
@@ -55,6 +55,15 @@ describe('user', function () {
         deleted: 0,
       })
     })
+
+    it('deletes a user', async () => {
+      await user.delete({ nt_user_id: 4096 })
+      let u = await user.read({ nt_user_id: 4096 })
+      assert.equal(u[0].deleted, 1)
+      await user.delete({ nt_user_id: 4096 }, 0) // restore
+      u = await user.read({ nt_user_id: 4096 })
+      assert.equal(u[0].deleted, 0)
+    })
   })
 
   describe('get_perms', function () {

test/util.js

@@ -0,0 +1,20 @@
+const assert = require('node:assert/strict')
+const { describe, it } = require('node:test')
+
+const util = require('../lib/util')
+
+describe('util', function () {
+  describe('setEnv', function () {
+    it('sets process.env.NODE_ENV', async () => {
+      assert.equal(process.env.NODE_ENV, undefined)
+      util.setEnv()
+      assert.ok(process.env.NODE_ENV)
+    })
+  })
+
+  describe('meta', () => {
+    it('returns the package version', () => {
+      assert.deepEqual(util.meta, { api: { version: '3.0.0' } })
+    })
+  })
+})