trac-msb 0.1.15 → 0.1.16

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"

package/src/index.js

@@ -538,10 +538,8 @@ export class MainSettlementBus extends ReadyResource {
         return entry !== null ? entry.value : null
     }
 
-    async #handleIncomingEvent(data) {
+    async #handleIncomingEvent(parsedRequest) {
         try {
-            const bufferData = data.toString();
-            const parsedRequest = JSON.parse(bufferData);
             if (parsedRequest && parsedRequest.type && parsedRequest.key && parsedRequest.value) {
                 if (parsedRequest.type === OperationType.ADD_WRITER || parsedRequest.type === OperationType.REMOVE_WRITER) {
                     //This request must be hanlded by ADMIN
@@ -604,7 +602,7 @@ export class MainSettlementBus extends ReadyResource {
         this.on(EventType.ADMIN_EVENT, async (parsedRequest) => {
             if (this.#enable_wallet === false) return;
             const isWhitelisted = await this.#isWhitelisted(parsedRequest.key);
-            const isEventMessageVerifed = await MsgUtils.verifyEventMessage(parsedRequest, this.#wallet)
+            const isEventMessageVerifed = await MsgUtils.verifyEventMessage(parsedRequest, this.#wallet, this.check)
             if (isWhitelisted && isEventMessageVerifed) {
                 await this.#base.append(parsedRequest);
             }
@@ -615,7 +613,7 @@ export class MainSettlementBus extends ReadyResource {
         this.on(EventType.WRITER_EVENT, async (parsedRequest) => {
             if (this.#enable_wallet === false) return;
             const adminEntry = await this.get(EntryType.ADMIN);
-            const isEventMessageVerifed = await MsgUtils.verifyEventMessage(parsedRequest, this.#wallet)
+            const isEventMessageVerifed = await MsgUtils.verifyEventMessage(parsedRequest, this.#wallet, this.check)
             if (adminEntry && adminEntry.tracPublicKey === parsedRequest.key && isEventMessageVerifed) {
                 await this.#base.append(parsedRequest);
             }

package/src/network.js

@@ -38,7 +38,7 @@ class Network {
                 };
             }
 
-            swarm = new Hyperswarm({ keyPair, randomPunchInterval: 5_000, bootstrap : bootstrap, maxPeers: MAX_PEERS, maxParallel: MAX_PARALLEL, maxServerConnections: MAX_SERVER_CONNECTIONS, maxClientConnections :  MAX_CLIENT_CONNECTIONS});
+            swarm = new Hyperswarm({ keyPair, bootstrap : bootstrap, maxPeers: MAX_PEERS, maxParallel: MAX_PARALLEL, maxServerConnections: MAX_SERVER_CONNECTIONS, maxClientConnections :  MAX_CLIENT_CONNECTIONS});
 
             console.log(`Channel: ${b4a.toString(channel)}`);
             swarm.on('connection', async (connection) => {
@@ -46,13 +46,11 @@ class Network {
                 store.replicate(connection);
                 connection.on('close', () => { });
                 connection.on('error', (error) => { });
-                connection.on('data', async (data) => {
-                    await handleIncomingEvent(data);
-                });
 
                 if(enable_txchannel){
                     connection.on('message', async (msg) =>  {
                         try{
+                            const tmp_message = msg;
                             msg = b4a.toString(msg, 'utf-8');
                             msg = JSON.parse(msg);
                             if(null === msg) return;
@@ -67,7 +65,7 @@ class Network {
                                 const isAllowedToRequestRole = await msb._isAllowedToRequestRole(msg.key, adminEntry);
                                 const canAddWriter = base.writable && !isAlreadyWriter && isAllowedToRequestRole;
                                 if(msg.key !== wallet.publicKey && canAddWriter){
-                                    await base.append(msg);
+                                    await handleIncomingEvent(msg);
                                 }
                                 await connection.end();
                             } else if (msg.type !== undefined && msg.key !== undefined && msg.value !== undefined && msg.type === 'removeWriter') {
@@ -77,7 +75,7 @@ class Network {
                                 const isAlreadyWriter = null !== nodeEntry && nodeEntry.isWriter;
                                 const canRemoveWriter = base.writable && isAlreadyWriter
                                 if (msg.key !== wallet.publicKey && canRemoveWriter) {
-                                    await base.append(msg);
+                                    await handleIncomingEvent(msg);
                                 }
                                 await connection.end();
                             }
@@ -90,7 +88,7 @@ class Network {
                                     return
                                 }
 
-                                if (b4a.byteLength(msg) > 3072) return;
+                                if (b4a.byteLength(tmp_message) > 3072) return;
 
                                 const parsedPreTx = msg;
 

package/src/utils/msgUtils.js

@@ -115,11 +115,21 @@ class MsgUtils {
         return await this.#assembleMessageBase(wallet, validatorTracPublicKey, OperationType.BAN_VALIDATOR);
     }
 
-    static async verifyEventMessage(parsedRequest, wallet) {
-        //TODO: Here we can add some sanitization
-        const msg = this.createMessage(parsedRequest.key, parsedRequest.value.wk, parsedRequest.value.nonce, parsedRequest.type);
+    static async verifyEventMessage(parsedRequest, wallet, check) {
+        const { type, key, value } = parsedRequest;
+        if (
+            type !== OperationType.ADD_ADMIN &&
+            type !== OperationType.ADD_WRITER &&
+            type !== OperationType.REMOVE_WRITER
+        ) {
+            return false;
+        }
+        const sanitizationResult = check.sanitizeAdminAndWritersOperations(parsedRequest);
+        if (!sanitizationResult) return false;
+
+        const msg = this.createMessage(key, value.wk, value.nonce, type);
         const hash = await createHash('sha256', msg);
-        return wallet.verify(parsedRequest.value.sig, hash, parsedRequest.key);
+        return wallet.verify(value.sig, hash, key);
     }
 
 }

package/src/writerManager.js

@@ -1,75 +0,0 @@
-import ReadyResource from 'ready-resource';
-import { createHash } from 'utils/functions.js';
-import fs from 'fs';
-//TODO: GENERATE NONCE WITH CRYPTO LIBRARY WHICH ALLOW US TO GENERATE IT WITH UNIFORM DISTRIBUTION.
-
-const FILEPATH = './whitelist/pubkeys.csv';
-
-export class WriterManager extends ReadyResource {
-    constructor(msbInstance) {
-        super();
-        this.msbInstance = msbInstance;
-    }
-
-    async addAdmin() {
-        // case where admin entry doesn't exist yet and we have to autorize Admin public key only with bootstrap writing key
-        const adminEntry = await this.msbInstance.get('admin');
-        if (!adminEntry && this.msbInstance.writingKey && this.msbInstance.writingKey === this.msbInstance.bootstrap) {
-
-            const nonce = Math.random() + '-' + Date.now();
-            const msg = Buffer.concat(
-                [
-                    Buffer.from(this.msbInstance.wallet.publicKey, 'hex'),
-                    Buffer.from(nonce),
-                ]
-            )
-
-            const hash = await createHash('sha256', msg);
-            await this.msbInstance.base.append({
-                type: 'addAdmin',
-                key: 'admin',
-                value: {
-                    tpk: this.msbInstance.wallet.publicKey,
-                    nonce: nonce,
-                    pop: this.msbInstance.wallet.sign(hash)
-                }
-            });
-        }
-        // case where admin entry exists and we won't anymore use bootstrap writig key. It can be implemented when list of authorized writers is implemented.
-        // if (adminEntry && this.msbInstance.writingKey) {
-        // }
-    }
-    async appendToWhitelist() {
-        //who can use this method? only admin
-        try {
-            //TODO: IMPORTANT -  IF WE GONNA STORE ~ 2K-10K PUBLIC KEYS IN THE LIST, WE NEED TO SPLIT IT INTO CHUNKS
-            // ONE CHUNK WILL BE ~100 PUBLIC KEYS + NONCE + SIG AND ADDITIONAL BYTES < 4096 BYTES. ADMIN WILL NEED TO PERFORM MULTIPLE APPENDS. FOR NOW THIS IS NOT IMPLEMENTED.
-            const adminEntry = await this.msbInstance.get('admin');
-            
-            if (adminEntry && this.msbInstance.wallet.publicKey === Buffer.from(adminEntry.tpk.data).toString('hex')) {
-            
-            const pubKeys = fs.readFileSync(FILEPATH, 'utf8').split('\n').map(line =>line.trim()).filter(line => line.length > 0); // pub keys are 32 bytes long. Take lines which have this length
-            const nonce = Math.random() + '-' + Date.now();
-            const msg = Buffer.concat(
-                [
-                    Buffer.from(pubKeys.join('')),
-                    Buffer.from(nonce),
-                ]
-            )
-            const hash = await createHash('sha256', msg);
-            await this.msbInstance.base.append({
-                type: 'whitelist',
-                key: 'list',
-                value: {
-                    nonce: nonce,
-                    pubKeysList: JSON.stringify(pubKeys),
-                    sig: this.msbInstance.wallet.sign(hash)
-                }
-            });
-            }
-        }catch(e) {
-            console.log('Error reading file', e);
-        }
-    }
-}
-export default WriterManager;