fix recieiving attachment

leak less infomations
signal-golang · Nov 20, 2021 · 499de57 · 499de57
1 parent 6d2d3f6
commit 499de57
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/cmd/textsecure/crayfish b/cmd/textsecure/crayfish
diff --git a/crayfish/backend.go b/crayfish/backend.go
@@ -380,7 +380,7 @@ func (c *CrayfishInstance) StartWebsocket() error {
 			}
 			return err
 		}
-		log.Debugln("[textsecure-crayfish-ws] incoming msg", string(bmsg))
+		log.Debugln("[textsecure-crayfish-ws] incoming msg")
 		csm := &CrayfishWebSocketMessage{}
 		err = json.Unmarshal(bmsg, csm)
 		if err != nil {
@@ -549,7 +549,7 @@ func (c *CrayfishInstance) HandleEnvelope(msg []byte) (*CrayfishWebSocketRespons
 	envelopeMessage := &CrayfishWebSocketRequest_HANDLE_ENVELOPE_MESSAGE{
 		Message: sEnc,
 	}
-	log.Debugln("[textsecure-crayfish-ws] Sending envelope", msg)
+	log.Debugln("[textsecure-crayfish-ws] Sending envelope")
 
 	request := &CrayfishWebSocketRequestMessage{
 		Type:    &requestType,
@@ -567,6 +567,7 @@ func (c *CrayfishInstance) HandleEnvelope(msg []byte) (*CrayfishWebSocketRespons
 	c.wsconn.send <- m
 	c.receiveChannel = make(chan *CrayfishWebSocketResponseMessage, 1)
 	response := <-c.receiveChannel
+	log.Debugf("[textsecure-crayfish-ws] HandleEnvelope recieved an response")
 	rm, err := json.Marshal(response.Message)
 	if err != nil {
 		return nil, err
@@ -576,5 +577,6 @@ func (c *CrayfishInstance) HandleEnvelope(msg []byte) (*CrayfishWebSocketRespons
 	if err != nil {
 		return nil, err
 	}
+
 	return &data, nil
 }
diff --git a/handler.go b/handler.go
@@ -9,13 +9,14 @@ import (
 )
 
 func handleMessage(srcE164 string, srcUUID string, timestamp uint64, b []byte) error {
-	b = stripPadding(b)
 
 	content := &signalservice.Content{}
 	err := proto.Unmarshal(b, content)
 	if err != nil {
+		log.Errorln("[textsecure] handleMessage umarshalling", err)
 		return err
 	}
+	log.Debugln("[textsecure] handleMessage")
 
 	if dm := content.GetDataMessage(); dm != nil {
 		return handleDataMessage(srcE164, srcUUID, timestamp, dm)

diff --git a/textsecure.go b/textsecure.go
@@ -623,6 +623,7 @@ func handleReceivedMessage(env *signalservice.Envelope) error {
 		if err != nil {
 			return err
 		}
+		b = stripPadding(b)
 		err = handleMessage(env.GetSourceE164(), env.GetSourceUuid(), env.GetTimestamp(), b)
 		if err != nil {
 			return err
@@ -650,6 +651,7 @@ func handleReceivedMessage(env *signalservice.Envelope) error {
 		if err != nil {
 			return err
 		}
+		b = stripPadding(b)
 		err = handleMessage(env.GetSourceE164(), env.GetSourceUuid(), env.GetTimestamp(), b)
 		if err != nil {
 			return err