Implement file reader
This commit is contained in:
Marko Zivanovic
+5
-1
@@ -1,4 +1,5 @@
|
||||
find_package(Boost COMPONENTS unit_test_framework date_time REQUIRED)
|
||||
find_package(Boost COMPONENTS unit_test_framework date_time filesystem system REQUIRED)
|
||||
find_package(Threads)
|
||||
include_directories(
|
||||
${TEST_SOURCE_DIR/src}
|
||||
${Boost_INLUDE_DIRS}
|
||||
@@ -10,6 +11,9 @@ target_link_libraries(SyslogBulkUploaderTests
|
||||
slbu-lib
|
||||
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
|
||||
${Boost_DATE_TIME_LIBRARY}
|
||||
${Boost_FILESYSTEM_LIBRARY}
|
||||
${Boost_SYSTEM_LIBRARY}
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
)
|
||||
|
||||
add_executable(SyslogMessageTests SyslogMessageTests.cpp)
|
||||
|
||||
@@ -25,14 +25,21 @@ SOFTWARE.
|
||||
#include "../src/SyslogBulkUploader.h"
|
||||
#include "../src/Reader.h"
|
||||
#include "../src/Writer.h"
|
||||
#include "../src/FileReader.h"
|
||||
#include "../src/UDPWriter.h"
|
||||
#include "UdpSyslogServer.h"
|
||||
#include "../src/RFC3164FormattedSyslogMessage.h"
|
||||
#define BOOST_TEST_MODULE SyslogBulkUploaderTests
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include <memory>
|
||||
#define BOOST_FILESYSTEM_NO_DEPRECATED
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/date_time/posix_time/posix_time.hpp>
|
||||
|
||||
class MockReader : public Reader {
|
||||
public:
|
||||
|
||||
virtual std::shared_ptr<SyslogMessage> nextMessage() {
|
||||
virtual std::shared_ptr<const SyslogMessage> nextMessage() {
|
||||
if (_pos >= _messages.size()) {
|
||||
return std::shared_ptr<SyslogMessage>();
|
||||
} else {
|
||||
@@ -52,10 +59,11 @@ private:
|
||||
class MockWriter : public Writer {
|
||||
public:
|
||||
|
||||
virtual void sendMessage(std::shared_ptr<SyslogMessage> msg) {
|
||||
virtual void sendMessage(std::shared_ptr<const SyslogMessage> msg) {
|
||||
_messages.push_back(msg);
|
||||
std::cout << *msg << std::endl;
|
||||
};
|
||||
std::vector<std::shared_ptr<SyslogMessage>> _messages;
|
||||
std::vector<std::shared_ptr<const SyslogMessage>> _messages;
|
||||
};
|
||||
|
||||
BOOST_AUTO_TEST_CASE(test_run) {
|
||||
@@ -64,7 +72,40 @@ BOOST_AUTO_TEST_CASE(test_run) {
|
||||
SyslogBulkUploader ul(r, w);
|
||||
ul.run();
|
||||
BOOST_CHECK_EQUAL(w._messages.size(), 3);
|
||||
for (auto i = 0; i < w._messages.size(); i++) {
|
||||
std::cout << *(w._messages[i].get()) << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(test_file_reader) {
|
||||
std::cout << "Running in " << boost::filesystem::initial_path() << std::endl;
|
||||
FileReader r("../test/sample1");
|
||||
MockWriter w;
|
||||
SyslogBulkUploader ul(r, w);
|
||||
ul.run();
|
||||
BOOST_CHECK_EQUAL(w._messages.size(), 3);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(test_udp_writer) {
|
||||
using namespace boost::posix_time;
|
||||
|
||||
ptime start(second_clock::local_time());
|
||||
boost::asio::io_service ios;
|
||||
FileReader r("../test/sample1");
|
||||
UDPWriter w("localhost", 51514);
|
||||
SyslogBulkUploader ul(r, w);
|
||||
UdpSyslogServer server(ios, 51514, 2000);
|
||||
ul.run();
|
||||
|
||||
while (second_clock::local_time() - start < seconds(2)) {
|
||||
ios.run_one();
|
||||
}
|
||||
|
||||
BOOST_CHECK_EQUAL(server.messages().size(), 3);
|
||||
|
||||
auto it = server.messages().begin();
|
||||
FileReader r2("../test/sample1");
|
||||
while (auto msg = r2.nextMessage()) {
|
||||
RFC3164FormattedSyslogMessage fmt(*msg);
|
||||
BOOST_CHECK_EQUAL(*it, fmt());
|
||||
it++;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
/*
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2015 Marko Živanović
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef UDPSYSLOGSERVER_H
|
||||
#define UDPSYSLOGSERVER_H
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <boost/array.hpp>
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/asio.hpp>
|
||||
#include <boost/date_time/posix_time/posix_time.hpp>
|
||||
|
||||
using boost::asio::ip::udp;
|
||||
using namespace boost::asio;
|
||||
using namespace boost::posix_time;
|
||||
|
||||
class UdpSyslogServer {
|
||||
public:
|
||||
|
||||
UdpSyslogServer(boost::asio::io_service& ios, const int port, const int timeout)
|
||||
: _socket(ios, udp::endpoint(udp::v4(), port)), _dt(ios), _timeout(timeout) {
|
||||
deadlineHandler();
|
||||
receive();
|
||||
}
|
||||
|
||||
const std::vector<std::string>& messages() const {
|
||||
return _messages;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
void receive() {
|
||||
_dt.expires_from_now(milliseconds(_timeout));
|
||||
_socket.async_receive_from(
|
||||
boost::asio::buffer(_buffer), _peer,
|
||||
boost::bind(&UdpSyslogServer::receiveHandler, this,
|
||||
boost::asio::placeholders::error,
|
||||
boost::asio::placeholders::bytes_transferred));
|
||||
}
|
||||
|
||||
void receiveHandler(const boost::system::error_code& error, std::size_t len) {
|
||||
if (!error || error == boost::asio::error::message_size) {
|
||||
if (len > 0) {
|
||||
std::string s(_buffer.data(), len);
|
||||
_messages.push_back(s);
|
||||
}
|
||||
receive();
|
||||
}
|
||||
}
|
||||
|
||||
void deadlineHandler() {
|
||||
if (_dt.expires_at() <= deadline_timer::traits_type::now()) {
|
||||
_socket.cancel();
|
||||
_dt.expires_at(boost::posix_time::pos_infin);
|
||||
}
|
||||
|
||||
_dt.async_wait(boost::bind(&UdpSyslogServer::deadlineHandler, this));
|
||||
}
|
||||
|
||||
|
||||
udp::socket _socket;
|
||||
udp::endpoint _peer;
|
||||
boost::array<char, 1024> _buffer;
|
||||
std::vector<std::string> _messages;
|
||||
deadline_timer _dt;
|
||||
const int _timeout;
|
||||
};
|
||||
|
||||
#endif /* UDPSYSLOGSERVER_H */
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
2015-09-02 13:33:11 Local4.Critical 192.168.0.1 Kiwi_Syslog_Server %ASA-2-106007: Deny inbound UDP from 1.2.3.4/22084 to 4.3.2.1/53 due to DNS Query
|
||||
2015-09-02 13:33:11 Local4.Critical 192.168.0.1 Kiwi_Syslog_Server %ASA-2-106007: Deny inbound UDP from 1.2.3.4/22084 to 4.3.2.1/53 due to DNS Query
|
||||
2015-09-02 13:33:11 Local4.Critical 192.168.0.1 Kiwi_Syslog_Server %ASA-2-106007: Deny inbound UDP from 1.2.3.4/22084 to 4.3.2.1/53 due to DNS Query
|
||||
Reference in New Issue
Block a user