Feature/1897 psk

packages/backend/package.json

@@ -65,7 +65,7 @@
 		"@types/orbit-db": "git+https://github.com/orbitdb/orbit-db-types.git",
 		"@types/supertest": "^2.0.11",
 		"@types/tmp": "^0.2.3",
-		"@types/validator": "^13.1.4",
+		"@types/validator": "^13.11.5",
 		"@types/ws": "8.5.3",
 		"babel-jest": "^29.3.1",
 		"cross-env": "^5.2.0",
@@ -134,7 +134,7 @@
 		"socks-proxy-agent": "^5.0.0",
 		"string-replace-loader": "3.1.0",
 		"ts-jest-resolver": "^2.0.0",
-		"validator": "^13.6.0"
+		"validator": "^13.11.0"
 	},
 	"overrides": {
 		"level": "$level",

packages/backend/src/nest/common/utils.ts

@@ -10,9 +10,10 @@ import crypto from 'crypto'
 import { type PermsData } from '@quiet/types'
 import { TestConfig } from '../const'
 import logger from './logger'
-import { createCertificatesTestHelper } from './client-server'
 import { Libp2pNodeParams } from '../libp2p/libp2p.types'
 import { createLibp2pAddress, createLibp2pListenAddress } from '@quiet/common'
+import { Libp2pService } from '../libp2p/libp2p.service'
+
 const log = logger('test')
 
 export interface Ports {
@@ -189,20 +190,20 @@ export const testBootstrapMultiaddrs = [
 ]
 
 export const libp2pInstanceParams = async (): Promise<Libp2pNodeParams> => {
-  const pems = await createCertificatesTestHelper('address1.onion', 'address2.onion')
   const port = await getPort()
   const peerId = await createPeerId()
   const address = '0.0.0.0'
   const peerIdRemote = await createPeerId()
   const remoteAddress = createLibp2pAddress(address, peerIdRemote.toString())
-
+  const libp2pKey = Libp2pService.generateLibp2pPSK().fullKey
   return {
     peerId,
     listenAddresses: [createLibp2pListenAddress('localhost')],
     agent: createHttpsProxyAgent({ port: 1234, host: 'localhost' }),
     localAddress: createLibp2pAddress('localhost', peerId.toString()),
     targetPort: port,
     peers: [remoteAddress],
+    psk: libp2pKey,
   }
 }
 

packages/backend/src/nest/connections-manager/connections-manager.service.tor.spec.ts

@@ -87,8 +87,6 @@ beforeEach(async () => {
   localDbService = await module.resolve(LocalDbService)
   registrationService = await module.resolve(RegistrationService)
   tor = await module.resolve(Tor)
-
-  console.log('tor ', tor)
   await tor.init()
 
   const torPassword = crypto.randomBytes(16).toString('hex')
@@ -106,6 +104,9 @@ beforeEach(async () => {
   connectionsManagerService.libp2pService = libp2pService
 
   quietDir = await module.resolve(QUIET_DIR)
+
+  const pskBase64 = Libp2pService.generateLibp2pPSK().psk
+  await localDbService.put(LocalDBKeys.PSK, pskBase64)
 })
 
 afterEach(async () => {
@@ -117,11 +118,6 @@ afterEach(async () => {
 })
 
 describe('Connections manager', () => {
-  it('runs tor by default', async () => {
-    await connectionsManagerService.init()
-    console.log(connectionsManagerService.isTorInit)
-  })
-
   it('saves peer stats when peer has been disconnected', async () => {
     class RemotePeerEventDetail {
       peerId: string
@@ -135,7 +131,6 @@ describe('Connections manager', () => {
       }
     }
     const emitSpy = jest.spyOn(libp2pService, 'emit')
-    // const emitSpy = jest.spyOn(libp2pService, 'emit')
 
     const launchCommunityPayload: InitCommunityPayload = {
       id: community.id,

packages/backend/src/nest/connections-manager/connections-manager.service.ts

@@ -9,6 +9,7 @@ import { EventEmitter } from 'events'
 import getPort from 'get-port'
 import PeerId from 'peer-id'
 import { removeFilesFromDir } from '../common/utils'
+import validator from 'validator'
 import {
   AskForMessagesPayload,
   ChannelMessagesIdsResponse,
@@ -59,6 +60,9 @@ import { StorageEvents } from '../storage/storage.types'
 import { LazyModuleLoader } from '@nestjs/core'
 import Logger from '../common/logger'
 import { emitError } from '../socket/socket.errors'
+import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
+import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+import { isPSKcodeValid } from '@quiet/common'
 
 @Injectable()
 export class ConnectionsManagerService extends EventEmitter implements OnModuleInit {
@@ -274,11 +278,35 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
       },
       network,
     }
+    const psk = community.psk
+    if (psk) {
+      console.log('createNetwork got psk', psk)
+      if (!isPSKcodeValid(psk)) {
+        emitError(this.serverIoProvider.io, {
+          type: SocketActionTypes.NETWORK,
+          message: ErrorMessages.NETWORK_SETUP_FAILED,
+          community: community.id,
+        })
+        return
+      }
+      await this.localDbService.put(LocalDBKeys.PSK, psk)
+    }
+
     this.serverIoProvider.io.emit(SocketActionTypes.NETWORK, payload)
   }
 
+  private async generatePSK() {
+    const pskBase64 = Libp2pService.generateLibp2pPSK().psk
+    await this.localDbService.put(LocalDBKeys.PSK, pskBase64)
+    console.log('psk base64 SAVED', pskBase64)
+    this.serverIoProvider.io.emit(SocketActionTypes.PSK, { psk: pskBase64 })
+  }
+
   public async createCommunity(payload: InitCommunityPayload) {
     console.log('ConnectionsManager.createCommunity peers:', payload.peers)
+
+    await this.generatePSK()
+
     await this.launchCommunity(payload)
     this.logger(`Created and launched community ${payload.id}`)
     this.serverIoProvider.io.emit(SocketActionTypes.NEW_COMMUNITY, { id: payload.id })
@@ -345,6 +373,13 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
     if (!peers || peers.length === 0) {
       peers = [this.libp2pService.createLibp2pAddress(onionAddress, _peerId.toString())]
     }
+    const pskValue: string = await this.localDbService.get(LocalDBKeys.PSK)
+    if (!pskValue) {
+      throw new Error('No psk in local db')
+    }
+    console.log('psk base64 RETRIEVED', pskValue)
+
+    const libp2pPSK = Libp2pService.generateLibp2pPSK(pskValue).fullKey
 
     const params: Libp2pNodeParams = {
       peerId: _peerId,
@@ -353,16 +388,15 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
       localAddress: this.libp2pService.createLibp2pAddress(onionAddress, _peerId.toString()),
       targetPort: this.ports.libp2pHiddenService,
       peers,
+      psk: libp2pPSK,
     }
 
     await this.libp2pService.createInstance(params)
-    // KACPER
     // Libp2p event listeners
     this.libp2pService.on(Libp2pEvents.PEER_CONNECTED, (payload: { peers: string[] }) => {
       this.serverIoProvider.io.emit(SocketActionTypes.PEER_CONNECTED, payload)
     })
     this.libp2pService.on(Libp2pEvents.PEER_DISCONNECTED, async (payload: NetworkDataPayload) => {
-      console.log(' this.libp2pService.on(Libp2pEvents.PEER_DISCONNECTED')
       const peerPrevStats = await this.localDbService.find(LocalDBKeys.PEERS, payload.peer)
       const prev = peerPrevStats?.connectionTime || 0
 
@@ -420,6 +454,7 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
       }
     })
     this.socketService.on(SocketActionTypes.CREATE_NETWORK, async (args: Community) => {
+      console.log('CREATE NETWORK', args)
       await this.createNetwork(args)
     })
     this.socketService.on(SocketActionTypes.CREATE_COMMUNITY, async (args: InitCommunityPayload) => {

packages/backend/src/nest/libp2p/libp2p.service.ts

@@ -19,6 +19,12 @@ import Logger from '../common/logger'
 import { webSockets } from '../websocketOverTor'
 import { all } from '../websocketOverTor/filters'
 import { createLibp2pAddress, createLibp2pListenAddress } from '@quiet/common'
+import { preSharedKey } from 'libp2p/pnet'
+import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
+import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+import crypto from 'crypto'
+
+const KEY_LENGTH = 32
 
 @Injectable()
 export class Libp2pService extends EventEmitter {
@@ -44,6 +50,28 @@ export class Libp2pService extends EventEmitter {
     return createLibp2pListenAddress(address)
   }
 
+  public static generateLibp2pPSK(key?: string) {
+    /**
+     * Based on 'libp2p/pnet' generateKey
+     *
+     * @param key: base64 encoded psk
+     */
+    const libp2pPSK = new Uint8Array(95)
+    let psk
+    if (key) {
+      psk = uint8ArrayFromString(key, 'base64')
+    } else {
+      psk = crypto.randomBytes(KEY_LENGTH)
+    }
+
+    const base16StringKey = uint8ArrayToString(psk, 'base16')
+    const fullKey = uint8ArrayFromString('/key/swarm/psk/1.0.0/\n/base16/\n' + base16StringKey)
+
+    libp2pPSK.set(fullKey)
+
+    return { psk: psk.toString('base64'), fullKey }
+  }
+
   public async createInstance(params: Libp2pNodeParams): Promise<Libp2p> {
     if (this.libp2pInstance) {
       return this.libp2pInstance
@@ -64,6 +92,9 @@ export class Libp2pService extends EventEmitter {
         addresses: {
           listen: params.listenAddresses,
         },
+        connectionProtector: preSharedKey({
+          psk: params.psk,
+        }),
         streamMuxers: [mplex()],
         connectionEncryption: [noise()],
         relay: {

packages/backend/src/nest/libp2p/libp2p.types.ts

@@ -14,6 +14,7 @@ export interface Libp2pNodeParams {
   localAddress: string
   targetPort: number
   peers: string[]
+  psk: Uint8Array
 }
 
 export interface InitLibp2pParams {

packages/backend/src/nest/local-db/local-db.types.ts

@@ -2,5 +2,6 @@ export enum LocalDBKeys {
   COMMUNITY = 'community',
   REGISTRAR = 'registrar',
   PEERS = 'peers',
+  PSK = 'psk',
 }
 export type LocalDbStatus = 'opening' | 'open' | 'closing' | 'closed'

packages/backend/src/nest/socket/socket.service.ts

@@ -207,6 +207,10 @@ export class SocketService extends EventEmitter implements OnModuleInit {
         this.logger('Leaving community')
         this.emit(SocketActionTypes.LEAVE_COMMUNITY)
       })
+      socket.on(SocketActionTypes.PSK, payload => {
+        this.logger('Saving PSK', payload)
+        this.emit(SocketActionTypes.PSK, payload)
+      })
     })
   }
 

packages/common/package.json

@@ -21,14 +21,16 @@
     "@quiet/eslint-config": "^2.0.2-alpha.0",
     "@types/jest": "^26.0.23",
     "@types/node": "^17.0.21",
+    "@types/validator": "^13.11.5",
     "jest": "^26.6.3",
     "ts-jest": "^26.5.2",
     "typescript": "^4.9.3"
   },
   "dependencies": {
     "@quiet/types": "^2.0.2-alpha.0",
     "cross-env": "^5.2.0",
-    "debug": "^4.3.1"
+    "debug": "^4.3.1",
+    "validator": "^13.11.0"
   },
   "jest": {
     "transform": {

packages/common/src/index.ts

@@ -8,3 +8,4 @@ export * from './channelAddress'
 export * from './naming'
 export * from './fileData'
 export * from './libp2p'
+export * from './tests'