Merge pull request #59 from ArthanIRC/send-fixes

fix: failure in registration procedure is now protected

bot/src/Bot.cpp

@@ -123,13 +123,14 @@ void Bot::run() {
 void Bot::login() {
  _socket.sendMessage("CAP LS 302\r\n");
  string data = _socket.receive();
- _socket.sendMessage(
- "PASS bonjour\r\nNICK daddy\r\nUSER Dad * * :Dad\r\nCAP END\r\n");
+ string rpl = "PASS " + _password +
+ "\r\nNICK daddy\r\nUSER Dad * * :Dad\r\nCAP END\r\n";
+ _socket.sendMessage(rpl);
  data = _socket.receive();
 
  vector<string> message = Message::split(data, ' ');
  if (message.at(1) != "001")
- throw RegFailedException();
+ throw RegFailedException(data);
  this->_nickname = message.at(2);
  while (data.find("221") == string::npos) {
  data = _socket.receive();

bot/src/main.cpp

@@ -35,6 +35,9 @@ int main(int ac, char** av) {
  try {
  Bot::getInstance().init(ac, av);
  Bot::getInstance().run();
+ } catch (RegFailedException& e) {
+ std::cerr << e.what();
+ return EXIT_FAILURE;
  } catch (std::exception& e) {
  std::cerr << e.what() << "\n";
  return EXIT_FAILURE;

include/Commands/PassCommand.hpp

@@ -5,7 +5,6 @@
 
 class PassCommand : public Command {
  private:
- Client* client;
  std::string _password;
 
  public:

include/Exception.hpp

@@ -1,7 +1,19 @@
 #pragma once
 
 #include <exception>
+#include <string>
 
 class ClientException : public std::exception {};
-class RegFailedException : public std::exception {};
+class RegFailedException : public std::exception {
+ std::string _msg;
+
+ public:
+ RegFailedException(const std::string& msg) {
+ this->_msg = "Error: Registration failed\n" + msg;
+ }
+ RegFailedException() { this->_msg = "Error: registration failed."; }
+ virtual ~RegFailedException() throw() {}
+
+ virtual const char* what() const throw() { return _msg.c_str(); }
+};
 class ServerException : public std::exception {};

src/ClientSocket.cpp

@@ -96,6 +96,7 @@ void ClientSocket::executeCommand(string data, Client* client) {
  } catch (RegFailedException&) {
  sendMessage(Replies::ERR_REGFAILED());
  removeSelf();
+ throw RegFailedException();
  }
  delete c;
 }

src/Commands/PassCommand.cpp

@@ -28,11 +28,11 @@ void PassCommand::run() {
  return;
  }
  if (_client->getState() >= PASS_DONE) {
- client->sendMessage(Replies::ERR_ALREADYREGISTERED(_client));
+ _client->sendMessage(Replies::ERR_ALREADYREGISTERED(_client));
  return;
  }
  if (_password != serverPass) {
- client->sendMessage(Replies::ERR_PASSWDMISMATCH(_client));
+ _client->sendMessage(Replies::ERR_PASSWDMISMATCH(_client));
  throw RegFailedException();
  }
  _client->setState(PASS_DONE);

src/Epoll.cpp

@@ -50,6 +50,8 @@ void Epoll::poll() {
  ((Socket*)events[i].data.ptr)->onPoll(events[i].events);
  } catch (ClientException& e) {
  std::cerr << e.what() << "\n";
+ } catch (RegFailedException& e) {
+ break;
  }
  }
 }