Skip to content

fix filter manager crash #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 1 commit into from
Aug 11, 2016
+23 −9
Merged

fix filter manager crash #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/common/network/filter_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ class FilterManager {

Connection& connection_;
BufferSource& buffer_source_;
Upstream::HostDescriptionPtr host_description_;
std::list<ActiveReadFilterPtr> upstream_filters_;
std::list<WriteFilterPtr> downstream_filters_;
Upstream::HostDescriptionPtr host_description_;
};

} // Network
30 changes: 22 additions & 8 deletions test/common/network/filter_manager_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "test/mocks/upstream/host.h"

using testing::InSequence;
using testing::NiceMock;
using testing::Return;

namespace Network {
Expand All @@ -19,20 +20,33 @@ class NetworkFilterManagerTest : public testing::Test, public BufferSource {
Buffer::OwnedImpl write_buffer_;
};

class LocalMockFilter : public MockFilter {
public:
LocalMockFilter(const Upstream::HostDescription* host) : host_(host) {}
~LocalMockFilter() {
// Make sure the upstream host is still valid in the filter destructor.
callbacks_->upstreamHost()->url();
}

private:
const Upstream::HostDescription* host_;
};

TEST_F(NetworkFilterManagerTest, All) {
InSequence s;
std::shared_ptr<MockReadFilter> read_filter(new MockReadFilter());
std::shared_ptr<MockWriteFilter> write_filter(new MockWriteFilter());
std::shared_ptr<MockFilter> filter(new MockFilter());

Upstream::HostDescription* host_description(new NiceMock<Upstream::MockHostDescription>());
MockReadFilter* read_filter(new MockReadFilter());
MockWriteFilter* write_filter(new MockWriteFilter());
MockFilter* filter(new LocalMockFilter(host_description));

MockConnection connection;
FilterManager manager(connection, *this);
manager.addReadFilter(read_filter);
manager.addWriteFilter(write_filter);
manager.addFilter(filter);
manager.addReadFilter(ReadFilterPtr{read_filter});
manager.addWriteFilter(WriteFilterPtr{write_filter});
manager.addFilter(FilterPtr{filter});

Upstream::HostDescriptionPtr host_description(new Upstream::MockHostDescription());
read_filter->callbacks_->upstreamHost(host_description);
read_filter->callbacks_->upstreamHost(Upstream::HostDescriptionPtr{host_description});
EXPECT_EQ(read_filter->callbacks_->upstreamHost(), filter->callbacks_->upstreamHost());

read_buffer_.add("hello");
Expand Down