@push.rocks/smartdns 7.6.1 → 7.8.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. package/dist_rust/rustdns-client_linux_amd64 +0 -0
  2. package/dist_rust/rustdns-client_linux_arm64 +0 -0
  3. package/dist_rust/rustdns_linux_amd64 +0 -0
  4. package/dist_rust/rustdns_linux_arm64 +0 -0
  5. package/dist_ts/00_commitinfo_data.js +1 -1
  6. package/dist_ts_client/classes.dnsclient.d.ts +14 -32
  7. package/dist_ts_client/classes.dnsclient.js +63 -55
  8. package/dist_ts_client/classes.rustdnsclientbridge.d.ts +59 -0
  9. package/dist_ts_client/classes.rustdnsclientbridge.js +110 -0
  10. package/dist_ts_client/index.d.ts +1 -0
  11. package/dist_ts_client/index.js +2 -1
  12. package/dist_ts_client/plugins.d.ts +8 -2
  13. package/dist_ts_client/plugins.js +8 -3
  14. package/dist_ts_server/classes.dnsserver.d.ts +38 -57
  15. package/dist_ts_server/classes.dnsserver.js +180 -702
  16. package/dist_ts_server/classes.rustdnsbridge.d.ts +119 -0
  17. package/dist_ts_server/classes.rustdnsbridge.js +136 -0
  18. package/dist_ts_server/index.d.ts +1 -0
  19. package/dist_ts_server/index.js +2 -1
  20. package/dist_ts_server/plugins.d.ts +8 -8
  21. package/dist_ts_server/plugins.js +7 -9
  22. package/npmextra.json +18 -6
  23. package/package.json +19 -19
  24. package/readme.hints.md +30 -4
  25. package/readme.md +345 -645
  26. package/ts/00_commitinfo_data.ts +1 -1
  27. package/ts/readme.md +47 -0
  28. package/dist_ts_client/dnsly.plugins.d.ts +0 -10
  29. package/dist_ts_client/dnsly.plugins.js +0 -12
  30. package/dist_ts_server/classes.dnssec.d.ts +0 -31
  31. package/dist_ts_server/classes.dnssec.js +0 -155
  32. package/dist_ts_server/classes.dnstools.d.ts +0 -31
  33. package/dist_ts_server/classes.dnstools.js +0 -139
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartdns',
6
- version: '7.6.1',
6
+ version: '7.8.1',
7
7
  description: 'A robust TypeScript library providing advanced DNS management and resolution capabilities including support for DNSSEC, custom DNS servers, and integration with various DNS providers.'
8
8
  }
