Skip to content

Commit

Permalink
Merge branch 'main' into lint
Browse files Browse the repository at this point in the history
  • Loading branch information
asmogo authored Aug 4, 2024
2 parents 72f1872 + 574d718 commit fa8a21e
Show file tree
Hide file tree
Showing 8 changed files with 187 additions and 32 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
localhost.crt
localhost.key
.idea
.vscode
nostr
23 changes: 15 additions & 8 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,12 @@ services:
networks:
nostr:
environment:
- NOSTR_RELAYS=ws://nostr-relay:8080
- NOSTR_RELAYS=ws://nostr-relay:7777
- NOSTR_PRIVATE_KEY=
- BACKEND_HOST=mint:3338
depends_on:
- mint
- nostr
exit-https:
build:
context: .
Expand All @@ -43,9 +46,12 @@ services:
networks:
nostr:
environment:
- NOSTR_RELAYS=ws://nostr-relay:8080
- NOSTR_RELAYS=ws://nostr-relay:7777
- NOSTR_PRIVATE_KEY=
- BACKEND_HOST=:4443
depends_on:
- mint
- nostr
entry:
build:
context: .
Expand All @@ -56,16 +62,17 @@ services:
networks:
nostr:
environment:
- NOSTR_RELAYS=ws://nostr-relay:8080
- NOSTR_RELAYS=ws://nostr-relay:7777
depends_on:
- nostr
nostr:
image: scsibug/nostr-rs-relay:latest
image: carroarmato0/strfry:latest
container_name: nostr-relay
ports:
- 8080:8080
- 7777:7777
networks:
nostr:
restart: always
volumes:
- ./nostr/data:/usr/src/app/db:Z
- ./nostr/config/config.toml:/usr/src/app/config.toml:ro,Z
user: 100:100
- ./strfry/data:/app/strfry-db/:Z
- ./strfry/strfry.conf:/app/strfry.conf:ro,Z
7 changes: 1 addition & 6 deletions exit/exit.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,10 @@ func NewExit(ctx context.Context, exitNodeConfig *config.ExitConfig) *Exit {
// generate new private key
exitNodeConfig.NostrPrivateKey = nostr.GeneratePrivateKey()
slog.Warn(generateKeyMessage, "key", exitNodeConfig.NostrPrivateKey)
} else {
pubKey, err := nostr.GetPublicKey(exitNodeConfig.NostrPrivateKey)
if err != nil {
panic(err)
}
slog.Info("using public key", "key", pubKey)
}
// get public key from private key
pubKey, err := nostr.GetPublicKey(exitNodeConfig.NostrPrivateKey)
slog.Info("using public key", "key", pubKey)
if err != nil {
panic(err)
}
Expand Down
25 changes: 13 additions & 12 deletions exit/https.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,25 @@ import (
"crypto/x509/pkix"
"encoding/pem"
"fmt"
"github.com/asmogo/nws/protocol"
"github.com/nbd-wtf/go-nostr"
"github.com/nbd-wtf/go-nostr/nip04"
"log/slog"
"math/big"
"net/http"
"net/http/httputil"
"net/url"
"os"
"time"

"github.com/asmogo/nws/protocol"
"github.com/nbd-wtf/go-nostr"
"github.com/nbd-wtf/go-nostr/nip04"
)

