Compare commits

...

5 Commits

Author SHA1 Message Date
fiatjaf
7b0220c1b8 use browserify-cipher for aes.
it seems everybody was including this by default before, but now webpack and others are not.
2021-12-18 20:30:58 -03:00
fiatjaf
d8eee25e3a another typo: null != undefined. 2021-12-14 22:06:31 -03:00
fiatjaf
d5e93e0c30 fix a typo in matchFilter function. 2021-12-14 22:02:56 -03:00
fiatjaf
fff31b5ff4 automatically run received events through the filters they should pass (double-check the work made by the relay). 2021-12-14 22:00:42 -03:00
fiatjaf
cd7ffb8911 add local event filter functions. 2021-12-14 21:56:07 -03:00
5 changed files with 46 additions and 11 deletions

27
filter.js Normal file
View File

@@ -0,0 +1,27 @@
export function matchFilter(filter, event) {
if (filter.id && event.id !== filter.id) return false
if (filter.kind && event.kind !== filter.kind) return false
if (filter.author && event.pubkey !== filter.author) return false
if (filter.authors && filter.authors.indexOf(event.pubkey) === -1)
return false
if (
filter['#e'] &&
!event.tags.find(([t, v]) => t === 'e' && v === filter['#e'])
)
return false
if (
filter['#p'] &&
!event.tags.find(([t, v]) => t === 'p' && v === filter['#p'])
)
return false
if (filter.since && event.created_at <= filter.since) return false
return true
}
export function matchFilters(filters, event) {
for (let i = 0; i < filters.length; i++) {
if (matchFilter(filters[i], event)) return true
}
return false
}

View File

@@ -7,6 +7,7 @@ import {
serializeEvent,
getEventHash
} from './event'
import {matchFilter, matchFilters} from './filter'
import {makeRandom32, sha256, getPublicKey} from './utils'
export {
@@ -19,5 +20,7 @@ export {
makeRandom32,
sha256,
getPublicKey,
getBlankEvent
getBlankEvent,
matchFilter,
matchFilters
}

View File

@@ -1,3 +1,4 @@
import aes from 'browserify-cipher'
import {Buffer} from 'buffer'
import randomBytes from 'randombytes'
import * as secp256k1 from '@noble/secp256k1'
@@ -7,7 +8,7 @@ export function encrypt(privkey, pubkey, text) {
const normalizedKey = getOnlyXFromFullSharedSecret(key)
let iv = Uint8Array.from(randomBytes(16))
var cipher = crypto.createCipheriv(
var cipher = aes.createCipheriv(
'aes-256-cbc',
Buffer.from(normalizedKey, 'hex'),
iv
@@ -22,7 +23,7 @@ export function decrypt(privkey, pubkey, ciphertext, iv) {
const key = secp256k1.getSharedSecret(privkey, '02' + pubkey)
const normalizedKey = getOnlyXFromFullSharedSecret(key)
var decipher = crypto.createDecipheriv(
var decipher = aes.createDecipheriv(
'aes-256-cbc',
Buffer.from(normalizedKey, 'hex'),
Buffer.from(iv, 'base64')

View File

@@ -1,6 +1,6 @@
{
"name": "nostr-tools",
"version": "0.9.1",
"version": "0.11.0",
"description": "Tools for making a Nostr client.",
"repository": {
"type": "git",
@@ -9,10 +9,11 @@
"dependencies": {
"@noble/secp256k1": "^1.3.0",
"bip39": "^3.0.4",
"buffer": "^6.0.3",
"create-hmac": "^1.1.7",
"browserify-cipher": ">=1",
"buffer": ">=5",
"create-hmac": ">=1",
"dns-packet": "^5.2.4",
"randombytes": "^2.1.0",
"randombytes": ">=2",
"websocket-polyfill": "^0.0.3"
},
"keywords": [

View File

@@ -1,6 +1,7 @@
import 'websocket-polyfill'
import {verifySignature} from './event'
import {matchFilters} from './filter'
export function normalizeRelayURL(url) {
let [host, ...qs] = url.split('?')
@@ -88,10 +89,12 @@ export function relayConnect(url, onNotice) {
let channel = data[1]
let event = data[2]
if (await verifySignature(event)) {
if (channels[channel]) {
channels[channel](event)
}
if (
(await verifySignature(event)) &&
channels[channel] &&
matchFilters(openSubs[channel], event)
) {
channels[channel](event)
}
return
}