@nictool/dns-resource-record 1.6.1 → 1.7.0

package/rr/key.js

@@ -1,7 +1,19 @@
 import RR from '../rr.js'
 import * as TINYDNS from '../lib/tinydns.js'
+import * as BINARY from '../lib/binary.js'
 
 export default class KEY extends RR {
+  static typeName = 'KEY'
+  static typeId = 25
+  static RFCs = [2535, 3445, 4034, 6840]
+  static rdataFields = [
+    ['flags', 'u16'],
+    ['protocol', 'u8'],
+    ['algorithm', 'u8'],
+    ['publickey', 'base64'],
+  ]
+  static tags = ['obsolete']
+
   constructor(opts) {
     super(opts)
   }
@@ -43,7 +55,7 @@ export default class KEY extends RR {
 
   setPublickey(val) {
     if (!val) this.throwHelp(`KEY: publickey is required`)
-
+    this.isBase64('KEY', 'publickey', val.replace(/[\s()]/g, ''))
     this.set('publickey', val)
   }
 
@@ -51,18 +63,6 @@ export default class KEY extends RR {
     return 'DNS Public Key'
   }
 
-  getRdataFields(arg) {
-    return ['flags', 'protocol', 'algorithm', 'publickey']
-  }
-
-  getRFCs() {
-    return [2535, 3445]
-  }
-
-  getTypeId() {
-    return 25
-  }
-
   getCanonical() {
     return {
       owner: 'example.com.',
@@ -72,7 +72,8 @@ export default class KEY extends RR {
       flags: 256,
       protocol: 3,
       algorithm: 5,
-      publickey: 'AQPSKAsj8...',
+      publickey:
+        'AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwIXAqcOTiW7iHnQt5hwVAAAAA==',
     }
   }
 
@@ -94,34 +95,43 @@ export default class KEY extends RR {
   }
 
   fromTinydns({ tinyline }) {
-    // RDATA format: Flags (6 octal chars) + Protocol (3 octal chars) + Algorithm (3 octal chars) + Public Key (escaped data)
-    const [owner, _typeId, rd, ttl, ts, loc] = tinyline.slice(1).split(':')
-    if (rd.length < 12) {
-      this.throwHelp(`KEY: RDATA too short: ${rd}`)
+    // RDATA format: Flags (8 octal chars) + Protocol (4 octal chars) + Algorithm (4 octal chars) + Public Key (escaped data)
+    const { owner, rdata, ttl, timestamp, location } = this.parseTinydnsLine(tinyline)
+    if (rdata.length < 16) {
+      this.throwHelp(`KEY: RDATA too short: ${rdata}`)
     }
 
     return new KEY({
-      owner: this.fullyQualify(owner),
-      ttl: parseInt(ttl, 10),
+      owner,
+      ttl,
       type: 'KEY',
-      flags: TINYDNS.octalToUInt16(rd.slice(0, 6)),
-      protocol: TINYDNS.octalToUInt8(rd.slice(6, 9)),
-      algorithm: TINYDNS.octalToUInt8(rd.slice(9, 12)),
-      publickey: TINYDNS.unescapeOctal(rd.slice(12)),
-      timestamp: ts,
-      location: loc?.trim() ?? '',
+      flags: TINYDNS.octalToUInt16(rdata.slice(0, 8)),
+      protocol: TINYDNS.octalToUInt8(rdata.slice(8, 12)),
+      algorithm: TINYDNS.octalToUInt8(rdata.slice(12, 16)),
+      publickey: TINYDNS.octalToBase64(rdata.slice(16)),
+      timestamp,
+      location,
     })
   }
 
   /******  EXPORTERS   *******/
   toTinydns() {
-    const dataRe = new RegExp(/[\r\n\t:\\/]/, 'g')
-
     return this.getTinydnsGeneric(
       TINYDNS.UInt16toOctal(this.get('flags')) +
         TINYDNS.UInt8toOctal(this.get('protocol')) +
         TINYDNS.UInt8toOctal(this.get('algorithm')) +
-        TINYDNS.escapeOctal(dataRe, this.get('publickey')),
+        TINYDNS.base64toOctal(this.get('publickey').replace(/[\s()]/g, '')),
     )
   }
+
+  getWireRdata() {
+    const keyBytes = BINARY.base64ToBytes(this.get('publickey').replace(/[\s()]/g, ''))
+    const bytes = new Uint8Array(4 + keyBytes.length)
+    const dv = new DataView(bytes.buffer, bytes.byteOffset)
+    dv.setUint16(0, this.get('flags'))
+    bytes[2] = this.get('protocol')
+    bytes[3] = this.get('algorithm')
+    bytes.set(keyBytes, 4)
+    return bytes
+  }
 }

package/rr/kx.js

@@ -3,6 +3,14 @@ import RR from '../rr.js'
 import * as TINYDNS from '../lib/tinydns.js'
 
 export default class KX extends RR {
+  static typeName = 'KX'
+  static typeId = 36
+  static RFCs = [2230]
+  static rdataFields = [
+    ['preference', 'u16'],
+    ['exchanger', 'fqdn'],
+  ]
+
   constructor(opts) {
     super(opts)
   }
@@ -27,18 +35,6 @@ export default class KX extends RR {
     return 'Key Exchanger'
   }
 
-  getRdataFields(arg) {
-    return ['preference', 'exchanger']
-  }
-
-  getRFCs() {
-    return [2230]
-  }
-
-  getTypeId() {
-    return 36
-  }
-
   getCanonical() {
     return {
       owner: 'example.com.',
@@ -67,22 +63,15 @@ export default class KX extends RR {
     })
   }
 
-  fromBind({ bindline }) {
-    // test.example.com  3600  IN  KX  preference exchanger
-    const [owner, ttl, c, type, preference, exchanger] = bindline.split(/\s+/)
-    return new KX({
-      owner,
-      ttl: parseInt(ttl, 10),
-      class: c,
-      type,
-      preference: parseInt(preference, 10),
-      exchanger,
-    })
-  }
-
   /******  EXPORTERS   *******/
-  toBind(zone_opts) {
-    return `${this.getPrefix(zone_opts)}\t${this.get('preference')}\t${this.getFQDN('exchanger', zone_opts)}\n`
+
+  getWireRdata() {
+    const exchanger = this.wirePackDomain(this.get('exchanger'))
+    const result = new Uint8Array(2 + exchanger.length)
+    const dv = new DataView(result.buffer)
+    dv.setUint16(0, this.get('preference'))
+    result.set(exchanger, 2)
+    return result
   }
 
   toTinydns() {

package/rr/loc.js

@@ -14,6 +14,11 @@ const CONV = {
 }
 
 export default class LOC extends RR {
+  static typeName = 'LOC'
+  static typeId = 29
+  static RFCs = [1876]
+  static rdataFields = ['address']
+
   constructor(opts) {
     super(opts)
   }
@@ -36,18 +41,6 @@ export default class LOC extends RR {
     return 'Location'
   }
 
-  getRdataFields(arg) {
-    return ['address']
-  }
-
-  getRFCs() {
-    return [1876]
-  }
-
-  getTypeId() {
-    return 29
-  }
-
   getCanonical() {
     return {
       owner: 'example.com.',
@@ -205,6 +198,27 @@ export default class LOC extends RR {
     return r
   }
 
+  fromWire({ owner, cls, ttl, rdata }) {
+    const dv = new DataView(rdata.buffer, rdata.byteOffset)
+    const l = {
+      size: this.fromExponent(rdata[1]),
+      precision: {
+        horizontal: this.fromExponent(rdata[2]),
+        vertical: this.fromExponent(rdata[3]),
+      },
+      latitude: this.arcSecToDMS(dv.getUint32(4), 'lat'),
+      longitude: this.arcSecToDMS(dv.getUint32(8), 'lon'),
+      altitude: dv.getUint32(12) - REF.ALTITUDE,
+    }
+    return new LOC({
+      owner,
+      ttl,
+      class: cls,
+      type: 'LOC',
+      address: this.toHuman(l),
+    })
+  }
+
   /******  EXPORTERS   *******/
 
   toTinydns() {
@@ -222,4 +236,20 @@ export default class LOC extends RR {
 
     return this.getTinydnsGeneric(rdata)
   }
+
+  getWireRdata() {
+    const loc = this.parseLoc(this.get('address'))
+    const bytes = new Uint8Array(16)
+    const dv = new DataView(bytes.buffer, bytes.byteOffset)
+
+    bytes[0] = 0 // version
+    bytes[1] = this.toExponent(loc.size)
+    bytes[2] = this.toExponent(loc.precision.horizontal)
+    bytes[3] = this.toExponent(loc.precision.vertical)
+    dv.setUint32(4, this.dmsToArcSec(loc.latitude))
+    dv.setUint32(8, this.dmsToArcSec(loc.longitude))
+    dv.setUint32(12, loc.altitude + REF.ALTITUDE)
+
+    return bytes
+  }
 }

package/rr/mx.js

@@ -1,6 +1,16 @@
 import RR from '../rr.js'
 
 export default class MX extends RR {
+  static typeName = 'MX'
+  static typeId = 15
+  static RFCs = [1035, 2181, 7505]
+  static tinydnsType = '@'
+  static rdataFields = [
+    ['preference', 'u16'],
+    ['exchange', 'fqdn'],
+  ]
+  static tags = ['common']
+
   constructor(opts) {
     super(opts)
   }
@@ -13,38 +23,10 @@ export default class MX extends RR {
     this.set('preference', val)
   }
 
-  setExchange(val) {
-    if (!val) this.throwHelp('MX: exchange is required')
-
-    if (this.isIPv4(val) || this.isIPv6(val)) this.throwHelp(`MX: exchange must be a FQDN`)
-
-    this.isFullyQualified('MX', 'exchange', val)
-    this.isValidHostname('MX', 'exchange', val)
-
-    // RFC 4034: letters in the DNS names ... are lower cased
-    this.set('exchange', val.toLowerCase())
-  }
-
   getDescription() {
     return 'Mail Exchanger'
   }
 
-  getTags() {
-    return ['common']
-  }
-
-  getRdataFields(arg) {
-    return ['preference', 'exchange']
-  }
-
-  getRFCs() {
-    return [1035, 2181, 7505]
-  }
-
-  getTypeId() {
-    return 15
-  }
-
   getCanonical() {
     return {
       owner: 'example.com.',
@@ -59,8 +41,7 @@ export default class MX extends RR {
   /******  IMPORTERS   *******/
   fromTinydns({ tinyline }) {
     // @fqdn:ip:x:dist:ttl:timestamp:lo
-    // eslint-disable-next-line no-unused-vars
-    const [owner, ip, x, preference, ttl, ts, loc] = tinyline.slice(1).split(':')
+    const [owner, _ip, x, preference, ttl, ts, loc] = tinyline.slice(1).split(':')
 
     return new MX({
       type: 'MX',
@@ -73,29 +54,13 @@ export default class MX extends RR {
     })
   }
 
-  fromBind({ bindline }) {
-    // test.example.com  3600  IN  MX  preference exchange
-    const [owner, ttl, c, type, preference, exchange] = bindline.split(/\s+/)
-
-    return new MX({
-      owner,
-      ttl: parseInt(ttl, 10),
-      class: c,
-      type,
-      preference: parseInt(preference),
-      exchange,
-    })
-  }
-
   /******  EXPORTERS   *******/
   getWireRdata() {
-    const pref = Buffer.alloc(2)
-    pref.writeUInt16BE(this.get('preference'))
-    return Buffer.concat([pref, this.wirePackDomain(this.get('exchange'))])
-  }
-
-  toBind(zone_opts) {
-    return `${this.getPrefix(zone_opts)}\t${this.get('preference')}\t${this.getFQDN('exchange', zone_opts)}\n`
+    const domain = this.wirePackDomain(this.get('exchange'))
+    const result = new Uint8Array(2 + domain.length)
+    new DataView(result.buffer).setUint16(0, this.get('preference'))
+    result.set(domain, 2)
+    return result
   }
 
   toTinydns() {

package/rr/naptr.js

@@ -4,6 +4,18 @@ import * as TINYDNS from '../lib/tinydns.js'
 const rdataRe = /[\r\n\t:\\/]/
 
 export default class NAPTR extends RR {
+  static typeName = 'NAPTR'
+  static typeId = 35
+  static RFCs = [2915, 3403, 4848]
+  static rdataFields = [
+    ['order', 'u16'],
+    ['preference', 'u16'],
+    ['flags', 'qcharstr'],
+    ['service', 'qcharstr'],
+    ['regexp', 'qcharstr'],
+    ['replacement', 'fqdn'],
+  ]
+
   constructor(opts) {
     super(opts)
   }
@@ -12,22 +24,6 @@ export default class NAPTR extends RR {
     return 'Naming Authority Pointer'
   }
 
-  getQuotedFields() {
-    return ['flags', 'service', 'regexp']
-  }
-
-  getRdataFields(arg) {
-    return ['order', 'preference', 'flags', 'service', 'regexp', 'replacement']
-  }
-
-  getRFCs() {
-    return [2915, 3403, 4848]
-  }
-
-  getTypeId() {
-    return 35
-  }
-
   getCanonical() {
     return {
       owner: 'cid.urn.arpa.',
@@ -79,40 +75,41 @@ export default class NAPTR extends RR {
   /******  IMPORTERS   *******/
   fromTinydns({ tinyline }) {
     // NAPTR via generic, :fqdn:n:rdata:ttl:timestamp:lo
-    const [fqdn, n, rdata, ttl, ts, loc] = tinyline.slice(1).split(':')
-    if (n != 35) this.throwHelp('NAPTR fromTinydns, invalid n')
+    const { owner, typeId, rdata, ttl, timestamp, location } = this.parseTinydnsLine(tinyline)
+    if (typeId != this.getTypeId()) this.throwHelp('NAPTR fromTinydns, invalid n')
 
-    const binRdata = Buffer.from(TINYDNS.octalToChar(rdata), 'binary')
+    const binRdata = TINYDNS.octalRdataToBytes(rdata)
+    const dv = new DataView(binRdata.buffer, binRdata.byteOffset, binRdata.byteLength)
 
     const rec = {
       type: 'NAPTR',
-      owner: this.fullyQualify(fqdn),
-      ttl: parseInt(ttl, 10),
-      timestamp: ts,
-      location: loc?.trim() ?? '',
-      order: binRdata.readUInt16BE(0, 2),
-      preference: binRdata.readUInt16BE(2, 4),
+      owner,
+      ttl,
+      timestamp,
+      location,
+      order: dv.getUint16(0),
+      preference: dv.getUint16(2),
     }
 
     let idx = 4
-    const flagsLength = binRdata.readUInt8(idx)
+    const flagsLength = binRdata[idx]
     idx++
-    rec.flags = binRdata.slice(idx, idx + flagsLength).toString()
+    rec.flags = new TextDecoder().decode(binRdata.subarray(idx, idx + flagsLength))
     idx += flagsLength
 
-    const serviceLen = binRdata.readUInt8(idx)
+    const serviceLen = binRdata[idx]
     idx++
-    rec.service = binRdata.slice(idx, idx + serviceLen).toString()
+    rec.service = new TextDecoder().decode(binRdata.subarray(idx, idx + serviceLen))
     idx += serviceLen
 
-    const regexpLen = binRdata.readUInt8(idx)
+    const regexpLen = binRdata[idx]
     idx++
-    rec.regexp = binRdata.slice(idx, idx + regexpLen).toString()
+    rec.regexp = new TextDecoder().decode(binRdata.subarray(idx, idx + regexpLen))
     idx += regexpLen
 
-    const replaceLen = binRdata.readUInt8(idx)
+    const replaceLen = binRdata[idx]
     idx++
-    rec.replacement = binRdata.slice(idx, idx + replaceLen).toString()
+    rec.replacement = new TextDecoder().decode(binRdata.subarray(idx, idx + replaceLen))
 
     return new NAPTR(rec)
   }
@@ -164,4 +161,32 @@ export default class NAPTR extends RR {
 
     return this.getTinydnsGeneric(rdata)
   }
+
+  getWireRdata() {
+    const enc = new TextEncoder()
+    const flags = enc.encode(this.get('flags'))
+    const service = enc.encode(this.get('service'))
+    const regexp = enc.encode(this.get('regexp'))
+    const replacementBytes = this.wirePackDomain(this.get('replacement'))
+
+    const len = 4 + 1 + flags.length + 1 + service.length + 1 + regexp.length + replacementBytes.length
+    const buf = new Uint8Array(len)
+    const view = new DataView(buf.buffer)
+    let pos = 0
+    view.setUint16(pos, this.get('order'))
+    pos += 2
+    view.setUint16(pos, this.get('preference'))
+    pos += 2
+    buf[pos++] = flags.length
+    buf.set(flags, pos)
+    pos += flags.length
+    buf[pos++] = service.length
+    buf.set(service, pos)
+    pos += service.length
+    buf[pos++] = regexp.length
+    buf.set(regexp, pos)
+    pos += regexp.length
+    buf.set(replacementBytes, pos)
+    return buf
+  }
 }

package/rr/ns.js

@@ -1,9 +1,15 @@
 import RR from '../rr.js'
 
 export default class NS extends RR {
+  static typeName = 'NS'
+  static typeId = 2
+  static RFCs = [1035]
+  static tinydnsType = '&'
+  static rdataFields = [['dname', 'fqdn']]
+  static tags = ['common']
+
   constructor(opts) {
     super(opts)
-    if (opts === null) return
   }
 
   /****** Resource record specific setters   *******/
@@ -21,22 +27,6 @@ export default class NS extends RR {
     return 'Name Server'
   }
 
-  getTags() {
-    return ['common']
-  }
-
-  getRdataFields(arg) {
-    return ['dname']
-  }
-
-  getRFCs() {
-    return [1035]
-  }
-
-  getTypeId() {
-    return 2
-  }
-
   getCanonical() {
     return {
       owner: 'example.com.',
@@ -50,8 +40,7 @@ export default class NS extends RR {
   /******  IMPORTERS   *******/
   fromTinydns({ tinyline }) {
     // &fqdn:ip:x:ttl:timestamp:lo
-    // eslint-disable-next-line no-unused-vars
-    const [fqdn, ip, dname, ttl, ts, loc] = tinyline.slice(1).split(':')
+    const [fqdn, _ip, dname, ttl, ts, loc] = tinyline.slice(1).split(':')
 
     return new NS({
       type: 'NS',
@@ -63,28 +52,11 @@ export default class NS extends RR {
     })
   }
 
-  fromBind({ bindline }) {
-    // test.example.com  3600  IN  NS dname
-    const [owner, ttl, c, type, dname] = bindline.split(/\s+/)
-
-    return new NS({
-      owner,
-      ttl: parseInt(ttl, 10),
-      class: c,
-      type: type,
-      dname: dname,
-    })
-  }
-
   /******  EXPORTERS   *******/
   getWireRdata() {
     return this.wirePackDomain(this.get('dname'))
   }
 
-  toBind(zone_opts) {
-    return `${this.getPrefix(zone_opts)}\t${this.getFQDN('dname', zone_opts)}\n`
-  }
-
   toTinydns() {
     return `&${this.getTinyFQDN('owner')}::${this.getTinyFQDN('dname')}:${this.getTinydnsPostamble()}\n`
   }