func (e *Exit) StartReverseProxy(httpTarget string, port int32) error {
ctx := context.Background()
ev := e.pool.QuerySingle(ctx, e.config.NostrRelays, nostr.Filter{
Authors: []string{e.publicKey},
Kinds: []int{nostr.KindTextNote},
Tags: nostr.TagMap{"p": []string{e.nprofile}},
Kinds: []int{protocol.KindCertificateEvent},
Tags: nostr.TagMap{"p": []string{e.publicKey}},
})
var cert tls.Certificate
if ev == nil {
Expand All @@ -40,8 +41,8 @@ func (e *Exit) StartReverseProxy(httpTarget string, port int32) error {
// load private key from file
privateKeyEvent := e.pool.QuerySingle(ctx, e.config.NostrRelays, nostr.Filter{
Authors: []string{e.publicKey},
Kinds: []int{nostr.KindEncryptedDirectMessage},
Tags: nostr.TagMap{"p": []string{e.nprofile}},
Kinds: []int{protocol.KindPrivateKeyEvent},
Tags: nostr.TagMap{"p": []string{e.publicKey}},
})
if privateKeyEvent == nil {
return fmt.Errorf("failed to find encrypted direct message")
Expand Down Expand Up @@ -125,7 +126,7 @@ func (e *Exit) createAndStoreCertificateData(ctx context.Context) (*tls.Certific
certPEM := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: certBytes})
keyPEM := pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
// save key pem to file
err := os.WriteFile(fmt.Sprintf("%s.key", e.nprofile), keyPEM, 0644)
err := os.WriteFile(fmt.Sprintf("%s.key", e.publicKey), keyPEM, 0644)
if err != nil {
return nil, err
}
Expand All @@ -146,8 +147,8 @@ func (e *Exit) storePrivateKey(ctx context.Context, keyPEM []byte) error {
if err != nil {
return err
}
event, err := s.CreateSignedEvent(e.publicKey, nostr.KindEncryptedDirectMessage, nostr.Tags{
nostr.Tag{"p", e.nprofile},
event, err := s.CreateSignedEvent(e.publicKey, protocol.KindPrivateKeyEvent, nostr.Tags{
nostr.Tag{"p", e.publicKey},
}, protocol.WithData(keyPEM))
if err != nil {
return err
Expand All @@ -169,10 +170,10 @@ func (e *Exit) storeCertificate(ctx context.Context, certPEM []byte) (*tls.Certi
event := nostr.Event{
CreatedAt: nostr.Now(),
PubKey: e.publicKey,
Kind: nostr.KindTextNote,
Kind: protocol.KindCertificateEvent,
Content: string(certPEM),
Tags: nostr.Tags{
nostr.Tag{"p", e.nprofile},
nostr.Tag{"p", e.publicKey},
},
}
err := event.Sign(e.config.NostrPrivateKey)
Expand Down
4 changes: 2 additions & 2 deletions exit/nostr.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"strconv"
"time"

"github.com/asmogo/nws/protocol"
"github.com/nbd-wtf/go-nostr"
)

Expand All @@ -18,9 +19,8 @@ func (e *Exit) announceExitNode(ctx context.Context) error {
event := nostr.Event{
PubKey: e.publicKey,
CreatedAt: nostr.Now(),
Kind: nostr.KindTextNote,
Kind: protocol.KindAnnouncementEvent,
Tags: nostr.Tags{
nostr.Tag{"n", "nws"},
nostr.Tag{"expiration", strconv.FormatInt(time.Now().Add(time.Second*10).Unix(), 20)},
},
}
Expand Down
7 changes: 4 additions & 3 deletions netstr/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ package netstr
import (
"context"
"fmt"
"github.com/nbd-wtf/go-nostr"
"net"
"strings"
"time"

"github.com/asmogo/nws/protocol"
"github.com/nbd-wtf/go-nostr"
)

// NostrDNS does not resolve anything
Expand Down Expand Up @@ -36,9 +38,8 @@ func (d NostrDNS) Resolve(ctx context.Context, name string) (context.Context, ne
}
since := nostr.Timestamp(time.Now().Add(-time.Second * 10).Unix())
ev := d.pool.QuerySingle(ctx, d.nostrRelays, nostr.Filter{
Kinds: []int{nostr.KindTextNote},
Kinds: []int{protocol.KindAnnouncementEvent},
Since: &since,
Tags: nostr.TagMap{"n": []string{"nws"}},
})
if ev == nil {
return ctx, nil, fmt.Errorf("failed to find exit node event")
Expand Down
11 changes: 10 additions & 1 deletion protocol/signer.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,16 @@ import (
)

// KindEphemeralEvent represents the unique identifier for ephemeral events.
const KindEphemeralEvent int = 38333
const KindEphemeralEvent int = 28333

// KindAnnouncementEvent represents the unique identifier for announcement events.
const KindAnnouncementEvent int = 38333

// KindCertificateEvent represents the unique identifier for certificate events.
const KindCertificateEvent int = 38334

// KindPrivateKeyEvent represents the unique identifier for private key events.
const KindPrivateKeyEvent int = 38335

// EventSigner represents a signer that can create and sign events.
//
Expand Down
141 changes: 141 additions & 0 deletions strfry/strfry.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
##
## Default strfry config
##

# Directory that contains the strfry LMDB database (restart required)
db = "./strfry-db/"

dbParams {
# Maximum number of threads/processes that can simultaneously have LMDB transactions open (restart required)
maxreaders = 256

# Size of mmap() to use when loading LMDB (default is 10TB, does *not* correspond to disk-space used) (restart required)
mapsize = 10995116277760

# Disables read-ahead when accessing the LMDB mapping. Reduces IO activity when DB size is larger than RAM. (restart required)
noReadAhead = false
}

events {
# Maximum size of normalised JSON, in bytes
maxEventSize = 65536

# Events newer than this will be rejected
rejectEventsNewerThanSeconds = 900

# Events older than this will be rejected
rejectEventsOlderThanSeconds = 94608000

# Ephemeral events older than this will be rejected
rejectEphemeralEventsOlderThanSeconds = 60

# Ephemeral events will be deleted from the DB when older than this
ephemeralEventsLifetimeSeconds = 300

# Maximum number of tags allowed
maxNumTags = 2000

# Maximum size for tag values, in bytes
maxTagValSize = 1024
}

relay {
# Interface to listen on. Use 0.0.0.0 to listen on all interfaces (restart required)
bind = "0.0.0.0"

# Port to open for the nostr websocket protocol (restart required)
port = 7777

# Set OS-limit on maximum number of open files/sockets (if 0, don't attempt to set) (restart required)
nofiles = 1000000

# HTTP header that contains the client's real IP, before reverse proxying (ie x-real-ip) (MUST be all lower-case)
realIpHeader = ""

info {
# NIP-11: Name of this server. Short/descriptive (< 30 characters)
name = "strfry default"

# NIP-11: Detailed information about relay, free-form
description = "This is a strfry instance."

# NIP-11: Administrative nostr pubkey, for contact purposes
pubkey = ""

# NIP-11: Alternative administrative contact (email, website, etc)
contact = ""

# NIP-11: URL pointing to an image to be used as an icon for the relay
icon = ""
}

# Maximum accepted incoming websocket frame size (should be larger than max event) (restart required)
maxWebsocketPayloadSize = 131072

# Websocket-level PING message frequency (should be less than any reverse proxy idle timeouts) (restart required)
autoPingSeconds = 55

# If TCP keep-alive should be enabled (detect dropped connections to upstream reverse proxy)
enableTcpKeepalive = false

# How much uninterrupted CPU time a REQ query should get during its DB scan
queryTimesliceBudgetMicroseconds = 10000

# Maximum records that can be returned per filter
maxFilterLimit = 500

# Maximum number of subscriptions (concurrent REQs) a connection can have open at any time
maxSubsPerConnection = 20

writePolicy {
# If non-empty, path to an executable script that implements the writePolicy plugin logic
plugin = ""
}

compression {
# Use permessage-deflate compression if supported by client. Reduces bandwidth, but slight increase in CPU (restart required)
enabled = true

# Maintain a sliding window buffer for each connection. Improves compression, but uses more memory (restart required)
slidingWindow = true
}

logging {
# Dump all incoming messages
dumpInAll = false

# Dump all incoming EVENT messages
dumpInEvents = false

# Dump all incoming REQ/CLOSE messages
dumpInReqs = false

# Log performance metrics for initial REQ database scans
dbScanPerf = false

# Log reason for invalid event rejection? Can be disabled to silence excessive logging
invalidEvents = true
}

numThreads {
# Ingester threads: route incoming requests, validate events/sigs (restart required)
ingester = 3

# reqWorker threads: Handle initial DB scan for events (restart required)
reqWorker = 3

# reqMonitor threads: Handle filtering of new events (restart required)
reqMonitor = 3

# negentropy threads: Handle negentropy protocol messages (restart required)
negentropy = 2
}

negentropy {
# Support negentropy protocol messages
enabled = true

# Maximum records that sync will process before returning an error
maxSyncEvents = 1000000
}
}

0 comments on commit fa8a21e

Please sign in to comment.