summaryrefslogtreecommitdiff
path: root/src/checker/errors
diff options
context:
space:
mode:
Diffstat (limited to 'src/checker/errors')
-rw-r--r--src/checker/errors/mail/at_sign.cpp18
-rw-r--r--src/checker/errors/mail/at_sign.hpp16
-rw-r--r--src/checker/errors/mail/empty.cpp8
-rw-r--r--src/checker/errors/mail/empty.hpp2
-rw-r--r--src/checker/errors/settings/port_number.cpp9
-rw-r--r--src/checker/errors/settings/port_number.hpp2
-rw-r--r--src/checker/errors/settings/server.cpp39
-rw-r--r--src/checker/errors/settings/server.hpp18
-rw-r--r--src/checker/errors/types/imails_error.hpp14
-rw-r--r--src/checker/errors/types/isettings_error.hpp7
10 files changed, 120 insertions, 13 deletions
diff --git a/src/checker/errors/mail/at_sign.cpp b/src/checker/errors/mail/at_sign.cpp
new file mode 100644
index 0000000..f9dde08
--- /dev/null
+++ b/src/checker/errors/mail/at_sign.cpp
@@ -0,0 +1,18 @@
+#include <regex>
+
+#include "at_sign.hpp"
+#include "logger/logger_set.hpp"
+
+namespace smtp::checker::errors::settings
+{
+ bool AtSign::Check( std::string const& line ) const
+ {
+ std::string mask = R"([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4}))";
+ auto result = std::regex_search( line, std::regex{mask} );
+ if(!result)
+ {
+ logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Error in mail note" );
+ }
+ return result;
+ }
+}
diff --git a/src/checker/errors/mail/at_sign.hpp b/src/checker/errors/mail/at_sign.hpp
new file mode 100644
index 0000000..2f72871
--- /dev/null
+++ b/src/checker/errors/mail/at_sign.hpp
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "checker/errors/types/imails_error.hpp"
+
+namespace smtp::checker::errors::settings
+{
+ class AtSign : public types::IErrorMails
+ {
+ public:
+ AtSign() = default;
+ ~AtSign() override = default;
+
+ bool Check( std::string const& line ) const override;
+ };
+}
+
diff --git a/src/checker/errors/mail/empty.cpp b/src/checker/errors/mail/empty.cpp
index a893fbb..1c39e78 100644
--- a/src/checker/errors/mail/empty.cpp
+++ b/src/checker/errors/mail/empty.cpp
@@ -1,9 +1,15 @@
#include "empty.hpp"
+#include "logger/logger_set.hpp"
namespace smtp::checker::errors::settings
{
bool Empty::Check( std::string const& line ) const
{
- return !line.empty() && line != " ";
+ auto result = !line.empty() && line != " ";
+ if(!result)
+ {
+ logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Mails are empty" );
+ }
+ return result;
}
}
diff --git a/src/checker/errors/mail/empty.hpp b/src/checker/errors/mail/empty.hpp
index 9e8c0da..945650e 100644
--- a/src/checker/errors/mail/empty.hpp
+++ b/src/checker/errors/mail/empty.hpp
@@ -4,7 +4,7 @@
namespace smtp::checker::errors::settings
{
- class Empty : public types::IError
+ class Empty : public types::IErrorMails
{
public:
Empty() = default;
diff --git a/src/checker/errors/settings/port_number.cpp b/src/checker/errors/settings/port_number.cpp
index 73469cb..485b4c7 100644
--- a/src/checker/errors/settings/port_number.cpp
+++ b/src/checker/errors/settings/port_number.cpp
@@ -10,13 +10,12 @@ namespace smtp::checker::errors::settings
static const std::string PORT_FIELD = "port";
static constexpr int MIN_PORT_NUMBER = 0;
static constexpr int MAX_PORT_NUMBER = 65535;
- static const std::string METHOD_NAME = "Check settings";
//TODO общее использование полей
auto find = line.find( PORT_FIELD );
if( find == line.end() )
{
- logger::LoggerSet::GetInstance()->LogError( METHOD_NAME, "Port doesn't found" );
+ logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Port doesn't found" );
return false;
}
auto host_as_string = find->second;
@@ -31,17 +30,17 @@ namespace smtp::checker::errors::settings
}
catch( std::invalid_argument const& ex )
{
- logger::LoggerSet::GetInstance()->LogError( METHOD_NAME, "Port doesn't entered by numbers" );
+ logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Port doesn't entered by numbers" );
return false;
}
catch( std::out_of_range const& ex )
{
- logger::LoggerSet::GetInstance()->LogError( METHOD_NAME, "Port out of range" );
+ logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Port out of range" );
return false;
}
catch( ... )
{
- logger::LoggerSet::GetInstance()->LogError( METHOD_NAME, "Port doesn't entered by numbers" );
+ logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Port doesn't entered by numbers" );
return false;
}
return host_as_int >= MIN_PORT_NUMBER && host_as_int <= MAX_PORT_NUMBER;
diff --git a/src/checker/errors/settings/port_number.hpp b/src/checker/errors/settings/port_number.hpp
index 42ab808..789a486 100644
--- a/src/checker/errors/settings/port_number.hpp
+++ b/src/checker/errors/settings/port_number.hpp
@@ -10,7 +10,7 @@ namespace smtp::checker::errors::settings
PortNumber() = default;
~PortNumber() override = default;
- bool Check( const manage::SettingsFileDataType& line ) const override;
+ bool Check( manage::SettingsFileDataType const& line ) const override;
};
}
diff --git a/src/checker/errors/settings/server.cpp b/src/checker/errors/settings/server.cpp
new file mode 100644
index 0000000..c3f29af
--- /dev/null
+++ b/src/checker/errors/settings/server.cpp
@@ -0,0 +1,39 @@
+#include <regex>
+
+#include "server.hpp"
+#include "logger/logger_set.hpp"
+
+namespace smtp::checker::errors::settings
+{
+ //
+ //Public methods
+ //
+ bool Server::Check( manage::SettingsFileDataType const& line ) const
+ {
+ static const std::string SERVER_FIELD = "host";
+
+ auto find = line.find( SERVER_FIELD );
+ if( find == line.end() )
+ {
+ logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Host doesn't found" );
+ return false;
+ }
+ return IsNormalName( find->second ) || IsIpName( find->second );
+ }
+
+ //
+ //Private methods
+ //
+ bool Server::IsNormalName( std::string const& line ) const
+ {
+ std::string mask = "^[a-zA-Z](?:\.?[a-zA-Z0-9 ]+)+$";
+ return std::regex_search( line, std::regex{mask} );
+ }
+
+ bool Server::IsIpName( std::string const& line) const
+ {
+ std::string mask = "(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])";
+ return std::regex_search( line, std::regex{mask} );
+ }
+
+}
diff --git a/src/checker/errors/settings/server.hpp b/src/checker/errors/settings/server.hpp
new file mode 100644
index 0000000..53e6170
--- /dev/null
+++ b/src/checker/errors/settings/server.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "checker/errors/types/isettings_error.hpp"
+
+namespace smtp::checker::errors::settings
+{
+ class Server : public types::IErrorSettings
+ {
+ public:
+ Server() = default;
+ ~Server() override = default;
+
+ bool Check( manage::SettingsFileDataType const& line ) const override;
+ private:
+ bool IsNormalName( std::string const& line ) const;
+ bool IsIpName( std::string const& line ) const;
+ };
+}
diff --git a/src/checker/errors/types/imails_error.hpp b/src/checker/errors/types/imails_error.hpp
index d696bbd..277f82e 100644
--- a/src/checker/errors/types/imails_error.hpp
+++ b/src/checker/errors/types/imails_error.hpp
@@ -5,15 +5,21 @@
namespace smtp::checker::errors::types
{
- class IError
+ class IErrorMails
{
public:
- IError() = default;
- virtual ~IError() = default;
+ IErrorMails() = default;
+ virtual ~IErrorMails() = default;
+
+ std::string GetMethodName() const
+ {
+ static const std::string METHOD_NAME = "Check mails";
+ return METHOD_NAME;
+ }
virtual bool Check( std::string const& line ) const = 0;
};
- using IErrorPtr = std::shared_ptr<IError>;
+ using IErrorMailsPtr = std::shared_ptr<IErrorMails>;
}
diff --git a/src/checker/errors/types/isettings_error.hpp b/src/checker/errors/types/isettings_error.hpp
index 05f68e3..6355d79 100644
--- a/src/checker/errors/types/isettings_error.hpp
+++ b/src/checker/errors/types/isettings_error.hpp
@@ -16,7 +16,12 @@ namespace smtp::checker::errors::types
IErrorSettings() = default;
virtual ~IErrorSettings() = default;
+ std::string GetMethodName() const
+ {
+ static const std::string METHOD_NAME = "Check settings";
+ return METHOD_NAME;
+ }
virtual bool Check( manage::SettingsFileDataType const& line ) const = 0;
};
using IErrorSettingsPtr = std::shared_ptr<IErrorSettings>;
-} \ No newline at end of file
+}
generated by cgit v1.2.3 (git 2.39.0) at 2024-06-01 23:45:12 +0300