Skip to content

Commit ba70a73

Browse files
Use UntrustedString for displaying errors in PeerManager
We currently just print "with non-ASCII error message" to log when we see non-ASCII chars, but should instead use our fancy UntrustedString wrapper to display the untrusted string and ignore control chars.
1 parent 03903bf commit ba70a73

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lightning/src/ln/peer_handler.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ use crate::onion_message::{CustomOnionMessageContents, CustomOnionMessageHandler
3131
use crate::routing::gossip::{NetworkGraph, P2PGossipSync, NodeId, NodeAlias};
3232
use crate::util::atomic_counter::AtomicCounter;
3333
use crate::util::logger::Logger;
34+
use crate::util::string::UntrustedString;
3435

3536
use crate::prelude::*;
3637
use crate::io;
@@ -1547,7 +1548,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
15471548
if data_is_printable {
15481549
log_debug!(self.logger, "Got Err message from {}: {}", log_pubkey!(their_node_id), msg.data);
15491550
} else {
1550-
log_debug!(self.logger, "Got Err message from {} with non-ASCII error message", log_pubkey!(their_node_id));
1551+
log_debug!(self.logger, "Got Err message from {}: {}", log_pubkey!(their_node_id), UntrustedString(msg.data.clone()));
15511552
}
15521553
self.message_handler.chan_handler.handle_error(&their_node_id, &msg);
15531554
if msg.channel_id == [0; 32] {
@@ -1566,7 +1567,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
15661567
if data_is_printable {
15671568
log_debug!(self.logger, "Got warning message from {}: {}", log_pubkey!(their_node_id), msg.data);
15681569
} else {
1569-
log_debug!(self.logger, "Got warning message from {} with non-ASCII error message", log_pubkey!(their_node_id));
1570+
log_debug!(self.logger, "Got warning message from {}: {}", log_pubkey!(their_node_id), UntrustedString(msg.data));
15701571
}
15711572
},
15721573

0 commit comments

Comments
 (0)