tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Validate binlog event just before a write

Browse Source 
GitOrigin-RevId: cea03381299348b0c33af5f963ff24cb97f1e6e1
This commit is contained in:
Arseny Smirnov 2018-07-09 13:48:22 +03:00
parent 9fa03cbda4
commit 9fd6ea8502
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tddb/td/db/binlog/Binlog.cpp
View File

@ -121,9 +121,9 @@ class BinlogReader {
return Status::Error(PSLICE() << "Too small event " << tag("size", size_)); return Status::Error(PSLICE() << "Too small event " << tag("size", size_));
} }
if (size_ % 4 != 0) { if (size_ % 4 != 0) {
return Status::Error(-2, PSLICE() << "Event of size " << size_ << " at offset " << offset() << " out of " << expected_size_ << ' ' return Status::Error(-2, PSLICE() << "Event of size " << size_ << " at offset " << offset() << " out of "
<< tag("is_encrypted", is_encrypted_) << expected_size_ << ' ' << tag("is_encrypted", is_encrypted_)
<< format::as_hex_dump<4>(Slice(input_->prepare_read().truncate(28)))); << format::as_hex_dump<4>(Slice(input_->prepare_read().truncate(28))));
} }
state_ = ReadEvent; state_ = ReadEvent;
} }
@ -305,7 +305,12 @@ void Binlog::do_event(BinlogEvent &&event) {
fd_size_ += event.raw_event_.size(); fd_size_ += event.raw_event_.size();
if (state_ == State::Run || state_ == State::Reindex) { if (state_ == State::Run || state_ == State::Reindex) {
VLOG(binlog) << "Write binlog event: " << format::cond(state_ == State::Reindex, "[reindex] ") << event; VLOG(binlog) << "Write binlog event: " << format::cond(state_ == State::Reindex, "[reindex] ");
auto validate_status = event.validate();
if (validate_status.is_error()) {
LOG(FATAL) << "Failed to validate binlog event " << validate_status << " "
<< format::as_hex_dump<4>(Slice(event.raw_event_.as_slice().truncate(28)));
}
switch (encryption_type_) { switch (encryption_type_) {
case EncryptionType::None: { case EncryptionType::None: {
buffer_writer_.append(event.raw_event_.clone()); buffer_writer_.append(event.raw_event_.clone());

14
tddb/td/db/binlog/BinlogEvent.cpp
View File

@ -28,11 +28,23 @@ Status BinlogEvent::init(BufferSlice &&raw_event, bool check_crc) {
auto calculated_crc = crc32(raw_event.as_slice().truncate(size_ - EVENT_TAIL_SIZE)); auto calculated_crc = crc32(raw_event.as_slice().truncate(size_ - EVENT_TAIL_SIZE));
if (calculated_crc != crc32_) { if (calculated_crc != crc32_) {
return Status::Error(PSLICE() << "crc mismatch " << tag("actual", format::as_hex(calculated_crc)) return Status::Error(PSLICE() << "crc mismatch " << tag("actual", format::as_hex(calculated_crc))
<< tag("expected", format::as_hex(crc32_))); << tag("expected", format::as_hex(crc32_)) << public_to_string());
} }
} }
raw_event_ = std::move(raw_event); raw_event_ = std::move(raw_event);
return Status::OK(); return Status::OK();
} }
Status BinlogEvent::validate() const {
BinlogEvent event;
if (raw_event_.size() < 4) {
return Status::Error("Too small event");
}
uint32 size = TlParser(raw_event_.as_slice().truncate(4)).fetch_int();
if (size_ != size) {
return Status::Error(PSLICE() << "Size of event changed: " << tag("was", size_) << tag("now", size));
}
return event.init(raw_event_.clone(), true);
}
} // namespace td } // namespace td

2
tddb/td/db/binlog/BinlogEvent.h
View File

@ -106,6 +106,8 @@ struct BinlogEvent {
return PSTRING() << "LogEvent[" << tag("id", format::as_hex(id_)) << tag("type", type_) << tag("flags", flags_) return PSTRING() << "LogEvent[" << tag("id", format::as_hex(id_)) << tag("type", type_) << tag("flags", flags_)
<< tag("data", data_.size()) << "]" << debug_info_; << tag("data", data_.size()) << "]" << debug_info_;
} }
Status validate() const;
}; };
inline StringBuilder &operator<<(StringBuilder &sb, const BinlogEvent &event) { inline StringBuilder &operator<<(StringBuilder &sb, const BinlogEvent &event) {