mirror of https://github.com/ethereum/go-ethereum
whisper: fix issue in topic list copy (#16381)
- Fixes #16271. What was appeneded was a pointer to an object that changes during the iteration. - The topic is allocated as a 4-byte array, fill partial topics with 0s. Partial topics are currently disabled, but would crash as they rely on the presence of byte number 3.pull/16397/head
parent
45bd4fedde
commit
80449719bd
@ -0,0 +1,78 @@ |
|||||||
|
// Copyright 2018 The go-ethereum Authors
|
||||||
|
// This file is part of the go-ethereum library.
|
||||||
|
//
|
||||||
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public License
|
||||||
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package whisperv6 |
||||||
|
|
||||||
|
import ( |
||||||
|
"bytes" |
||||||
|
"crypto/ecdsa" |
||||||
|
"testing" |
||||||
|
"time" |
||||||
|
|
||||||
|
"github.com/ethereum/go-ethereum/common" |
||||||
|
set "gopkg.in/fatih/set.v0" |
||||||
|
) |
||||||
|
|
||||||
|
func TestMultipleTopicCopyInNewMessageFilter(t *testing.T) { |
||||||
|
w := &Whisper{ |
||||||
|
privateKeys: make(map[string]*ecdsa.PrivateKey), |
||||||
|
symKeys: make(map[string][]byte), |
||||||
|
envelopes: make(map[common.Hash]*Envelope), |
||||||
|
expirations: make(map[uint32]*set.SetNonTS), |
||||||
|
peers: make(map[*Peer]struct{}), |
||||||
|
messageQueue: make(chan *Envelope, messageQueueLimit), |
||||||
|
p2pMsgQueue: make(chan *Envelope, messageQueueLimit), |
||||||
|
quit: make(chan struct{}), |
||||||
|
syncAllowance: DefaultSyncAllowance, |
||||||
|
} |
||||||
|
w.filters = NewFilters(w) |
||||||
|
|
||||||
|
keyID, err := w.GenerateSymKey() |
||||||
|
if err != nil { |
||||||
|
t.Fatalf("Error generating symmetric key: %v", err) |
||||||
|
} |
||||||
|
api := PublicWhisperAPI{ |
||||||
|
w: w, |
||||||
|
lastUsed: make(map[string]time.Time), |
||||||
|
} |
||||||
|
|
||||||
|
t1 := [4]byte{0xde, 0xea, 0xbe, 0xef} |
||||||
|
t2 := [4]byte{0xca, 0xfe, 0xde, 0xca} |
||||||
|
|
||||||
|
crit := Criteria{ |
||||||
|
SymKeyID: keyID, |
||||||
|
Topics: []TopicType{TopicType(t1), TopicType(t2)}, |
||||||
|
} |
||||||
|
|
||||||
|
_, err = api.NewMessageFilter(crit) |
||||||
|
if err != nil { |
||||||
|
t.Fatalf("Error creating the filter: %v", err) |
||||||
|
} |
||||||
|
|
||||||
|
found := false |
||||||
|
candidates := w.filters.getWatchersByTopic(TopicType(t1)) |
||||||
|
for _, f := range candidates { |
||||||
|
if len(f.Topics) == 2 { |
||||||
|
if bytes.Equal(f.Topics[0], t1[:]) && bytes.Equal(f.Topics[1], t2[:]) { |
||||||
|
found = true |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
if !found { |
||||||
|
t.Fatalf("Could not find filter with both topics") |
||||||
|
} |
||||||
|
} |
Loading…
Reference in new issue