package/ts/readme.md ADDED
@@ -0,0 +1,47 @@
1
+ # @push.rocks/smartdns
2
+
3
+ Unified entry point that re-exports both the DNS client and DNS server modules.
4
+
5
+ ## Import
6
+
7
+ ```typescript
8
+ import { dnsClientMod, dnsServerMod } from '@push.rocks/smartdns';
9
+ ```
10
+
11
+ ## Modules
12
+
13
+ | Module | Description |
14
+ |---|---|
15
+ | `dnsClientMod` | DNS resolution — system, UDP, DoH strategies via `Smartdns` class |
16
+ | `dnsServerMod` | Authoritative DNS server — UDP, HTTPS, DNSSEC, ACME via `DnsServer` class |
17
+
18
+ ## Usage
19
+
20
+ ```typescript
21
+ import { dnsClientMod, dnsServerMod } from '@push.rocks/smartdns';
22
+
23
+ // Client
24
+ const client = new dnsClientMod.Smartdns({ strategy: 'prefer-udp' });
25
+ const records = await client.getRecordsA('example.com');
26
+ client.destroy();
27
+
28
+ // Server
29
+ const server = new dnsServerMod.DnsServer({
30
+ udpPort: 5333,
31
+ httpsPort: 8443,
32
+ httpsKey: '...',
33
+ httpsCert: '...',
34
+ dnssecZone: 'example.com',
35
+ });
36
+ server.registerHandler('example.com', ['A'], (q) => ({
37
+ name: q.name, type: 'A', class: 'IN', ttl: 300, data: '93.184.215.14',
38
+ }));
39
+ await server.start();
40
+ ```
41
+
42
+ For direct imports, use the sub-module paths:
43
+
44
+ ```typescript
45
+ import { Smartdns } from '@push.rocks/smartdns/client';
46
+ import { DnsServer } from '@push.rocks/smartdns/server';
47
+ ```
@@ -1,10 +0,0 @@
1
- import * as smartenv from '@push.rocks/smartenv';
2
- import type dnsType from 'dns';
3
- declare const dns: typeof dnsType;
4
- export { dns };
5
- import * as smartdelay from '@push.rocks/smartdelay';
6
- import * as smartpromise from '@push.rocks/smartpromise';
7
- import * as smartrequest from '@push.rocks/smartrequest';
8
- export { smartdelay, smartenv, smartpromise, smartrequest };
9
- import * as tsclass from '@tsclass/tsclass';
10
- export { tsclass };
@@ -1,12 +0,0 @@
1
- import * as smartenv from '@push.rocks/smartenv';
2
- const smartenvInstance = new smartenv.Smartenv();
3
- const dns = await smartenvInstance.getSafeNodeModule('dns');
4
- export { dns };
5
- // pushrocks scope
6
- import * as smartdelay from '@push.rocks/smartdelay';
7
- import * as smartpromise from '@push.rocks/smartpromise';
8
- import * as smartrequest from '@push.rocks/smartrequest';
9
- export { smartdelay, smartenv, smartpromise, smartrequest };
10
- import * as tsclass from '@tsclass/tsclass';
11
- export { tsclass };
12
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG5zbHkucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzX2NsaWVudC9kbnNseS5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQztBQUdqRCxNQUFNLEdBQUcsR0FBbUIsTUFBTSxnQkFBZ0IsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUU1RSxPQUFPLEVBQUUsR0FBRyxFQUFFLENBQUM7QUFFZixrQkFBa0I7QUFDbEIsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxZQUFZLE1BQU0sMEJBQTBCLENBQUM7QUFFekQsT0FBTyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsWUFBWSxFQUFFLFlBQVksRUFBRSxDQUFDO0FBRTVELE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFFNUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxDQUFDIn0=
@@ -1,31 +0,0 @@
1
- interface DnssecZone {
2
- zone: string;
3
- algorithm: 'ECDSA' | 'ED25519' | 'RSA';
4
- keySize: number;
5
- days: number;
6
- }
7
- interface DnssecKeyPair {
8
- privateKey: string;
9
- publicKey: string;
10
- }
11
- export declare class DnsSec {
12
- private zone;
13
- private keyPair;
14
- private ec?;
15
- private eddsa?;
16
- constructor(zone: DnssecZone);
17
- private generateKeyPair;
18
- getAlgorithmNumber(): number;
19
- signData(data: Buffer): Buffer;
20
- private generateDNSKEY;
21
- private computeKeyTag;
22
- private getDNSKEYRecord;
23
- getDSRecord(): string;
24
- getKeyPair(): DnssecKeyPair;
25
- getDsAndKeyPair(): {
26
- keyPair: DnssecKeyPair;
27
- dsRecord: string;
28
- dnskeyRecord: string;
29
- };
30
- }
31
- export {};
@@ -1,155 +0,0 @@
1
- // Import necessary plugins from plugins.ts
2
- import * as plugins from './plugins.js';
3
- export class DnsSec {
4
- constructor(zone) {
5
- this.zone = zone;
6
- // Initialize the appropriate cryptographic instance based on the algorithm
7
- switch (this.zone.algorithm) {
8
- case 'ECDSA':
9
- this.ec = new plugins.elliptic.ec('p256'); // Use P-256 curve for ECDSA
10
- break;
11
- case 'ED25519':
12
- this.eddsa = new plugins.elliptic.eddsa('ed25519');
13
- break;
14
- case 'RSA':
15
- // RSA implementation would go here
16
- throw new Error('RSA algorithm is not yet implemented.');
17
- default:
18
- throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
19
- }
20
- // Generate the key pair
21
- this.keyPair = this.generateKeyPair();
22
- }
23
- generateKeyPair() {
24
- let privateKey;
25
- let publicKey;
26
- switch (this.zone.algorithm) {
27
- case 'ECDSA':
28
- if (!this.ec)
29
- throw new Error('EC instance is not initialized.');
30
- const ecKeyPair = this.ec.genKeyPair();
31
- privateKey = ecKeyPair.getPrivate('hex');
32
- publicKey = ecKeyPair.getPublic(false, 'hex'); // Uncompressed format
33
- break;
34
- case 'ED25519':
35
- if (!this.eddsa)
36
- throw new Error('EdDSA instance is not initialized.');
37
- const secret = plugins.crypto.randomBytes(32);
38
- const edKeyPair = this.eddsa.keyFromSecret(secret);
39
- privateKey = edKeyPair.getSecret('hex');
40
- publicKey = edKeyPair.getPublic('hex');
41
- break;
42
- case 'RSA':
43
- // RSA key generation would be implemented here
44
- throw new Error('RSA key generation is not yet implemented.');
45
- default:
46
- throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
47
- }
48
- return { privateKey, publicKey };
49
- }
50
- getAlgorithmNumber() {
51
- switch (this.zone.algorithm) {
52
- case 'ECDSA':
53
- return 13; // ECDSAP256SHA256
54
- case 'ED25519':
55
- return 15;
56
- case 'RSA':
57
- return 8; // RSASHA256
58
- default:
59
- throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
60
- }
61
- }
62
- signData(data) {
63
- switch (this.zone.algorithm) {
64
- case 'ECDSA':
65
- if (!this.ec)
66
- throw new Error('EC instance is not initialized.');
67
- const ecKeyPair = this.ec.keyFromPrivate(this.keyPair.privateKey, 'hex');
68
- const ecSignature = ecKeyPair.sign(plugins.crypto.createHash('sha256').update(data).digest());
69
- return Buffer.from(ecSignature.toDER());
70
- case 'ED25519':
71
- if (!this.eddsa)
72
- throw new Error('EdDSA instance is not initialized.');
73
- const edKeyPair = this.eddsa.keyFromSecret(Buffer.from(this.keyPair.privateKey, 'hex'));
74
- // ED25519 doesn't need a separate hash function as it includes the hashing internally
75
- const edSignature = edKeyPair.sign(data);
76
- // Convert the signature to the correct format for Buffer.from
77
- return Buffer.from(edSignature.toBytes());
78
- case 'RSA':
79
- throw new Error('RSA signing is not yet implemented.');
80
- default:
81
- throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
82
- }
83
- }
84
- generateDNSKEY() {
85
- const flags = 256; // 256 indicates a Zone Signing Key (ZSK)
86
- const protocol = 3; // Must be 3 according to RFC
87
- const algorithm = this.getAlgorithmNumber();
88
- let publicKeyData;
89
- switch (this.zone.algorithm) {
90
- case 'ECDSA':
91
- if (!this.ec)
92
- throw new Error('EC instance is not initialized.');
93
- const ecPublicKey = this.ec.keyFromPublic(this.keyPair.publicKey, 'hex').getPublic();
94
- const x = ecPublicKey.getX().toArrayLike(Buffer, 'be', 32);
95
- const y = ecPublicKey.getY().toArrayLike(Buffer, 'be', 32);
96
- publicKeyData = Buffer.concat([x, y]);
97
- break;
98
- case 'ED25519':
99
- publicKeyData = Buffer.from(this.keyPair.publicKey, 'hex');
100
- break;
101
- case 'RSA':
102
- // RSA public key extraction would go here
103
- throw new Error('RSA public key extraction is not yet implemented.');
104
- default:
105
- throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
106
- }
107
- // Construct the DNSKEY RDATA
108
- const dnskeyRdata = Buffer.concat([
109
- Buffer.from([flags >> 8, flags & 0xff]), // Flags (2 bytes)
110
- Buffer.from([protocol]), // Protocol (1 byte)
111
- Buffer.from([algorithm]), // Algorithm (1 byte)
112
- publicKeyData, // Public Key
113
- ]);
114
- return dnskeyRdata;
115
- }
116
- computeKeyTag(dnskeyRdata) {
117
- // Key Tag calculation as per RFC 4034, Appendix B
118
- let acc = 0;
119
- for (let i = 0; i < dnskeyRdata.length; i++) {
120
- acc += i & 1 ? dnskeyRdata[i] : dnskeyRdata[i] << 8;
121
- }
122
- acc += (acc >> 16) & 0xffff;
123
- return acc & 0xffff;
124
- }
125
- getDNSKEYRecord() {
126
- const dnskeyRdata = this.generateDNSKEY();
127
- const flags = 256;
128
- const protocol = 3;
129
- const algorithm = this.getAlgorithmNumber();
130
- const publicKeyData = dnskeyRdata.slice(4); // Skip flags, protocol, algorithm bytes
131
- const publicKeyBase64 = publicKeyData.toString('base64');
132
- return `${this.zone.zone}. IN DNSKEY ${flags} ${protocol} ${algorithm} ${publicKeyBase64}`;
133
- }
134
- getDSRecord() {
135
- const dnskeyRdata = this.generateDNSKEY();
136
- const keyTag = this.computeKeyTag(dnskeyRdata);
137
- const algorithm = this.getAlgorithmNumber();
138
- const digestType = 2; // SHA-256
139
- const digest = plugins.crypto
140
- .createHash('sha256')
141
- .update(dnskeyRdata)
142
- .digest('hex')
143
- .toUpperCase();
144
- return `${this.zone.zone}. IN DS ${keyTag} ${algorithm} ${digestType} ${digest}`;
145
- }
146
- getKeyPair() {
147
- return this.keyPair;
148
- }
149
- getDsAndKeyPair() {
150
- const dsRecord = this.getDSRecord();
151
- const dnskeyRecord = this.getDNSKEYRecord();
152
- return { keyPair: this.keyPair, dsRecord, dnskeyRecord };
153
- }
154
- }
155
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5kbnNzZWMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90c19zZXJ2ZXIvY2xhc3Nlcy5kbnNzZWMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsMkNBQTJDO0FBQzNDLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBY3hDLE1BQU0sT0FBTyxNQUFNO0lBTWpCLFlBQVksSUFBZ0I7UUFDMUIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFFakIsMkVBQTJFO1FBQzNFLFFBQVEsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUM1QixLQUFLLE9BQU87Z0JBQ1YsSUFBSSxDQUFDLEVBQUUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsNEJBQTRCO2dCQUN2RSxNQUFNO1lBQ1IsS0FBSyxTQUFTO2dCQUNaLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztnQkFDbkQsTUFBTTtZQUNSLEtBQUssS0FBSztnQkFDUixtQ0FBbUM7Z0JBQ25DLE1BQU0sSUFBSSxLQUFLLENBQUMsdUNBQXVDLENBQUMsQ0FBQztZQUMzRDtnQkFDRSxNQUFNLElBQUksS0FBSyxDQUFDLDBCQUEwQixJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7UUFDckUsQ0FBQztRQUVELHdCQUF3QjtRQUN4QixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUN4QyxDQUFDO0lBRU8sZUFBZTtRQUNyQixJQUFJLFVBQWtCLENBQUM7UUFDdkIsSUFBSSxTQUFpQixDQUFDO1FBRXRCLFFBQVEsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUM1QixLQUFLLE9BQU87Z0JBQ1YsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFO29CQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLENBQUMsQ0FBQztnQkFDakUsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQztnQkFDdkMsVUFBVSxHQUFHLFNBQVMsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7Z0JBQ3pDLFNBQVMsR0FBRyxTQUFTLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLHNCQUFzQjtnQkFDckUsTUFBTTtZQUNSLEtBQUssU0FBUztnQkFDWixJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUs7b0JBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO2dCQUN2RSxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQztnQkFDOUMsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQ25ELFVBQVUsR0FBRyxTQUFTLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDO2dCQUN4QyxTQUFTLEdBQUcsU0FBUyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQztnQkFDdkMsTUFBTTtZQUNSLEtBQUssS0FBSztnQkFDUiwrQ0FBK0M7Z0JBQy9DLE1BQU0sSUFBSSxLQUFLLENBQUMsNENBQTRDLENBQUMsQ0FBQztZQUNoRTtnQkFDRSxNQUFNLElBQUksS0FBSyxDQUFDLDBCQUEwQixJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7UUFDckUsQ0FBQztRQUVELE9BQU8sRUFBRSxVQUFVLEVBQUUsU0FBUyxFQUFFLENBQUM7SUFDbkMsQ0FBQztJQUVNLGtCQUFrQjtRQUN2QixRQUFRLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDNUIsS0FBSyxPQUFPO2dCQUNWLE9BQU8sRUFBRSxDQUFDLENBQUMsa0JBQWtCO1lBQy9CLEtBQUssU0FBUztnQkFDWixPQUFPLEVBQUUsQ0FBQztZQUNaLEtBQUssS0FBSztnQkFDUixPQUFPLENBQUMsQ0FBQyxDQUFDLFlBQVk7WUFDeEI7Z0JBQ0UsTUFBTSxJQUFJLEtBQUssQ0FBQywwQkFBMEIsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDO1FBQ3JFLENBQUM7SUFDSCxDQUFDO0lBRU0sUUFBUSxDQUFDLElBQVk7UUFDMUIsUUFBUSxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQzVCLEtBQUssT0FBTztnQkFDVixJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUU7b0JBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFDO2dCQUNqRSxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsQ0FBQztnQkFDekUsTUFBTSxXQUFXLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztnQkFDOUYsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO1lBRTFDLEtBQUssU0FBUztnQkFDWixJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUs7b0JBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO2dCQUN2RSxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7Z0JBQ3hGLHNGQUFzRjtnQkFDdEYsTUFBTSxXQUFXLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDekMsOERBQThEO2dCQUM5RCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFFNUMsS0FBSyxLQUFLO2dCQUNSLE1BQU0sSUFBSSxLQUFLLENBQUMscUNBQXFDLENBQUMsQ0FBQztZQUV6RDtnQkFDRSxNQUFNLElBQUksS0FBSyxDQUFDLDBCQUEwQixJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7UUFDckUsQ0FBQztJQUNILENBQUM7SUFFTyxjQUFjO1FBQ3BCLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxDQUFDLHlDQUF5QztRQUM1RCxNQUFNLFFBQVEsR0FBRyxDQUFDLENBQUMsQ0FBQyw2QkFBNkI7UUFDakQsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUM7UUFFNUMsSUFBSSxhQUFxQixDQUFDO1FBRTFCLFFBQVEsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUM1QixLQUFLLE9BQU87Z0JBQ1YsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFO29CQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLENBQUMsQ0FBQztnQkFDakUsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUM7Z0JBQ3JGLE1BQU0sQ0FBQyxHQUFHLFdBQVcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxXQUFXLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQztnQkFDM0QsTUFBTSxDQUFDLEdBQUcsV0FBVyxDQUFDLElBQUksRUFBRSxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO2dCQUMzRCxhQUFhLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUN0QyxNQUFNO1lBQ1IsS0FBSyxTQUFTO2dCQUNaLGFBQWEsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFDO2dCQUMzRCxNQUFNO1lBQ1IsS0FBSyxLQUFLO2dCQUNSLDBDQUEwQztnQkFDMUMsTUFBTSxJQUFJLEtBQUssQ0FBQyxtREFBbUQsQ0FBQyxDQUFDO1lBQ3ZFO2dCQUNFLE1BQU0sSUFBSSxLQUFLLENBQUMsMEJBQTBCLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQztRQUNyRSxDQUFDO1FBRUQsNkJBQTZCO1FBQzdCLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUM7WUFDaEMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLEtBQUssSUFBSSxDQUFDLEVBQUUsS0FBSyxHQUFHLElBQUksQ0FBQyxDQUFDLEVBQUUsa0JBQWtCO1lBQzNELE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLG9CQUFvQjtZQUM3QyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxxQkFBcUI7WUFDL0MsYUFBYSxFQUFFLGFBQWE7U0FDN0IsQ0FBQyxDQUFDO1FBRUgsT0FBTyxXQUFXLENBQUM7SUFDckIsQ0FBQztJQUVPLGFBQWEsQ0FBQyxXQUFtQjtRQUN2QyxrREFBa0Q7UUFDbEQsSUFBSSxHQUFHLEdBQUcsQ0FBQyxDQUFDO1FBQ1osS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUM1QyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RELENBQUM7UUFDRCxHQUFHLElBQUksQ0FBQyxHQUFHLElBQUksRUFBRSxDQUFDLEdBQUcsTUFBTSxDQUFDO1FBQzVCLE9BQU8sR0FBRyxHQUFHLE1BQU0sQ0FBQztJQUN0QixDQUFDO0lBRU8sZUFBZTtRQUNyQixNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDMUMsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDO1FBQ2xCLE1BQU0sUUFBUSxHQUFHLENBQUMsQ0FBQztRQUNuQixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztRQUM1QyxNQUFNLGFBQWEsR0FBRyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsd0NBQXdDO1FBQ3BGLE1BQU0sZUFBZSxHQUFHLGFBQWEsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7UUFFekQsT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxlQUFlLEtBQUssSUFBSSxRQUFRLElBQUksU0FBUyxJQUFJLGVBQWUsRUFBRSxDQUFDO0lBQzdGLENBQUM7SUFFTSxXQUFXO1FBQ2hCLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUMxQyxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQy9DLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1FBQzVDLE1BQU0sVUFBVSxHQUFHLENBQUMsQ0FBQyxDQUFDLFVBQVU7UUFDaEMsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU07YUFDMUIsVUFBVSxDQUFDLFFBQVEsQ0FBQzthQUNwQixNQUFNLENBQUMsV0FBVyxDQUFDO2FBQ25CLE1BQU0sQ0FBQyxLQUFLLENBQUM7YUFDYixXQUFXLEVBQUUsQ0FBQztRQUVqQixPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLFdBQVcsTUFBTSxJQUFJLFNBQVMsSUFBSSxVQUFVLElBQUksTUFBTSxFQUFFLENBQUM7SUFDbkYsQ0FBQztJQUVNLFVBQVU7UUFDZixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDdEIsQ0FBQztJQUVNLGVBQWU7UUFDcEIsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ3BDLE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztRQUM1QyxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPLEVBQUUsUUFBUSxFQUFFLFlBQVksRUFBRSxDQUFDO0lBQzNELENBQUM7Q0FDRiJ9
@@ -1,31 +0,0 @@
1
- interface DnssecZone {
2
- zone: string;
3
- algorithm: 'ECDSA' | 'ED25519' | 'RSA';
4
- keySize: number;
5
- days: number;
6
- }
7
- interface DnssecKeyPair {
8
- privateKey: string;
9
- publicKey: string;
10
- }
11
- export declare class DnsSec {
12
- private zone;
13
- private keyPair;
14
- private ec?;
15
- private eddsa?;
16
- constructor(zone: DnssecZone);
17
- private generateKeyPair;
18
- private getAlgorithmNumber;
19
- signData(data: Buffer): Buffer;
20
- private generateDNSKEY;
21
- private computeKeyTag;
22
- private getDNSKEYRecord;
23
- getDSRecord(): string;
24
- getKeyPair(): DnssecKeyPair;
25
- getDsAndKeyPair(): {
26
- keyPair: DnssecKeyPair;
27
- dsRecord: string;
28
- dnskeyRecord: string;
29
- };
30
- }
31
- export {};
@@ -1,139 +0,0 @@
1
- // Import necessary plugins from plugins.ts
2
- import * as plugins from './plugins.js';
3
- export class DnsSec {
4
- constructor(zone) {
5
- this.zone = zone;
6
- // Initialize the appropriate cryptographic instance based on the algorithm
7
- switch (this.zone.algorithm) {
8
- case 'ECDSA':
9
- this.ec = new plugins.elliptic.ec('p256'); // Use P-256 curve for ECDSA
10
- break;
11
- case 'ED25519':
12
- this.eddsa = new plugins.elliptic.eddsa('ed25519');
13
- break;
14
- case 'RSA':
15
- // RSA implementation would go here
16
- throw new Error('RSA algorithm is not yet implemented.');
17
- default:
18
- throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
19
- }
20
- // Generate the key pair
21
- this.keyPair = this.generateKeyPair();
22
- }
23
- generateKeyPair() {
24
- let privateKey;
25
- let publicKey;
26
- switch (this.zone.algorithm) {
27
- case 'ECDSA':
28
- if (!this.ec)
29
- throw new Error('EC instance is not initialized.');
30
- const ecKeyPair = this.ec.genKeyPair();
31
- privateKey = ecKeyPair.getPrivate('hex');
32
- publicKey = ecKeyPair.getPublic(false, 'hex'); // Uncompressed format
33
- break;
34
- case 'ED25519':
35
- if (!this.eddsa)
36
- throw new Error('EdDSA instance is not initialized.');
37
- const secret = plugins.crypto.randomBytes(32);
38
- const edKeyPair = this.eddsa.keyFromSecret(secret);
39
- privateKey = edKeyPair.getSecret('hex');
40
- publicKey = edKeyPair.getPublic('hex');
41
- break;
42
- case 'RSA':
43
- // RSA key generation would be implemented here
44
- throw new Error('RSA key generation is not yet implemented.');
45
- default:
46
- throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
47
- }
48
- return { privateKey, publicKey };
49
- }
50
- getAlgorithmNumber() {
51
- switch (this.zone.algorithm) {
52
- case 'ECDSA':
53
- return 13; // ECDSAP256SHA256
54
- case 'ED25519':
55
- return 15;
56
- case 'RSA':
57
- return 8; // RSASHA256
58
- default:
59
- throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
60
- }
61
- }
62
- signData(data) {
63
- // Sign the data using the private key
64
- const keyPair = this.ec.keyFromPrivate(this.keyPair.privateKey, 'hex');
65
- const signature = keyPair.sign(plugins.crypto.createHash('sha256').update(data).digest());
66
- return Buffer.from(signature.toDER());
67
- }
68
- generateDNSKEY() {
69
- const flags = 256; // 256 indicates a Zone Signing Key (ZSK)
70
- const protocol = 3; // Must be 3 according to RFC
71
- const algorithm = this.getAlgorithmNumber();
72
- let publicKeyData;
73
- switch (this.zone.algorithm) {
74
- case 'ECDSA':
75
- if (!this.ec)
76
- throw new Error('EC instance is not initialized.');
77
- const ecPublicKey = this.ec.keyFromPublic(this.keyPair.publicKey, 'hex').getPublic();
78
- const x = ecPublicKey.getX().toArrayLike(Buffer, 'be', 32);
79
- const y = ecPublicKey.getY().toArrayLike(Buffer, 'be', 32);
80
- publicKeyData = Buffer.concat([x, y]);
81
- break;
82
- case 'ED25519':
83
- publicKeyData = Buffer.from(this.keyPair.publicKey, 'hex');
84
- break;
85
- case 'RSA':
86
- // RSA public key extraction would go here
87
- throw new Error('RSA public key extraction is not yet implemented.');
88
- default:
89
- throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
90
- }
91
- // Construct the DNSKEY RDATA
92
- const dnskeyRdata = Buffer.concat([
93
- Buffer.from([flags >> 8, flags & 0xff]), // Flags (2 bytes)
94
- Buffer.from([protocol]), // Protocol (1 byte)
95
- Buffer.from([algorithm]), // Algorithm (1 byte)
96
- publicKeyData, // Public Key
97
- ]);
98
- return dnskeyRdata;
99
- }
100
- computeKeyTag(dnskeyRdata) {
101
- // Key Tag calculation as per RFC 4034, Appendix B
102
- let acc = 0;
103
- for (let i = 0; i < dnskeyRdata.length; i++) {
104
- acc += i & 1 ? dnskeyRdata[i] : dnskeyRdata[i] << 8;
105
- }
106
- acc += (acc >> 16) & 0xffff;
107
- return acc & 0xffff;
108
- }
109
- getDNSKEYRecord() {
110
- const dnskeyRdata = this.generateDNSKEY();
111
- const flags = 256;
112
- const protocol = 3;
113
- const algorithm = this.getAlgorithmNumber();
114
- const publicKeyData = dnskeyRdata.slice(4); // Skip flags, protocol, algorithm bytes
115
- const publicKeyBase64 = publicKeyData.toString('base64');
116
- return `${this.zone.zone}. IN DNSKEY ${flags} ${protocol} ${algorithm} ${publicKeyBase64}`;
117
- }
118
- getDSRecord() {
119
- const dnskeyRdata = this.generateDNSKEY();
120
- const keyTag = this.computeKeyTag(dnskeyRdata);
121
- const algorithm = this.getAlgorithmNumber();
122
- const digestType = 2; // SHA-256
123
- const digest = plugins.crypto
124
- .createHash('sha256')
125
- .update(dnskeyRdata)
126
- .digest('hex')
127
- .toUpperCase();
128
- return `${this.zone.zone}. IN DS ${keyTag} ${algorithm} ${digestType} ${digest}`;
129
- }
130
- getKeyPair() {
131
- return this.keyPair;
132
- }
133
- getDsAndKeyPair() {
134
- const dsRecord = this.getDSRecord();
135
- const dnskeyRecord = this.getDNSKEYRecord();
136
- return { keyPair: this.keyPair, dsRecord, dnskeyRecord };
137
- }
138
- }
139
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5kbnN0b29scy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzX3NlcnZlci9jbGFzc2VzLmRuc3Rvb2xzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDJDQUEyQztBQUMzQyxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQWN4QyxNQUFNLE9BQU8sTUFBTTtJQU1qQixZQUFZLElBQWdCO1FBQzFCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBRWpCLDJFQUEyRTtRQUMzRSxRQUFRLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDNUIsS0FBSyxPQUFPO2dCQUNWLElBQUksQ0FBQyxFQUFFLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLDRCQUE0QjtnQkFDdkUsTUFBTTtZQUNSLEtBQUssU0FBUztnQkFDWixJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUM7Z0JBQ25ELE1BQU07WUFDUixLQUFLLEtBQUs7Z0JBQ1IsbUNBQW1DO2dCQUNuQyxNQUFNLElBQUksS0FBSyxDQUFDLHVDQUF1QyxDQUFDLENBQUM7WUFDM0Q7Z0JBQ0UsTUFBTSxJQUFJLEtBQUssQ0FBQywwQkFBMEIsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDO1FBQ3JFLENBQUM7UUFFRCx3QkFBd0I7UUFDeEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDeEMsQ0FBQztJQUVPLGVBQWU7UUFDckIsSUFBSSxVQUFrQixDQUFDO1FBQ3ZCLElBQUksU0FBaUIsQ0FBQztRQUV0QixRQUFRLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDNUIsS0FBSyxPQUFPO2dCQUNWLElBQUksQ0FBQyxJQUFJ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