wip: tests, clippy

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nostr-rs-relay"
-version = "0.7.1"
+version = "0.6.2"
 edition = "2021"
 
 [dependencies]

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/rust:1.65.0@sha256:1bca14676a365d0ed37a1e2a1da86c2bcf883fdf6e6886469434763d94d4afd5 as builder
+FROM docker.io/library/rust:1.64.0@sha256:5cf09a76cb9baf4990d121221bbad64927cc5690ee54f246487e302ddc2ba300 as builder
 
 RUN USER=root cargo new --bin nostr-rs-relay
 WORKDIR ./nostr-rs-relay
@@ -12,8 +12,7 @@ COPY ./src ./src
 RUN rm ./target/release/deps/nostr*relay*
 RUN cargo build --release
 
-FROM docker.io/library/debian:bullseye-20221024-slim@sha256:76cdda8fe5eb597ef5e712e4c9a9f5f1fb119e69f353daaa7bd6d0f6e66e541d
-
+FROM docker.io/library/debian:bullseye-20221004-slim@sha256:8b702518a671c926b5ece4efe386a476eb4777646a36d996d4bd50944f2f11a2
 ARG APP=/usr/src/app
 ARG APP_DATA=/usr/src/app/db
 RUN apt-get update \

README.md

@@ -27,7 +27,6 @@ mirrored on [GitHub](https://github.com/scsibug/nostr-rs-relay).
 - [x] NIP-15: [End of Stored Events Notice](https://github.com/nostr-protocol/nips/blob/master/15.md)
 - [x] NIP-16: [Event Treatment](https://github.com/nostr-protocol/nips/blob/master/16.md)
 - [x] NIP-22: [Event `created_at` limits](https://github.com/nostr-protocol/nips/blob/master/22.md) (_future-dated events only_)
-- [x] NIP-26: [Event Delegation](https://github.com/nostr-protocol/nips/blob/master/26.md)
 
 ## Quick Start
 

config.toml

@@ -46,14 +46,6 @@ address = "0.0.0.0"
 # Listen on this port
 port = 8080
 
-# If present, read this HTTP header for logging client IP addresses.
-# Examples for common proxies, cloudflare:
-#remote_ip_header = "x-forwarded-for"
-#remote_ip_header = "cf-connecting-ip"
-
-# Websocket ping interval in seconds, defaults to 5 minutes
-#ping_interval = 300
-
 [options]
 # Reject events that have timestamps greater than this many seconds in
 # the future.  Recommended to reject anything greater than 30 minutes

src/config.rs

@@ -28,10 +28,9 @@ pub struct Database {
 pub struct Network {
     pub port: u16,
     pub address: String,
-    pub remote_ip_header: Option<String>, // retrieve client IP from this HTTP header if present
-    pub ping_interval_seconds: u32,
 }
 
+//
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[allow(unused)]
 pub struct Options {
@@ -208,9 +207,7 @@ impl Default for Settings {
             },
             network: Network {
                 port: 8080,
-                ping_interval_seconds: 300,
                 address: "0.0.0.0".to_owned(),
-                remote_ip_header: None,
             },
             limits: Limits {
                 messages_per_sec: None,

src/conn.rs

@@ -2,6 +2,7 @@
 use crate::close::Close;
 use crate::error::Error;
 use crate::error::Result;
+use crate::event::Event;
 
 use crate::subscription::Subscription;
 use std::collections::HashMap;
@@ -13,8 +14,6 @@ const MAX_SUBSCRIPTION_ID_LEN: usize = 256;
 
 /// State for a client connection
 pub struct ClientConn {
-    /// Client IP (either from socket, or configured proxy header
-    client_ip: String,
     /// Unique client identifier generated at connection time
     client_id: Uuid,
     /// The current set of active client subscriptions
@@ -25,27 +24,22 @@ pub struct ClientConn {
 
 impl Default for ClientConn {
     fn default() -> Self {
-        Self::new("unknown".to_owned())
+        Self::new()
     }
 }
 
 impl ClientConn {
     /// Create a new, empty connection state.
     #[must_use]
-    pub fn new(client_ip: String) -> Self {
+    pub fn new() -> Self {
         let client_id = Uuid::new_v4();
         ClientConn {
-            client_ip,
             client_id,
             subscriptions: HashMap::new(),
             max_subs: 32,
         }
     }
 
-    pub fn subscriptions(&self) -> &HashMap<String, Subscription> {
-        &self.subscriptions
-    }
-
     /// Get a short prefix of the client's unique identifier, suitable
     /// for logging.
     #[must_use]
@@ -53,9 +47,16 @@ impl ClientConn {
         self.client_id.to_string().chars().take(8).collect()
     }
 
+    /// Find all matching subscriptions.
     #[must_use]
-    pub fn ip(&self) -> &str {
-        &self.client_ip
+    pub fn get_matching_subscriptions(&self, e: &Event) -> Vec<&str> {
+        let mut v: Vec<&str> = vec![];
+        for (id, sub) in &self.subscriptions {
+            if sub.interested_in_event(e) {
+                v.push(id);
+            }
+        }
+        v
     }
 
     /// Add a new subscription for this connection.
@@ -103,7 +104,7 @@ impl ClientConn {
         debug!(
             "removed subscription, currently have {} active subs (cid={})",
             self.subscriptions.len(),
-            self.get_client_prefix(),
+            self.client_id
         );
     }
 }

src/db.rs

@@ -6,7 +6,6 @@ use crate::event::{single_char_tagname, Event};
 use crate::hexrange::hex_range;
 use crate::hexrange::HexSearch;
 use crate::nip05;
-use crate::notice::Notice;
 use crate::schema::{upgrade_db, STARTUP_SQL};
 use crate::subscription::ReqFilter;
 use crate::subscription::Subscription;
@@ -33,7 +32,7 @@ pub type PooledConnection = r2d2::PooledConnection<r2d2_sqlite::SqliteConnection
 /// Events submitted from a client, with a return channel for notices
 pub struct SubmittedEvent {
     pub event: Event,
-    pub notice_tx: tokio::sync::mpsc::Sender<Notice>,
+    pub notice_tx: tokio::sync::mpsc::Sender<String>,
 }
 
 /// Database file
@@ -143,15 +142,12 @@ pub async fn db_writer(
             if next_event.is_none() {
                 break;
             }
-            // track if an event write occurred; this is used to
-            // update the rate limiter
             let mut event_write = false;
             let subm_event = next_event.unwrap();
             let event = subm_event.event;
             let notice_tx = subm_event.notice_tx;
             // check if this event is authorized.
             if let Some(allowed_addrs) = whitelist {
-                // TODO: incorporate delegated pubkeys
                 // if the event address is not in allowed_addrs.
                 if !allowed_addrs.contains(&event.pubkey) {
                     info!(
@@ -159,9 +155,7 @@ pub async fn db_writer(
                         event.get_event_id_prefix()
                     );
                     notice_tx
-                        .try_send(Notice::message(
-                            "pubkey is not allowed to publish to this relay".to_owned(),
-                        ))
+                        .try_send("pubkey is not allowed to publish to this relay".to_owned())
                         .ok();
                     continue;
                 }
@@ -192,10 +186,10 @@ pub async fn db_writer(
                                   event.get_author_prefix()
                             );
                             notice_tx
-                                .try_send(Notice::message(
+                                .try_send(
                                     "NIP-05 verification is no longer valid (expired/wrong domain)"
                                         .to_owned(),
-                                ))
+                                )
                                 .ok();
                             continue;
                         }
@@ -206,9 +200,7 @@ pub async fn db_writer(
                             event.get_author_prefix()
                         );
                         notice_tx
-                            .try_send(Notice::message(
-                                "NIP-05 verification needed to publish events".to_owned(),
-                            ))
+                            .try_send("NIP-05 verification needed to publish events".to_owned())
                             .ok();
                         continue;
                     }
@@ -221,23 +213,22 @@ pub async fn db_writer(
             // TODO: cache recent list of authors to remove a DB call.
             let start = Instant::now();
             if event.kind >= 20000 && event.kind < 30000 {
-                bcast_tx.send(event.clone()).ok();
                 info!(
-                    "published ephemeral event: {:?} from: {:?} in: {:?}",
+                    "published ephemeral event {:?} from {:?} in {:?}",
                     event.get_event_id_prefix(),
                     event.get_author_prefix(),
                     start.elapsed()
                 );
+                bcast_tx.send(event.clone()).ok();
                 event_write = true
             } else {
                 match write_event(&mut pool.get()?, &event) {
                     Ok(updated) => {
                         if updated == 0 {
                             trace!("ignoring duplicate or deleted event");
-                            notice_tx.try_send(Notice::duplicate(event.id)).ok();
                         } else {
                             info!(
-                                "persisted event: {:?} from: {:?} in: {:?}",
+                                "persisted event {:?} from {:?} in {:?}",
                                 event.get_event_id_prefix(),
                                 event.get_author_prefix(),
                                 start.elapsed()
@@ -245,14 +236,16 @@ pub async fn db_writer(
                             event_write = true;
                             // send this out to all clients
                             bcast_tx.send(event.clone()).ok();
-                            notice_tx.try_send(Notice::saved(event.id)).ok();
                         }
                     }
                     Err(err) => {
                         warn!("event insert failed: {:?}", err);
-                        let msg =
-                            "relay experienced an error trying to publish the latest event".into();
-                        notice_tx.try_send(Notice::err_msg(msg, event.id)).ok();
+                        notice_tx
+                            .try_send(
+                                "relay experienced an error trying to publish the latest event"
+                                    .to_owned(),
+                            )
+                            .ok();
                     }
                 }
             }
@@ -291,13 +284,12 @@ pub fn write_event(conn: &mut PooledConnection, e: &Event) -> Result<usize> {
     let tx = conn.transaction()?;
     // get relevant fields from event and convert to blobs.
     let id_blob = hex::decode(&e.id).ok();
-    let pubkey_blob: Option<Vec<u8>> = hex::decode(&e.pubkey).ok();
-    let delegator_blob: Option<Vec<u8>> = e.delegated_by.as_ref().and_then(|d| hex::decode(d).ok());
+    let pubkey_blob = hex::decode(&e.pubkey).ok();
     let event_str = serde_json::to_string(&e).ok();
     // ignore if the event hash is a duplicate.
     let mut ins_count = tx.execute(
-        "INSERT OR IGNORE INTO event (event_hash, created_at, kind, author, delegated_by, content, first_seen, hidden) VALUES (?1, ?2, ?3, ?4, ?5, ?6, strftime('%s','now'), FALSE);",
-        params![id_blob, e.created_at, e.kind, pubkey_blob, delegator_blob, event_str]
+        "INSERT OR IGNORE INTO event (event_hash, created_at, kind, author, content, first_seen, hidden) VALUES (?1, ?2, ?3, ?4, ?5, strftime('%s','now'), FALSE);",
+        params![id_blob, e.created_at, e.kind, pubkey_blob, event_str]
     )?;
     if ins_count == 0 {
         // if the event was a duplicate, no need to insert event or
@@ -320,7 +312,7 @@ pub fn write_event(conn: &mut PooledConnection, e: &Event) -> Result<usize> {
                     if is_lower_hex(tagval) && (tagval.len() % 2 == 0) {
                         tx.execute(
 			    "INSERT OR IGNORE INTO tag (event_id, name, value_hex) VALUES (?1, ?2, ?3)",
-			    params![ev_id, &tagname, hex::decode(tagval).ok()],
+			    params![ev_id, &tagname, hex::decode(&tagval).ok()],
 			)?;
                     } else {
                         tx.execute(
@@ -447,22 +439,16 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>) {
         for auth in authvec {
             match hex_range(auth) {
                 Some(HexSearch::Exact(ex)) => {
-                    auth_searches.push("author=? OR delegated_by=?".to_owned());
-                    params.push(Box::new(ex.clone()));
+                    auth_searches.push("author=?".to_owned());
                     params.push(Box::new(ex));
                 }
                 Some(HexSearch::Range(lower, upper)) => {
-                    auth_searches.push(
-                        "(author>? AND author<?) OR (delegated_by>? AND delegated_by<?)".to_owned(),
-                    );
-                    params.push(Box::new(lower.clone()));
-                    params.push(Box::new(upper.clone()));
+                    auth_searches.push("(author>? AND author<?)".to_owned());
                     params.push(Box::new(lower));
                     params.push(Box::new(upper));
                 }
                 Some(HexSearch::LowerOnly(lower)) => {
-                    auth_searches.push("author>? OR delegated_by>?".to_owned());
-                    params.push(Box::new(lower.clone()));
+                    auth_searches.push("author>?".to_owned());
                     params.push(Box::new(lower));
                 }
                 None => {
@@ -514,7 +500,7 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>) {
             let mut blob_vals: Vec<Box<dyn ToSql>> = vec![];
             for v in val {
                 if (v.len() % 2 == 0) && is_lower_hex(v) {
-                    if let Ok(h) = hex::decode(v) {
+                    if let Ok(h) = hex::decode(&v) {
                         blob_vals.push(Box::new(h));
                     }
                 } else {
@@ -581,7 +567,7 @@ fn query_from_sub(sub: &Subscription) -> (String, Vec<Box<dyn ToSql>>) {
         .map(|s| format!("SELECT content, created_at FROM ({})", s))
         .collect();
     let query: String = subqueries_selects.join(" UNION ");
-    trace!("final query string: {}", query);
+    debug!("final query string: {}", query);
     (query, params)
 }
 
@@ -599,12 +585,12 @@ pub async fn db_query(
     mut abandon_query_rx: tokio::sync::oneshot::Receiver<()>,
 ) {
     task::spawn_blocking(move || {
-        trace!("going to query for: {:?}", sub);
+        debug!("going to query for: {:?}", sub);
         let mut row_count: usize = 0;
         let start = Instant::now();
         // generate SQL query
         let (q, p) = query_from_sub(&sub);
-        trace!("SQL generated in {:?}", start.elapsed());
+        debug!("SQL generated in {:?}", start.elapsed());
         // show pool stats
         debug!("DB pool stats: {:?}", pool.state());
         let start = Instant::now();

src/delegation.rs

@@ -30,6 +30,10 @@ use tracing::{debug, info};
 // different condition strings, since we do not support grouping or
 // "OR" logic.
 
+// using serde_urldecode, we can get a serde data format from the
+// condition string.  We will then map that with a deserializer that
+// maps to a ConditionQuery.
+
 lazy_static! {
     /// Secp256k1 verification instance.
     pub static ref SECP: Secp256k1<VerifyOnly> = Secp256k1::verification_only();
@@ -84,19 +88,10 @@ pub struct ConditionQuery {
 }
 
 impl ConditionQuery {
-    pub fn allows_event(&self, event: &Event) -> bool {
-        // check each condition, to ensure that the event complies
-        // with the restriction.
-        for c in &self.conditions {
-            if !c.allows_event(event) {
-                // any failing conditions invalidates the delegation
-                // on this event
-                return false;
-            }
-        }
-        // delegation was permitted unconditionally, or all conditions
-        // were true
-        true
+    pub fn allows_event(&self, _event: &Event) -> bool {
+        // check each condition, to ensure that the event complies with the restriction.
+
+        false
     }
 }
 
@@ -336,7 +331,6 @@ mod tests {
         Event {
             id: "0".to_owned(),
             pubkey: "0".to_owned(),
-            delegated_by: None,
             created_at: 0,
             kind: 0,
             tags: vec![],

src/event.rs

@@ -32,8 +32,6 @@ pub struct EventCmd {
 pub struct Event {
     pub id: String,
     pub(crate) pubkey: String,
-    #[serde(skip)]
-    pub(crate) delegated_by: Option<String>,
     pub(crate) created_at: u64,
     pub(crate) kind: u64,
     #[serde(deserialize_with = "tag_from_string")]
@@ -86,7 +84,6 @@ impl From<EventCmd> for Result<Event> {
         } else if ec.event.is_valid() {
             let mut e = ec.event;
             e.build_index();
-            e.update_delegation();
             Ok(e)
         } else {
             Err(EventInvalid)
@@ -119,45 +116,27 @@ impl Event {
     // if so, return an alternate author for the event
     pub fn delegated_author(&self) -> Option<String> {
         // is there a delegation tag?
-        let delegation_tag: Vec<String> = self
-            .tags
-            .iter()
-            .filter(|x| x.len() == 4)
-            .filter(|x| x.get(0).unwrap() == "delegation")
-            .take(1)
-            .next()?
-            .to_vec(); // get first tag
-
-        //let delegation_tag = self.tag_values_by_name("delegation");
+        let delegation_tag = self.tag_values_by_name("delegation");
         // delegation tags should have exactly 3 elements after the name (pubkey, condition, sig)
         // the event is signed by the delagatee
         let delegatee = &self.pubkey;
         // the delegation tag references the claimed delagator
-        let delegator: &str = delegation_tag.get(1)?;
-        let querystr: &str = delegation_tag.get(2)?;
-        let sig: &str = delegation_tag.get(3)?;
-
-        // attempt to get a condition query; this requires the delegation to have a valid signature.
+        let delegator = delegation_tag.get(0)?;
+        let querystr = delegation_tag.get(1)?;
+        let sig = delegation_tag.get(2)?;
+        // pass into the validate_delegation
         if let Some(cond_query) = validate_delegation(delegator, delegatee, querystr, sig) {
-            // The signature was valid, now we ensure the delegation
-            // condition is valid for this event:
+            // check if this condition query would allow this event.
             if cond_query.allows_event(self) {
-                // since this is allowed, we will provide the delegatee
                 Some(delegator.into())
             } else {
-                debug!("an event failed to satisfy delegation conditions");
                 None
             }
         } else {
-            debug!("event had had invalid delegation signature");
             None
         }
     }
 
-    /// Update delegation status
-    fn update_delegation(&mut self) {
-        self.delegated_by = self.delegated_author();
-    }
     /// Build an event tag index
     fn build_index(&mut self) {
         // if there are no tags; just leave the index as None
@@ -193,7 +172,7 @@ impl Event {
         self.pubkey.chars().take(8).collect()
     }
 
-    /// Retrieve tag initial values across all tags matching the name
+    /// Retrieve tag values
     pub fn tag_values_by_name(&self, tag_name: &str) -> Vec<String> {
         self.tags
             .iter()
@@ -317,7 +296,6 @@ mod tests {
         Event {
             id: "0".to_owned(),
             pubkey: "0".to_owned(),
-            delegated_by: None,
             created_at: 0,
             kind: 0,
             tags: vec![],
@@ -399,7 +377,6 @@ mod tests {
         let e = Event {
             id: "999".to_owned(),
             pubkey: "012345".to_owned(),
-            delegated_by: None,
             created_at: 501234,
             kind: 1,
             tags: vec![],
@@ -417,7 +394,6 @@ mod tests {
         let e = Event {
             id: "999".to_owned(),
             pubkey: "012345".to_owned(),
-            delegated_by: None,
             created_at: 501234,
             kind: 1,
             tags: vec![
@@ -444,7 +420,6 @@ mod tests {
         let e = Event {
             id: "999".to_owned(),
             pubkey: "012345".to_owned(),
-            delegated_by: None,
             created_at: 501234,
             kind: 1,
             tags: vec![
@@ -471,7 +446,6 @@ mod tests {
         let e = Event {
             id: "999".to_owned(),
             pubkey: "012345".to_owned(),
-            delegated_by: None,
             created_at: 501234,
             kind: 1,
             tags: vec![

src/info.rs

@@ -35,7 +35,7 @@ impl From<config::Info> for RelayInfo {
             description: i.description,
             pubkey: i.pubkey,
             contact: i.contact,
-            supported_nips: Some(vec![1, 2, 9, 11, 12, 15, 16, 22, 26]),
+            supported_nips: Some(vec![1, 2, 9, 11, 12, 15, 16, 22]),
             software: Some("https://git.sr.ht/~gheartsfield/nostr-rs-relay".to_owned()),
             version: CARGO_PKG_VERSION.map(|x| x.to_owned()),
         }

src/lib.rs

@@ -8,7 +8,6 @@ pub mod event;
 pub mod hexrange;
 pub mod info;
 pub mod nip05;
-pub mod notice;
 pub mod schema;
 pub mod subscription;
 pub mod utils;

src/main.rs

@@ -34,11 +34,11 @@ fn main() {
         // enable tracing with tokio-console
         ConsoleLayer::builder().with_default_env().init();
     }
+
     // update with database location
     if let Some(db) = db_dir {
         settings.database.data_directory = db;
     }
-
     let (_, ctrl_rx): (MpscSender<()>, MpscReceiver<()>) = syncmpsc::channel();
     // run this in a new thread
     let handle = thread::spawn(|| {

src/notice.rs

@@ -1,48 +0,0 @@
-use crate::error;
-
-pub enum EventResultStatus {
-    Saved,
-    Duplicate,
-    Error(String),
-}
-
-pub struct EventResult {
-    pub id: String,
-    pub status: EventResultStatus,
-}
-
-pub enum Notice {
-    Message(String),
-    EventResult(EventResult),
-}
-
-impl Notice {
-    pub fn err(err: error::Error, id: String) -> Notice {
-        Notice::err_msg(format!("{}", err), id)
-    }
-
-    pub fn message(msg: String) -> Notice {
-        Notice::Message(msg)
-    }
-
-    pub fn saved(id: String) -> Notice {
-        Notice::EventResult(EventResult {
-            id,
-            status: EventResultStatus::Saved,
-        })
-    }
-
-    pub fn duplicate(id: String) -> Notice {
-        Notice::EventResult(EventResult {
-            id,
-            status: EventResultStatus::Duplicate,
-        })
-    }
-
-    pub fn err_msg(msg: String, id: String) -> Notice {
-        Notice::EventResult(EventResult {
-            id,
-            status: EventResultStatus::Error(msg),
-        })
-    }
-}

src/schema.rs

@@ -40,7 +40,7 @@ event_hash BLOB NOT NULL, -- 4-byte hash
 first_seen INTEGER NOT NULL, -- when the event was first seen (not authored!) (seconds since 1970)
 created_at INTEGER NOT NULL, -- when the event was authored
 author BLOB NOT NULL, -- author pubkey
-delegated_by BLOB, -- delegator pubkey (NIP-26)
+delegator BLOB, -- delegator pubkey (NIP-26)
 kind INTEGER NOT NULL, -- event kind
 hidden INTEGER, -- relevant for queries
 content TEXT NOT NULL -- serialized json of event object
@@ -50,7 +50,6 @@ content TEXT NOT NULL -- serialized json of event object
 CREATE UNIQUE INDEX IF NOT EXISTS event_hash_index ON event(event_hash);
 CREATE INDEX IF NOT EXISTS created_at_index ON event(created_at);
 CREATE INDEX IF NOT EXISTS author_index ON event(author);
-CREATE INDEX IF NOT EXISTS delegated_by_index ON event(delegated_by);
 CREATE INDEX IF NOT EXISTS kind_index ON event(kind);
 
 -- Tag Table
@@ -332,7 +331,7 @@ fn mig_5_to_6(conn: &mut PooledConnection) -> Result<usize> {
                 if (tagval.len() % 2 == 0) && is_lower_hex(tagval) {
                     tx.execute(
                         "INSERT INTO tag (event_id, name, value_hex) VALUES (?1, ?2, ?3);",
-                        params![event_id, tagname, hex::decode(tagval).ok()],
+                        params![event_id, tagname, hex::decode(&tagval).ok()],
                     )?;
                 } else {
                     // otherwise, insert as text
@@ -358,8 +357,7 @@ fn mig_6_to_7(conn: &mut PooledConnection) -> Result<usize> {
     info!("database schema needs update from 6->7");
     // only change is adding a hidden column to events.
     let upgrade_sql = r##"
-ALTER TABLE event ADD delegated_by BLOB;
-CREATE INDEX IF NOT EXISTS delegated_by_index ON event(delegated_by);
+ALTER TABLE event ADD delegator BLOB;
 PRAGMA user_version = 7;
 "##;
     match conn.execute_batch(upgrade_sql) {

src/server.rs

@@ -10,11 +10,9 @@ use crate::event::Event;
 use crate::event::EventCmd;
 use crate::info::RelayInfo;
 use crate::nip05;
-use crate::notice::{EventResultStatus, Notice};
 use crate::subscription::Subscription;
 use futures::SinkExt;
 use futures::StreamExt;
-use http::header::HeaderMap;
 use hyper::header::ACCEPT;
 use hyper::service::{make_service_fn, service_fn};
 use hyper::upgrade::Upgraded;
@@ -86,32 +84,11 @@ async fn handle_web_request(
                                     Some(config),
                                 )
                                 .await;
-                                let user_agent = get_header_string("user-agent", request.headers());
-                                // determine the remote IP from headers if the exist
-                                let header_ip = settings
-                                    .network
-                                    .remote_ip_header
-                                    .as_ref()
-                                    .and_then(|x| get_header_string(x, request.headers()));
-                                // use the socket addr as a backup
-                                let remote_ip =
-                                    header_ip.unwrap_or_else(|| remote_addr.ip().to_string());
-                                let client_info = ClientInfo {
-                                    remote_ip,
-                                    user_agent,
-                                };
-                                // spawn a nostr server with our websocket
+
                                 tokio::spawn(nostr_server(
-                                    pool,
-                                    client_info,
-                                    settings,
-                                    ws_stream,
-                                    broadcast,
-                                    event_tx,
-                                    shutdown,
+                                    pool, settings, ws_stream, broadcast, event_tx, shutdown,
                                 ));
                             }
-                            // todo: trace, don't print...
                             Err(e) => println!(
                                 "error when trying to upgrade connection \
                                  from address {} to websocket connection. \
@@ -171,12 +148,6 @@ async fn handle_web_request(
     }
 }
 
-fn get_header_string(header: &str, headers: &HeaderMap) -> Option<String> {
-    headers
-        .get(header)
-        .and_then(|x| x.to_str().ok().map(|x| x.to_string()))
-}
-
 // return on a control-c or internally requested shutdown signal
 async fn ctrl_c_or_signal(mut shutdown_signal: Receiver<()>) {
     let mut term_signal = tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
@@ -196,6 +167,7 @@ async fn ctrl_c_or_signal(mut shutdown_signal: Receiver<()>) {
         info!("Shutting down webserver due to SIGTERM");
         break;
         },
+
         }
     }
 }
@@ -406,29 +378,14 @@ fn convert_to_msg(msg: String, max_bytes: Option<usize>) -> Result<NostrMessage>
 }
 
 /// Turn a string into a NOTICE message ready to send over a WebSocket
-fn make_notice_message(notice: Notice) -> Message {
-    let json = match notice {
-        Notice::Message(ref msg) => json!(["NOTICE", msg]),
-        Notice::EventResult(ref res) => match &res.status {
-            EventResultStatus::Saved => json!(["OK", res.id, "true"]),
-            EventResultStatus::Duplicate => json!(["OK", res.id, "true", "duplicate"]),
-            EventResultStatus::Error(msg) => json!(["OK", res.id, "false", msg]),
-        },
-    };
-
-    Message::text(json.to_string())
-}
-
-struct ClientInfo {
-    remote_ip: String,
-    user_agent: Option<String>,
+fn make_notice_message(msg: &str) -> Message {
+    Message::text(json!(["NOTICE", msg]).to_string())
 }
 
 /// Handle new client connections.  This runs through an event loop
 /// for all client communication.
 async fn nostr_server(
     pool: db::SqlitePool,
-    client_info: ClientInfo,
     settings: Settings,
     mut ws_stream: WebSocketStream<Upgraded>,
     broadcast: Sender<Event>,
@@ -438,20 +395,19 @@ async fn nostr_server(
     // get a broadcast channel for clients to communicate on
     let mut bcast_rx = broadcast.subscribe();
     // Track internal client state
-    let mut conn = conn::ClientConn::new(client_info.remote_ip);
-    // Use the remote IP as the client identifier
+    let mut conn = conn::ClientConn::new();
     let cid = conn.get_client_prefix();
     // Create a channel for receiving query results from the database.
     // we will send out the tx handle to any query we generate.
     let (query_tx, mut query_rx) = mpsc::channel::<db::QueryResult>(256);
     // Create channel for receiving NOTICEs
-    let (notice_tx, mut notice_rx) = mpsc::channel::<Notice>(32);
+    let (notice_tx, mut notice_rx) = mpsc::channel::<String>(32);
 
     // last time this client sent data (message, ping, etc.)
     let mut last_message_time = Instant::now();
 
     // ping interval (every 5 minutes)
-    let default_ping_dur = Duration::from_secs(settings.network.ping_interval_seconds.into());
+    let default_ping_dur = Duration::from_secs(300);
 
     // disconnect after 20 minutes without a ping response or event.
     let max_quiet_time = Duration::from_secs(60 * 20);
@@ -468,14 +424,11 @@ async fn nostr_server(
     // and how many it received from queries.
     let mut client_published_event_count: usize = 0;
     let mut client_received_event_count: usize = 0;
-    debug!("new connection for client: {}, ip: {:?}", cid, conn.ip());
-    if let Some(ua) = client_info.user_agent {
-        debug!("client: {} has user-agent: {:?}", cid, ua);
-    }
+    info!("new connection for client: {:?}", cid);
     loop {
         tokio::select! {
             _ = shutdown.recv() => {
-        info!("Close connection down due to shutdown, client: {}, ip: {:?}", cid, conn.ip());
+        info!("Shutting client connection down due to shutdown: {:?}", cid);
                 // server shutting down, exit loop
                 break;
             },
@@ -490,7 +443,7 @@ async fn nostr_server(
                 ws_stream.send(Message::Ping(Vec::new())).await.ok();
             },
             Some(notice_msg) = notice_rx.recv() => {
-                ws_stream.send(make_notice_message(notice_msg)).await.ok();
+                ws_stream.send(make_notice_message(&notice_msg)).await.ok();
             },
             Some(query_result) = query_rx.recv() => {
                 // database informed us of a query result we asked for
@@ -509,15 +462,12 @@ async fn nostr_server(
             Ok(global_event) = bcast_rx.recv() => {
                 // an event has been broadcast to all clients
                 // first check if there is a subscription for this event.
-                for (s, sub) in conn.subscriptions() {
-                    if !sub.interested_in_event(&global_event) {
-                        continue;
-                    }
-
+                let matching_subs = conn.get_matching_subscriptions(&global_event);
+                for s in matching_subs {
                     // TODO: serialize at broadcast time, instead of
                     // once for each consumer.
                     if let Ok(event_str) = serde_json::to_string(&global_event) {
-                        debug!("sub match for client: {}, sub: {:?}, event: {:?}",
+                        debug!("sub match for client: {:?}, sub: {:?}, event: {:?}",
                                cid, s,
                                global_event.get_event_id_prefix());
                         // create an event response and send it
@@ -538,7 +488,7 @@ async fn nostr_server(
                     },
             Some(Ok(Message::Binary(_))) => {
             ws_stream.send(
-                make_notice_message(Notice::message("binary messages are not accepted".into()))).await.ok();
+                make_notice_message("binary messages are not accepted")).await.ok();
                         continue;
                     },
                     Some(Ok(Message::Ping(_) | Message::Pong(_))) => {
@@ -548,7 +498,8 @@ async fn nostr_server(
                     },
             Some(Err(WsError::Capacity(MessageTooLong{size, max_size}))) => {
             ws_stream.send(
-                make_notice_message(Notice::message(format!("message too large ({} > {})",size, max_size)))).await.ok();
+                make_notice_message(
+                &format!("message too large ({} > {})",size, max_size))).await.ok();
                         continue;
             },
                     None |
@@ -556,17 +507,17 @@ async fn nostr_server(
              Err(WsError::AlreadyClosed | WsError::ConnectionClosed |
                  WsError::Protocol(tungstenite::error::ProtocolError::ResetWithoutClosingHandshake)))
                         => {
-                            debug!("websocket close from client: {}, ip: {:?}",cid, conn.ip());
+                        debug!("websocket close from client: {:?}",cid);
                         break;
                     },
                     Some(Err(WsError::Io(e))) => {
                         // IO errors are considered fatal
-                        warn!("IO error (client: {}, ip: {:?}): {:?}", cid, conn.ip(), e);
+                        warn!("IO error (client: {:?}): {:?}", cid, e);
                         break;
                     }
                     x => {
                         // default condition on error is to close the client connection
-                        info!("unknown error (client: {}, ip: {:?}): {:?} (closing conn)", cid, conn.ip(), x);
+                        info!("unknown error (client: {:?}): {:?} (closing conn)", cid, x);
                         break;
                     }
                 };
@@ -580,7 +531,7 @@ async fn nostr_server(
                         match parsed {
                             Ok(e) => {
                                 let id_prefix:String = e.id.chars().take(8).collect();
-                                debug!("successfully parsed/validated event: {:?} from client: {}", id_prefix, cid);
+                                debug!("successfully parsed/validated event: {:?} from client: {:?}", id_prefix, cid);
                                 // check if the event is too far in the future.
                                 if e.is_valid_timestamp(settings.options.reject_future_seconds) {
                                     // Write this to the database.
@@ -588,22 +539,20 @@ async fn nostr_server(
                                     event_tx.send(submit_event).await.ok();
                                     client_published_event_count += 1;
                 } else {
-                    info!("client: {} sent a far future-dated event", cid);
+                    info!("client {:?} sent a far future-dated event", cid);
                     if let Some(fut_sec) = settings.options.reject_future_seconds {
-                        let msg = format!("The event created_at field is out of the acceptable range (+{}sec) for this relay and was not stored.",fut_sec);
-                        let notice = Notice::err_msg(msg, e.id);
-                        ws_stream.send(make_notice_message(notice)).await.ok();
+                    ws_stream.send(make_notice_message(&format!("The event created_at field is out of the acceptable range (+{}sec) for this relay and was not stored.",fut_sec))).await.ok();
                     }
                 }
                             },
                             Err(_) => {
-                                info!("client: {} sent an invalid event", cid);
-                                ws_stream.send(make_notice_message(Notice::message("event was invalid".into()))).await.ok();
+                                info!("client {:?} sent an invalid event", cid);
+                                ws_stream.send(make_notice_message("event was invalid")).await.ok();
                             }
                         }
                     },
                     Ok(NostrMessage::SubMsg(s)) => {
-                        debug!("client: {} requesting a subscription", cid);
+                        debug!("client {} requesting a subscription", cid);
                         // subscription handling consists of:
                         // * registering the subscription so future events can be matched
                         // * making a channel to cancel to request later
@@ -620,7 +569,7 @@ async fn nostr_server(
                             },
                             Err(e) => {
                                 info!("Subscription error: {}", e);
-                                ws_stream.send(make_notice_message(Notice::err(e, s.id))).await.ok();
+                                ws_stream.send(make_notice_message(&e.to_string())).await.ok();
                             }
                         }
                     },
@@ -639,23 +588,23 @@ async fn nostr_server(
                                 conn.unsubscribe(&c);
                             } else {
                                 info!("invalid command ignored");
-                                ws_stream.send(make_notice_message(Notice::message("could not parse command".into()))).await.ok();
+                                ws_stream.send(make_notice_message("could not parse command")).await.ok();
                             }
                     },
                     Err(Error::ConnError) => {
-                        debug!("got connection close/error, disconnecting client: {}, ip: {:?}",cid, conn.ip());
+                        debug!("got connection close/error, disconnecting client: {:?}",cid);
                         break;
                     }
                     Err(Error::EventMaxLengthError(s)) => {
-                        info!("client: {} sent event larger ({} bytes) than max size", cid, s);
-                        ws_stream.send(make_notice_message(Notice::message("event exceeded max size".into()))).await.ok();
+                        info!("client {:?} sent event larger ({} bytes) than max size", cid, s);
+                        ws_stream.send(make_notice_message("event exceeded max size")).await.ok();
                     },
                     Err(Error::ProtoParseError) => {
-                        info!("client {} sent event that could not be parsed", cid);
-                        ws_stream.send(make_notice_message(Notice::message("could not parse command".into()))).await.ok();
+                        info!("client {:?} sent event that could not be parsed", cid);
+                        ws_stream.send(make_notice_message("could not parse command")).await.ok();
                     },
                     Err(e) => {
-                        info!("got non-fatal error from client: {}, error: {:?}", cid, e);
+                        info!("got non-fatal error from client: {:?}, error: {:?}", cid, e);
                     },
                 }
             },
@@ -666,10 +615,7 @@ async fn nostr_server(
         stop_tx.send(()).ok();
     }
     info!(
-        "stopping connection for client: {}, ip: {:?} (client sent {} event(s), received {})",
-        cid,
-        conn.ip(),
-        client_published_event_count,
-        client_received_event_count
+        "stopping connection for client: {:?} (client sent {} event(s), received {})",
+        cid, client_published_event_count, client_received_event_count
     );
 }

src/subscription.rs

@@ -217,17 +217,6 @@ impl ReqFilter {
             .unwrap_or(true)
     }
 
-    fn delegated_authors_match(&self, event: &Event) -> bool {
-        if let Some(delegated_pubkey) = &event.delegated_by {
-            self.authors
-                .as_ref()
-                .map(|vs| prefix_match(vs, delegated_pubkey))
-                .unwrap_or(true)
-        } else {
-            false
-        }
-    }
-
     fn tag_match(&self, event: &Event) -> bool {
         // get the hashset from the filter.
         if let Some(map) = &self.tags {
@@ -259,7 +248,7 @@ impl ReqFilter {
             && self.since.map(|t| event.created_at > t).unwrap_or(true)
             && self.until.map(|t| event.created_at < t).unwrap_or(true)
             && self.kind_match(event.kind)
-            && (self.authors_match(event) || self.delegated_authors_match(event))
+            && self.authors_match(event)
             && self.tag_match(event)
             && !self.force_no_match
     }
@@ -319,7 +308,6 @@ mod tests {
         let e = Event {
             id: "foo".to_owned(),
             pubkey: "abcd".to_owned(),
-            delegated_by: None,
             created_at: 0,
             kind: 0,
             tags: Vec::new(),
@@ -338,7 +326,6 @@ mod tests {
         let e = Event {
             id: "abcd".to_owned(),
             pubkey: "".to_owned(),
-            delegated_by: None,
             created_at: 0,
             kind: 0,
             tags: Vec::new(),
@@ -357,7 +344,6 @@ mod tests {
         let e = Event {
             id: "abcde".to_owned(),
             pubkey: "".to_owned(),
-            delegated_by: None,
             created_at: 0,
             kind: 0,
             tags: Vec::new(),
@@ -377,7 +363,6 @@ mod tests {
         let e = Event {
             id: "abc".to_owned(),
             pubkey: "".to_owned(),
-            delegated_by: None,
             created_at: 50,
             kind: 0,
             tags: Vec::new(),
@@ -401,7 +386,6 @@ mod tests {
         let e = Event {
             id: "abc".to_owned(),
             pubkey: "".to_owned(),
-            delegated_by: None,
             created_at: 150,
             kind: 0,
             tags: Vec::new(),
@@ -423,7 +407,6 @@ mod tests {
         let e = Event {
             id: "abc".to_owned(),
             pubkey: "".to_owned(),
-            delegated_by: None,
             created_at: 50,
             kind: 0,
             tags: Vec::new(),
@@ -442,7 +425,6 @@ mod tests {
         let e = Event {
             id: "abc".to_owned(),
             pubkey: "".to_owned(),
-            delegated_by: None,
             created_at: 1001,
             kind: 0,
             tags: Vec::new(),
@@ -461,7 +443,6 @@ mod tests {
         let e = Event {
             id: "abc".to_owned(),
             pubkey: "".to_owned(),
-            delegated_by: None,
             created_at: 0,
             kind: 0,
             tags: Vec::new(),
@@ -480,7 +461,6 @@ mod tests {
         let e = Event {
             id: "123".to_owned(),
             pubkey: "abc".to_owned(),
-            delegated_by: None,
             created_at: 0,
             kind: 0,
             tags: Vec::new(),
@@ -499,7 +479,6 @@ mod tests {
         let e = Event {
             id: "123".to_owned(),
             pubkey: "bcd".to_owned(),
-            delegated_by: None,
             created_at: 0,
             kind: 0,
             tags: Vec::new(),
@@ -518,7 +497,6 @@ mod tests {
         let e = Event {
             id: "123".to_owned(),
             pubkey: "xyz".to_owned(),
-            delegated_by: None,
             created_at: 0,
             kind: 0,
             tags: Vec::new(),