Skip to content
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

Jump to bottom

Fix ext_proc fuzzer test issues. #27619

Merged
merged 4 commits into from
May 26, 2023
Merged

Fix ext_proc fuzzer test issues. #27619

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d472c34
Fix ext_proc fuzzer test issues.
yanjunxiang-google May 24, 2023
38b3f65
revert openstream change
yanjunxiang-google May 25, 2023
930af3b
merge upstream main
yanjunxiang-google May 25, 2023
aa57918
return ptr -> return &
yanjunxiang-google May 26, 2023
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
28 changes: 28 additions & 0 deletions ...tp/ext_proc/unit_test_fuzz/ext_proc_corpus/crash-df781e3c1eede590dddbb6d3fd7e58f87b8d89cd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion test/extensions/filters/http/ext_proc/unit_test_fuzz/ext_proc_unit_test_fuzz.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,26 @@ namespace UnitTestFuzz {

class FuzzerMocks {
public:
FuzzerMocks() : addr_(std::make_shared<Network::Address::PipeInstance>("/test/test.sock")) {
FuzzerMocks()
: addr_(std::make_shared<Network::Address::PipeInstance>("/test/test.sock")), buffer_("foo") {
ON_CALL(decoder_callbacks_, connection())
.WillByDefault(Return(OptRef<const Network::Connection>{connection_}));
connection_.stream_info_.downstream_connection_info_provider_->setRemoteAddress(addr_);
connection_.stream_info_.downstream_connection_info_provider_->setLocalAddress(addr_);
ON_CALL(decoder_callbacks_, addDecodedTrailers()).WillByDefault(ReturnRef(request_trailers_));
ON_CALL(encoder_callbacks_, addEncodedTrailers()).WillByDefault(ReturnRef(response_trailers_));
ON_CALL(decoder_callbacks_, addDecodedData(_, _)).WillByDefault(Return());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I fully understand this, but I thought that the default behavior of a (Nice)Mock is to return the default value. Do these override a different ON_CALL somewhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah,no need. removed.

ON_CALL(encoder_callbacks_, addEncodedData(_, _)).WillByDefault(Return());
ON_CALL(decoder_callbacks_, decodingBuffer()).WillByDefault(Return(buffer_ptr_ = &buffer_));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason the assignment is being done as part of the Return statement?

I suggest returning the address of buffer_ directly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

ON_CALL(encoder_callbacks_, encodingBuffer()).WillByDefault(Return(buffer_ptr_ = &buffer_));
ON_CALL(decoder_callbacks_, continueDecoding()).WillByDefault(Return());
ON_CALL(encoder_callbacks_, continueEncoding()).WillByDefault(Return());
ON_CALL(decoder_callbacks_, modifyDecodingBuffer(_)).WillByDefault(Return());
ON_CALL(encoder_callbacks_, modifyEncodingBuffer(_)).WillByDefault(Return());
ON_CALL(decoder_callbacks_, decoderBufferLimit()).WillByDefault(Return(1024));
ON_CALL(encoder_callbacks_, encoderBufferLimit()).WillByDefault(Return(1024));
ON_CALL(decoder_callbacks_, injectDecodedDataToFilterChain(_, _)).WillByDefault(Return());
ON_CALL(encoder_callbacks_, injectEncodedDataToFilterChain(_, _)).WillByDefault(Return());
}

NiceMock<Http::MockStreamDecoderFilterCallbacks> decoder_callbacks_;
Expand All @@ -33,6 +46,8 @@ class FuzzerMocks {
NiceMock<Envoy::Network::MockConnection> connection_;
NiceMock<Http::TestRequestTrailerMapImpl> request_trailers_;
NiceMock<Http::TestResponseTrailerMapImpl> response_trailers_;
NiceMock<Buffer::OwnedImpl> buffer_;
NiceMock<Buffer::OwnedImpl>* buffer_ptr_;
testing::NiceMock<StreamInfo::MockStreamInfo> async_client_stream_info_;
};

Expand Down