nostr/nostr-rs-relay
1
0
Fork 0
mirror of https://github.com/scsibug/nostr-rs-relay.git synced 2024-11-22 17:19:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from scsibug/master

Browse Source 
Fork Sync: Update from parent repository
This commit is contained in:
github-actions[bot] 2023-09-05 02:07:55 +00:00 committed by GitHub
commit b20a5397a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 303 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

558
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "nostr-rs-relay" name = "nostr-rs-relay"
version = "0.8.12" version = "0.8.13"
edition = "2021" edition = "2021"
authors = ["Greg Heartsfield <scsibug@imap.cc>"] authors = ["Greg Heartsfield <scsibug@imap.cc>"]
description = "A relay implementation for the Nostr protocol" description = "A relay implementation for the Nostr protocol"
@ -39,7 +39,7 @@ lazy_static = "1.4"
governor = "0.4" governor = "0.4"
nonzero_ext = "0.3" nonzero_ext = "0.3"
hyper = { version="0.14", features=["client", "server","http1","http2","tcp"] } hyper = { version="0.14", features=["client", "server","http1","http2","tcp"] }
hyper-tls = "0.5" hyper-rustls = { version = "0.24" }
http = { version = "0.2" } http = { version = "0.2" }
parse_duration = "2" parse_duration = "2"
rand = "0.8" rand = "0.8"

2
src/event.rs
View File

