Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix single note query #4

Merged
merged 2 commits into from
Jul 30, 2024
Merged

Fix single note query #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2fec47
Remove unused settings in connection auth
dcadenas Jul 26, 2024
db6cbfc
Convert id to binary for SQL query
dcadenas Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions src/conn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use tracing::{debug, trace};
use uuid::Uuid;

use crate::close::Close;
use crate::config::Settings;
use crate::conn::Nip42AuthState::{AuthPubkey, Challenge, NoAuth};
use crate::error::Error;
use crate::error::Result;
Expand Down Expand Up @@ -38,40 +37,28 @@ pub struct ClientConn {
max_subs: usize,
/// NIP-42 AUTH
auth: Nip42AuthState,

settings: Settings,
}

impl Default for ClientConn {
fn default() -> Self {
Self::new_with_default_settings("unknown".to_owned())
Self::new("unknown".to_owned())
}
}

impl ClientConn {
/// Create a new, empty connection state.
#[must_use]
pub fn new(client_ip_addr: String, settings: Settings) -> Self {
pub fn new(client_ip_addr: String) -> Self {
let client_id = Uuid::new_v4();
ClientConn {
client_ip_addr,
client_id,
subscriptions: HashMap::new(),
max_subs: 32,
auth: NoAuth,
settings: settings,
}
}

/// Create a new, empty connection state.
#[must_use]
pub fn new_with_default_settings(client_ip_addr: String) -> Self {
ClientConn::new(
client_ip_addr,
Settings::new(&None).expect("couldn't create Settings"),
)
}

#[must_use]
pub fn subscriptions(&self) -> &HashMap<String, Subscription> {
&self.subscriptions
Expand Down Expand Up @@ -224,7 +211,10 @@ impl ClientConn {
match (relay.and_then(host_str), host_str(relay_url)) {
(Some(received_relay), Some(our_relay)) => {
if received_relay != our_relay {
debug!("Invalid auth relay. Should be: {}", our_relay);
debug!(
"Invalid auth relay. Should be {} but was {}",
our_relay, received_relay
);
return Err(Error::AuthFailure);
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/repo/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,8 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>, Option<Stri
let mut id_searches: Vec<String> = vec![];
for id in idvec {
id_searches.push("event_hash=?".to_owned());
params.push(Box::new(id.clone()));
let id_bin = hex::decode(id).ok();
params.push(Box::new(id_bin));
}
if idvec.is_empty() {
// if the ids list was empty, we should never return
Expand Down
2 changes: 1 addition & 1 deletion src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@ 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, settings.clone());
let mut conn = conn::ClientConn::new(client_info.remote_ip);
// subscription creation rate limiting
let mut sub_lim_opt = None;
// 100ms jitter when the rate limiter returns
Expand Down
26 changes: 13 additions & 13 deletions tests/conn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ mod tests {

#[test]
fn test_generate_auth_challenge() {
let mut client_conn = ClientConn::new_with_default_settings("127.0.0.1".into());
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand Down Expand Up @@ -45,7 +45,7 @@ mod tests {

let mut settings = Settings::new(&None).unwrap();
settings.authorization.pubkey_whitelist = Some(vec![pubkey.to_hex()]);
let mut client_conn = ClientConn::new("127.0.0.1".into(), settings);
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand All @@ -67,7 +67,7 @@ mod tests {

#[test]
fn test_fail_to_authenticate_in_invalid_state() {
let mut client_conn = ClientConn::new_with_default_settings("127.0.0.1".into());
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand All @@ -85,7 +85,7 @@ mod tests {

let mut settings = Settings::new(&None).unwrap();
settings.authorization.pubkey_whitelist = Some(vec![pubkey.to_hex()]);
let mut client_conn = ClientConn::new("127.0.0.1".into(), settings);
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand Down Expand Up @@ -116,7 +116,7 @@ mod tests {

#[test]
fn test_fail_to_authenticate_with_invalid_event() {
let mut client_conn = ClientConn::new_with_default_settings("127.0.0.1".into());
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand All @@ -137,7 +137,7 @@ mod tests {

#[test]
fn test_fail_to_authenticate_with_invalid_event_kind() {
let mut client_conn = ClientConn::new_with_default_settings("127.0.0.1".into());
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand All @@ -157,7 +157,7 @@ mod tests {

#[test]
fn test_fail_to_authenticate_with_expired_timestamp() {
let mut client_conn = ClientConn::new_with_default_settings("127.0.0.1".into());
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand All @@ -177,7 +177,7 @@ mod tests {

#[test]
fn test_fail_to_authenticate_with_future_timestamp() {
let mut client_conn = ClientConn::new_with_default_settings("127.0.0.1".into());
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand All @@ -197,7 +197,7 @@ mod tests {

#[test]
fn test_fail_to_authenticate_without_tags() {
let mut client_conn = ClientConn::new_with_default_settings("127.0.0.1".into());
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand All @@ -216,7 +216,7 @@ mod tests {

#[test]
fn test_fail_to_authenticate_without_challenge() {
let mut client_conn = ClientConn::new_with_default_settings("127.0.0.1".into());
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand All @@ -235,7 +235,7 @@ mod tests {

#[test]
fn test_fail_to_authenticate_without_relay() {
let mut client_conn = ClientConn::new_with_default_settings("127.0.0.1".into());
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand All @@ -255,7 +255,7 @@ mod tests {

#[test]
fn test_fail_to_authenticate_with_invalid_challenge() {
let mut client_conn = ClientConn::new_with_default_settings("127.0.0.1".into());
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand All @@ -274,7 +274,7 @@ mod tests {

#[test]
fn test_fail_to_authenticate_with_invalid_relay() {
let mut client_conn = ClientConn::new_with_default_settings("127.0.0.1".into());
let mut client_conn = ClientConn::new("127.0.0.1".into());

assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), None);
Expand Down