Merge branch 'main' into global_config

Author: SwimmingRieux

.github/workflows/linting.yml

@@ -10,16 +10,20 @@ on:
       - main
 
 jobs:
-  golangci:
-    name: lint
+  linting:
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: '1.22.5'
-          cache: false
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+      - name: Install Go
+        uses: actions/setup-go@v5
         with:
-          version: v1.63.4
+          go-version: "1.23.3"
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Installing golangci-lint
+        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4
+
+      - name: Formatting and linting the project
+        run: make check

.github/workflows/unit-test.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.5'
+          go-version: '1.23.3'
 
       - name: Unit tests
         run: make unit-test

.gitignore

@@ -1,2 +1,3 @@
 build
-.vscode
+.vscode
+.idea/

dockerfile Dockerfiledockerfile renamed to Dockerfile

@@ -0,0 +1,9 @@
+# Security Policy
+
+This is a full guide for reporting and behaving with security vulnerabilities in this project.
+
+## Reporting a Vulnerability
+
+If you find any security vulnerability in this project, you can send a full report to [security@dezh.tech](mailto:security@dezh.tech). We will review your report in around 1 week or more and respond to you.
+We MAY consider paying a bounty reward to you using only Bitcoin (On-chain, Lightning, Cashu) depending on the vulnerability security level. By publishing any public writeup or report before a response from us you will not receive any bounty reward.
+After our response to the vulnerability report, you/we can publish a public writeup or report about the vulnerability.

SECURITY.md

@@ -11,6 +11,7 @@ import (
 	"github.com/dezh-tech/immortal/delivery/websocket"
 	"github.com/dezh-tech/immortal/infrastructure/database"
 	grpcclient "github.com/dezh-tech/immortal/infrastructure/grpc_client"
+	"github.com/dezh-tech/immortal/infrastructure/meilisearch"
 	"github.com/dezh-tech/immortal/infrastructure/metrics"
 	"github.com/dezh-tech/immortal/infrastructure/redis"
 	"github.com/dezh-tech/immortal/pkg/logger"
@@ -32,10 +33,11 @@ func New(cfg *config.Config) (*Relay, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	m := metrics.New()
 
-	r, err := redis.New(cfg.RedisConf)
+	meili := meilisearch.New(cfg.Meili)
+
+	r, err := redis.New(cfg.Redis)
 	if err != nil {
 		return nil, err
 	}

cmd/relay/relay.go

@@ -5,6 +5,7 @@ import (
 	"github.com/dezh-tech/immortal/delivery/websocket/configs"
 	"github.com/dezh-tech/immortal/infrastructure/database"
 	grpcclient "github.com/dezh-tech/immortal/infrastructure/grpc_client"
+	"github.com/dezh-tech/immortal/infrastructure/meilisearch"
 	"github.com/dezh-tech/immortal/infrastructure/redis"
 	"github.com/dezh-tech/immortal/pkg/logger"
 	"github.com/dezh-tech/immortal/repository/query_limit"
@@ -23,6 +24,7 @@ type Config struct {
 	GRPCServer      grpc.Config       `yaml:"grpc_server"`
 	Logger          logger.Config     `yaml:"logger"`
 	Handler         query_limit.Config
+
 }
 
 // Load loads config from file and env.
@@ -54,7 +56,8 @@ func Load(path string) (*Config, error) {
 	}
 
 	config.Database.URI = os.Getenv("IMMO_MONGO_URI")
-	config.RedisConf.URI = os.Getenv("IMMO_REDIS_URI")
+	config.Redis.URI = os.Getenv("IMMO_REDIS_URI")
+	config.Meili.APIKey = os.Getenv("MEILI_API_KEY")
 
 	if err = config.basicCheck(); err != nil {
 		return nil, Error{

config/config.go

@@ -78,6 +78,20 @@ redis:
   # default is IMMO_WHITE_LIST.
   white_list_filter_name: IMMO_WHITE_LIST
 
+# meili contains MeiliSearch client specification
+meili:
+
+  # host specifies the MeiliSearch server host
+  host: "localhost"
+
+  # port specifies the port on which the MeiliSearch server listens for requests
+  port: 7700
+
+  # timeout_in_ms specifies the maximum duration (in milliseconds) that is used for creating connections to the MeiliSearch server.
+  timeout_in_ms: 5000
+
+  # default_collection specifies the default collection name for documents
+  default_collection: "events"
 
 # log contains configs for logs output in console and file.
 logger:

config/config.yml

@@ -200,7 +200,7 @@ func (s *Server) handleEvent(conn *websocket.Conn, m message.Message) { //nolint
 	for conn, client := range s.conns {
 		client.Lock()
 		for id, filter := range client.subs {
-			if !filter.Match(msg.Event) {
+			if !filter.Match(msg.Event, *client.pubkey) {
 				continue
 			}
 			_ = conn.WriteMessage(1, message.MakeEvent(id, msg.Event))

delivery/websocket/event_handler.go

@@ -7,7 +7,7 @@
 - [X] **NIP-40**: Expiration Timestamp
 - [X] **NIP-42**: Authentication of Clients to Relays
 - [ ] **NIP-45**: Event Counts
-- [ ] **NIP-50**: Search Capability
+- [X] **NIP-50**: Search Capability
 - [X] **NIP-56**: Reporting
 - [X] **NIP-59**: Gift Wrap
 - [X] **NIP-62**: Right to Vanish