@ -355,7 +355,7 @@ impl Event {
return Err(EventInvalidId); return Err(EventInvalidId);
} }
// * validate the message digest (sig) using the pubkey & computed sha256 message hash. // * validate the message digest (sig) using the pubkey & computed sha256 message hash.
let sig = schnorr::Signature::from_str(&self.sig).unwrap(); let sig = schnorr::Signature::from_str(&self.sig).map_err(|_| EventInvalidSignature)?;
if let Ok(msg) = secp256k1::Message::from_slice(digest.as_ref()) { if let Ok(msg) = secp256k1::Message::from_slice(digest.as_ref()) {
if let Ok(pubkey) = XOnlyPublicKey::from_str(&self.pubkey) { if let Ok(pubkey) = XOnlyPublicKey::from_str(&self.pubkey) {
SECP.verify_schnorr(&sig, &msg, &pubkey) SECP.verify_schnorr(&sig, &msg, &pubkey)

9
src/nip05.rs
View File

@ -11,7 +11,7 @@ use crate::repo::NostrRepo;
use hyper::body::HttpBody; use hyper::body::HttpBody;
use hyper::client::connect::HttpConnector; use hyper::client::connect::HttpConnector;
use hyper::Client; use hyper::Client;
use hyper_tls::HttpsConnector; use hyper_rustls::HttpsConnector;
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use std::time::Instant; use std::time::Instant;
@ -133,7 +133,12 @@ impl Verifier {
) -> Result<Self> { ) -> Result<Self> {
info!("creating NIP-05 verifier"); info!("creating NIP-05 verifier");
// setup hyper client // setup hyper client
let https = HttpsConnector::new(); let https = hyper_rustls::HttpsConnectorBuilder::new()
.with_native_roots()
.https_or_http()
.enable_http1()
.build();
let client = Client::builder().build::<_, hyper::Body>(https); let client = Client::builder().build::<_, hyper::Body>(https);
// After all accounts have been re-verified, don't check again // After all accounts have been re-verified, don't check again

8
src/payment/lnbits.rs
View File

@ -2,7 +2,7 @@
use http::Uri; use http::Uri;
use hyper::client::connect::HttpConnector; use hyper::client::connect::HttpConnector;
use hyper::Client; use hyper::Client;
use hyper_tls::HttpsConnector; use hyper_rustls::HttpsConnector;
use nostr::Keys; use nostr::Keys;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::Value; use serde_json::Value;
@ -72,7 +72,11 @@ pub struct LNBitsPaymentProcessor {
impl LNBitsPaymentProcessor { impl LNBitsPaymentProcessor {
pub fn new(settings: &Settings) -> Self { pub fn new(settings: &Settings) -> Self {
// setup hyper client // setup hyper client
let https = HttpsConnector::new(); let https = hyper_rustls::HttpsConnectorBuilder::new()
.with_native_roots()
.https_only()
.enable_http1()
.build();
let client = Client::builder().build::<_, hyper::Body>(https); let client = Client::builder().build::<_, hyper::Body>(https);
Self { Self {

26
tests/conn.rs
View File

@ -52,7 +52,7 @@ mod tests {
let challenge = client_conn.auth_challenge().unwrap(); let challenge = client_conn.auth_challenge().unwrap();
let event = auth_event(challenge); let event = auth_event(challenge);
let result = client_conn.authenticate(&event, &RELAY.into()); let result = client_conn.authenticate(&event, RELAY.into());
assert!(matches!(result, Ok(()))); assert!(matches!(result, Ok(())));
assert_eq!(client_conn.auth_challenge(), None); assert_eq!(client_conn.auth_challenge(), None);
@ -67,7 +67,7 @@ mod tests {
assert_eq!(client_conn.auth_pubkey(), None); assert_eq!(client_conn.auth_pubkey(), None);
let event = auth_event(&"challenge".into()); let event = auth_event(&"challenge".into());
let result = client_conn.authenticate(&event, &RELAY.into()); let result = client_conn.authenticate(&event, RELAY.into());
assert!(matches!(result, Err(Error::AuthFailure))); assert!(matches!(result, Err(Error::AuthFailure)));
} }
@ -87,14 +87,14 @@ mod tests {
let challenge = client_conn.auth_challenge().unwrap().clone(); let challenge = client_conn.auth_challenge().unwrap().clone();
let event = auth_event(&challenge); let event = auth_event(&challenge);
let result = client_conn.authenticate(&event, &RELAY.into()); let result = client_conn.authenticate(&event, RELAY.into());
assert!(matches!(result, Ok(()))); assert!(matches!(result, Ok(())));
assert_eq!(client_conn.auth_challenge(), None); assert_eq!(client_conn.auth_challenge(), None);
assert_eq!(client_conn.auth_pubkey(), Some(&event.pubkey)); assert_eq!(client_conn.auth_pubkey(), Some(&event.pubkey));
let event1 = auth_event(&challenge); let event1 = auth_event(&challenge);
let result1 = client_conn.authenticate(&event1, &RELAY.into()); let result1 = client_conn.authenticate(&event1, RELAY.into());
assert!(matches!(result1, Ok(()))); assert!(matches!(result1, Ok(())));
assert_eq!(client_conn.auth_challenge(), None); assert_eq!(client_conn.auth_challenge(), None);
@ -118,7 +118,7 @@ mod tests {
let mut event = auth_event(challenge); let mut event = auth_event(challenge);
event.sig = event.sig.chars().rev().collect::<String>(); event.sig = event.sig.chars().rev().collect::<String>();
let result = client_conn.authenticate(&event, &RELAY.into()); let result = client_conn.authenticate(&event, RELAY.into());
assert!(matches!(result, Err(Error::AuthFailure))); assert!(matches!(result, Err(Error::AuthFailure)));
} }
@ -138,7 +138,7 @@ mod tests {
let challenge = client_conn.auth_challenge().unwrap(); let challenge = client_conn.auth_challenge().unwrap();
let event = auth_event_with_kind(challenge, 9999999999999999); let event = auth_event_with_kind(challenge, 9999999999999999);
let result = client_conn.authenticate(&event, &RELAY.into()); let result = client_conn.authenticate(&event, RELAY.into());
assert!(matches!(result, Err(Error::AuthFailure))); assert!(matches!(result, Err(Error::AuthFailure)));
} }
@ -158,7 +158,7 @@ mod tests {
let challenge = client_conn.auth_challenge().unwrap(); let challenge = client_conn.auth_challenge().unwrap();
let event = auth_event_with_created_at(challenge, unix_time() - 1200); // 20 minutes let event = auth_event_with_created_at(challenge, unix_time() - 1200); // 20 minutes
let result = client_conn.authenticate(&event, &RELAY.into()); let result = client_conn.authenticate(&event, RELAY.into());
assert!(matches!(result, Err(Error::AuthFailure))); assert!(matches!(result, Err(Error::AuthFailure)));
} }
@ -178,7 +178,7 @@ mod tests {
let challenge = client_conn.auth_challenge().unwrap(); let challenge = client_conn.auth_challenge().unwrap();
let event = auth_event_with_created_at(challenge, unix_time() + 1200); // 20 minutes let event = auth_event_with_created_at(challenge, unix_time() + 1200); // 20 minutes
let result = client_conn.authenticate(&event, &RELAY.into()); let result = client_conn.authenticate(&event, RELAY.into());
assert!(matches!(result, Err(Error::AuthFailure))); assert!(matches!(result, Err(Error::AuthFailure)));
} }
@ -197,7 +197,7 @@ mod tests {
let event = auth_event_without_tags(); let event = auth_event_without_tags();
let result = client_conn.authenticate(&event, &RELAY.into()); let result = client_conn.authenticate(&event, RELAY.into());
assert!(matches!(result, Err(Error::AuthFailure))); assert!(matches!(result, Err(Error::AuthFailure)));
} }
@ -216,7 +216,7 @@ mod tests {
let event = auth_event_without_challenge(); let event = auth_event_without_challenge();
let result = client_conn.authenticate(&event, &RELAY.into()); let result = client_conn.authenticate(&event, RELAY.into());
assert!(matches!(result, Err(Error::AuthFailure))); assert!(matches!(result, Err(Error::AuthFailure)));
} }
@ -236,7 +236,7 @@ mod tests {
let challenge = client_conn.auth_challenge().unwrap(); let challenge = client_conn.auth_challenge().unwrap();
let event = auth_event_without_relay(challenge); let event = auth_event_without_relay(challenge);
let result = client_conn.authenticate(&event, &RELAY.into()); let result = client_conn.authenticate(&event, RELAY.into());
assert!(matches!(result, Err(Error::AuthFailure))); assert!(matches!(result, Err(Error::AuthFailure)));
} }
@ -255,7 +255,7 @@ mod tests {
let event = auth_event(&"invalid challenge".into()); let event = auth_event(&"invalid challenge".into());
let result = client_conn.authenticate(&event, &RELAY.into()); let result = client_conn.authenticate(&event, RELAY.into());
assert!(matches!(result, Err(Error::AuthFailure))); assert!(matches!(result, Err(Error::AuthFailure)));
} }
@ -275,7 +275,7 @@ mod tests {
let challenge = client_conn.auth_challenge().unwrap(); let challenge = client_conn.auth_challenge().unwrap();
let event = auth_event_with_relay(challenge, &"xyz".into()); let event = auth_event_with_relay(challenge, &"xyz".into());
let result = client_conn.authenticate(&event, &RELAY.into()); let result = client_conn.authenticate(&event, RELAY.into());
assert!(matches!(result, Err(Error::AuthFailure))); assert!(matches!(result, Err(Error::AuthFailure)));
} }