~emersion/soju-dev

Make sure that WebSocket messages are valid UTF-8 v2 APPLIED

Hubert Hirtz: 1
 Make sure that WebSocket messages are valid UTF-8

 1 files changed, 3 insertions(+), 1 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~emersion/soju-dev/patches/13070/mbox | git am -3
Learn more about email & git
View this thread in the archives

[PATCH v2] Make sure that WebSocket messages are valid UTF-8 Export this patch

... by replacing invalid bytes with the REPLACEMENT CHARACTER U+FFFD

This is better than:
- discarding the whole message, since the user would not see it...
- removing invalid bytes, since the user would not see their presence,
- converting the encoding (this is actually not possible).

Contrary to its documentation, strings.ToValidUTF8 doesn't copy the
string if it's valid UTF-8:
<https://golang.org/src/strings/strings.go?s=15815:15861#L623>
---
 conn.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conn.go b/conn.go
index 6914179..c14f13e 100644
--- a/conn.go
+++ b/conn.go
@@ -5,8 +5,10 @@ import (
	"fmt"
	"io"
	"net"
	"strings"
	"sync"
	"time"
	"unicode"

	"gopkg.in/irc.v3"
	"nhooyr.io/websocket"
@@ -62,7 +64,7 @@ func (wic websocketIRCConn) ReadMessage() (*irc.Message, error) {
}

func (wic websocketIRCConn) WriteMessage(msg *irc.Message) error {
	b := []byte(msg.String())
	b := []byte(strings.ToValidUTF8(msg.String(), string(unicode.ReplacementChar)))
	ctx := context.Background()
	if !wic.writeDeadline.IsZero() {
		var cancel context.CancelFunc
-- 
2.28.0
LGTM and pushed, thanks!