Merge pull request jmtth#79 from jmkko/dev

jmtth · web-flow · commit fcdfab2ea6be · 2025-10-15T11:53:24.000+02:00
Update welcome reply sequence and registration logic
diff --git a/.clangd b/.clangd
@@ -37,5 +37,6 @@ CompileFlags:
     - -Iincludes/clients
     - -Iincludes/commands
     - -Iincludes/server
+    - -Itest/include
 InlayHints:
   Enabled: true
diff --git a/codes.conf b/codes.conf
@@ -7,7 +7,7 @@
 000=CORRECT_FORMAT
 001=RPL_WELCOME:Welcome to the IRC HazADoU& SerVerRrrr
 002=RPL_YOURHOST:Your host is
-004=RPL_CREATED:This server was created
+003=RPL_CREATED:This server was created today
 004=RPL_MYINFO
 005=RPL_ISUPPORT
 #internal codes
diff --git a/includes/clients/Client.hpp b/includes/clients/Client.hpp
@@ -10,20 +10,24 @@
 class Server;
 class Channel;
 
-//NOLINTNEXTLINE(performance-enum-size)
-enum ClientStatus {
-    UNAUTHENTICATED, // before anything
-    AUTHENTICATED,	 // after PASS
-    REGISTERED,      // after PASS + NICK + USER
-};
+// NOLINTNEXTLINE(performance-enum-size)
+//  enum ClientStatus {
+//      UNAUTHENTICATED, // before anything
+//      AUTHENTICATED,	 // after PASS
+//      REGISTERED,      // after PASS + NICK + USER
+//  };
+typedef unsigned short ClientStatus;
+
+#define UNAUTHENTICATED 0b00000 // NOLINT
+#define AUTHENTICATED   0b00001 // NOLINT
+#define REGISTERED      0b00010 // NOLINT
 
 class Client
 {
   public:
     Client(Socket socket, sockaddr_in addr);
     virtual ~Client();
 
-
     Socket             get_socket() const;
     const std::string& get_address() const;
     unsigned short     get_port() const;
@@ -36,32 +40,32 @@ class Client
     std::string  get_nickname() const;
     std::string  get_user_name() const;
     std::string  get_real_name() const;
-	std::string  get_userhost() const;
-	std::string  get_full_userhost() const;
+    std::string  get_userhost() const;
+    std::string  get_full_userhost() const;
     ClientStatus get_status() const;
 
     bool is_registered() const;
-	bool is_authenticated () const;
+    bool is_authenticated() const;
     int  get_nb_joined_channels() const;
 
     void set_nickname(const std::string& nick);
     void set_user_name(const std::string& userName);
     void set_real_name(const std::string& realName);
     void set_status(ClientStatus status);
     void add_joined_channel(Channel& channel);
-	void remove_joined_channel(Channel& channel);
+    void remove_joined_channel(Channel& channel);
     void remove_from_all_channels();
     void set_send_buffer(const std::string& buffer);
 
     void append_to_send_buffer(const std::string& msg);
     void append_to_read_buffer(const std::string& msg);
 
-	void broadcast_to_all_channels(Server& server, ReplyCode code, const std::string& params, const std::string& trailing = "");
-	Channel* get_channel(const std::string& name);
+    void broadcast_to_all_channels(Server& server, ReplyCode code, const std::string& params, const std::string& trailing = "");
+    Channel* get_channel(const std::string& name);
 
   private:
     Client(const Client& other);
-    Client& operator=(const Client& other);
+    Client&                         operator=(const Client& other);
     TcpSocket                       _socket;
     sockaddr_in                     _addr;
     std::string                     _addrStr;
diff --git a/srcs/clients/Client.cpp b/srcs/clients/Client.cpp
@@ -1,6 +1,5 @@
-#include "Client.hpp"
-
 #include "Channel.hpp"
+#include "Client.hpp"
 #include "Config.hpp"
 #include "LogManager.hpp"
 #include "consts.hpp"
@@ -76,9 +75,9 @@ std::string&        Client::get_read_buffer() { return _readBuffer; }
 
 bool               Client::has_data_to_send() const { return _sendBuffer.empty(); }
 
-bool               Client::is_registered() const { return _status == REGISTERED; }
+bool               Client::is_registered() const { return _status & REGISTERED; }
 
-bool               Client::is_authenticated () const { return _status == AUTHENTICATED; }
+bool               Client::is_authenticated () const { return _status & AUTHENTICATED; }
 
 int                Client::get_nb_joined_channels() const { return static_cast<int>(_joinedChannels.size()); }
 
@@ -88,7 +87,7 @@ void               Client::set_user_name(const std::string& userName) { _userNam
 
 void               Client::set_real_name(const std::string& realName) { _realName = realName; }
 
-void               Client::set_status(ClientStatus status) { _status = status; }
+void               Client::set_status(ClientStatus status) { _status = _status | status; }
 
 void               Client::add_joined_channel(Channel& channel) { _joinedChannels[channel.get_name()] = &channel; }
 
diff --git a/srcs/commands/CmdFactory.cpp b/srcs/commands/CmdFactory.cpp
@@ -1,6 +1,5 @@
-#include "CmdFactory.hpp"
-
 #include "Client.hpp"
+#include "CmdFactory.hpp"
 #include "ICommand.hpp"
 #include "Invite.hpp"
 #include "Join.hpp"
@@ -43,9 +42,10 @@ CmdFactory::~CmdFactory(void) {}
 
 bool CmdFactory::check_in(Client& client, std::string& command)
 {
-    if (!client.is_registered() && command != "NICK" && command != "USER" && command != "PASS" && command != "QUIT") {
+    if (!client.is_authenticated() && command != "PASS" && command != "QUIT")
+        return false;
+    if (!client.is_registered() && command != "USER" && command != "NICK" && command != "PASS" && command != "QUIT")
         return false;
-    }
     return true;
 }
 
diff --git a/srcs/commands/Nick.cpp b/srcs/commands/Nick.cpp
@@ -1,8 +1,7 @@
-#include "Nick.hpp"
-
 #include "Client.hpp"
 #include "Config.hpp"
 #include "LogManager.hpp"
+#include "Nick.hpp"
 #include "ReplyHandler.hpp"
 #include "Server.hpp"
 #include "reply_codes.hpp"
@@ -19,16 +18,26 @@ void Nick::execute(Server& server, Client& client)
     (void)server;
     std::string   oldNickname = client.get_nickname();
     ReplyHandler& rh          = ReplyHandler::get_instance(&server);
+    LOG_DV_CMD(_nickname);
+
     // welcome sequence complete for first time
-    if (oldNickname.empty() && client.get_user_name().empty() && client.is_authenticated()) {
-        LOG_dt_CMD("first change");
-        // rh.process_response(client, RPL_WELCOME);
+    if (oldNickname.empty() && !client.get_user_name().empty()) {
+        LOG_dt_CMD("Nick after USER");
+        client.set_status(REGISTERED);
+        rh.process_response(client,
+                            RPL_WELCOME,
+                            "",
+                            NULL,
+                            ircCodes.trailing(RPL_WELCOME) + " " + _nickname + "!" + client.get_user_name() + "@localhost");
+        rh.process_response(client, RPL_YOURHOST, "", NULL, ircCodes.trailing(RPL_YOURHOST) + " " + server.get_name());
+        rh.process_response(client, RPL_CREATED);
+        rh.process_response(client, RPL_MYINFO, "", NULL, server.get_name() + " 1.0  0 0");
         // normal success behavior
     } else if (!oldNickname.empty() && !client.get_user_name().empty() && client.is_registered()) {
         // send the message to every user in every channel that this client takes part in
         // NOT WORKING (client._joinedChannel is empty)
         client.broadcast_to_all_channels(server, TRANSFER_NICK, _nickname); // ! \\ ;
-        rh.process_response(client, TRANSFER_NICK, _nickname);
+        // rh.process_response(client, TRANSFER_NICK, _nickname);
     }
     client.set_nickname(_nickname);
 }
diff --git a/srcs/commands/User.cpp b/srcs/commands/User.cpp
@@ -1,9 +1,9 @@
-#include "User.hpp"
-
 #include "Client.hpp"
+#include "Config.hpp"
 #include "LogManager.hpp"
 #include "ReplyHandler.hpp"
 #include "Server.hpp"
+#include "User.hpp"
 #include "reply_codes.hpp"
 
 #include <iostream>
@@ -32,9 +32,17 @@ void User::execute(Server& server, Client& client)
     client.set_real_name(_realname.substr(1));
     LOG_DV_CMD(_realname);
     ReplyHandler& rh = ReplyHandler::get_instance(&server);
-    if (!client.get_nickname().empty() && client.get_status() == AUTHENTICATED) {
+    if (!client.get_nickname().empty()) {
         client.set_status(REGISTERED);
-        rh.process_response(client, RPL_WELCOME);
+        rh.process_response(
+            client,
+            RPL_WELCOME,
+            "",
+            NULL,
+            ircCodes.trailing(RPL_WELCOME) + " " + client.get_nickname() + "!" + client.get_user_name() + "@localhost");
+        rh.process_response(client, RPL_YOURHOST, "", NULL, ircCodes.trailing(RPL_YOURHOST) + " " + server.get_name());
+        rh.process_response(client, RPL_CREATED);
+        rh.process_response(client, RPL_MYINFO, "", NULL, server.get_name() + " 1.0  0 0");
     } else {
         LOG_CMD.info("202 RPL_USER");
     }
diff --git a/srcs/server/Config.cpp b/srcs/server/Config.cpp
@@ -1,5 +1,4 @@
 #include "Config.hpp"
-
 #include "LogManager.hpp"
 #include "consts.hpp"
 #include "reply_codes.hpp"
@@ -67,7 +66,7 @@ bool Config::_parse_code_file(const std::string& fileName)
         if (posColon != std::string::npos) {
             // Format: 001=RPL_WELCOME: Welcome message
             std::string value    = line.substr(posAssign + 1, posColon - posAssign - 1);
-            std::string trailing = line.substr(posColon);
+            std::string trailing = line.substr(posColon + 1);
             _codes[code]         = value;
             _trailings[code]     = trailing;
         } else {
diff --git a/srcs/server/ReplyHandler.cpp b/srcs/server/ReplyHandler.cpp
@@ -1,8 +1,7 @@
-#include "ReplyHandler.hpp"
-
 #include "Client.hpp"
 #include "Config.hpp"
 #include "LogManager.hpp"
+#include "ReplyHandler.hpp"
 #include "Server.hpp"
 #include "reply_codes.hpp"
 #include "utils.hpp"
@@ -92,11 +91,11 @@ generate_code_response(Client& client, ReplyCode code, const std::string& parame
     std::string nick          = client.get_nickname().empty() ? "*" : client.get_nickname();
     std::string numericPrefix = ":" + ircConfig.get_name() + " " + utils::code_to_str(code) + " " + nick + " ";
     if (parameters.empty() && trailing.empty())
-        return (numericPrefix + ircCodes.trailing(code));
+        return (numericPrefix + ":" + ircCodes.trailing(code));
     else if (parameters.empty() && !trailing.empty())
         return (numericPrefix + ":" + trailing);
     else if (trailing.empty())
-        return (numericPrefix + parameters + " " + ircCodes.trailing(code));
+        return (numericPrefix + parameters + " :" + ircCodes.trailing(code));
     else
         return (numericPrefix + parameters + " :" + trailing);
 }
diff --git a/test/.clangd b/test/.clangd
@@ -40,4 +40,4 @@ CompileFlags:
     - -I../includes/commands
     - -I../includes/server
 InlayHints:
-  Enabled: true
+  Enabled: true
diff --git a/test/include/AssertFail.hpp b/test/include/AssertFail.hpp
@@ -1,19 +1,18 @@
+#ifndef ASSERT_FAIL_HPP
+#define ASSERT_FAIL_HPP
 #include <exception>
 #include <string>
 
 class AssertFail : public std::exception
 {
-	public:
-	AssertFail(
-		const std::string& context = "",
-		const std::string& expected = "",
-		const std::string& actual = ""
-	);
+  public:
+    AssertFail(const std::string& context = "", const std::string& expected = "", const std::string& actual = "");
 
-	const char* what() const noexcept override;
-	
-	private:
-		std::string _message;
-		std::string _expected;
-		std::string _actual;
-};
+    const char* what() const noexcept override;
+
+  private:
+    std::string _message;
+    std::string _expected;
+    std::string _actual;
+};
+#endif
diff --git a/test/srcs/AssertFail.cpp b/test/srcs/AssertFail.cpp
@@ -1,6 +1,3 @@
-#ifndef ASSERT_FAIL_HPP
-#define ASSERT_FAIL_HPP
-
 #include "AssertFail.hpp"
 
 AssertFail::AssertFail(const std::string& context, const std::string& expected, const std::string& actual) :
@@ -11,5 +8,3 @@ AssertFail::AssertFail(const std::string& context, const std::string& expected,
 }
 
 const char* AssertFail::what() const noexcept { return _message.c_str(); }
-
-#endif
diff --git a/test/srcs/AssertReply.cpp b/test/srcs/AssertReply.cpp
@@ -1,6 +1,5 @@
-#include "AssertReply.hpp"
-
 #include "AssertFail.hpp"
+#include "AssertReply.hpp"
 #include "Config.hpp"
 #include "LogManager.hpp"
 #include "consts.hpp"
@@ -226,9 +225,9 @@ AssertReply::is_formatted(ReplyCode code, const std::string& clientNick, const s
 {
     std::string expectedStart = std::string(":" + ircConfigTest.get_name()) + " " + utils::code_to_str(code) + " " + clientNick + " ";
     if (params.empty() && trailing.empty())
-        return this->has_code(code).matches_entirely(expectedStart + ircCodes.trailing(code));
+        return this->has_code(code).matches_entirely(expectedStart + ":" + ircCodes.trailing(code));
     else if (!params.empty() && trailing.empty())
-        return this->has_code(code).matches_entirely(expectedStart + params + " " + ircCodes.trailing(code));
+        return this->has_code(code).matches_entirely(expectedStart + params + " :" + ircCodes.trailing(code));
     else if (params.empty() && !trailing.empty())
         return this->has_code(code).matches_entirely(expectedStart + ":" + trailing);
     else
diff --git a/test/srcs/testNick.cpp b/test/srcs/testNick.cpp
@@ -55,6 +55,29 @@ void valid_nick_special_should_void(Server& s)
         TEST_SETUP(test, s, 1);
         TcpSocket& so = *sockets.at(0);
         send_valid_password_assert(so);
+        send_valid_nick_assert(so);
+
+        // test
+        send_line(so, validNickSpecialMsg);
+        std::string reply = recv_lines(so);
+        AssertReply ar(reply);
+        ar.is_empty();
+
+    } catch (const std::runtime_error& e) {
+        LOG_TEST.error(e.what());
+    }
+}
+/**
+ @brief integration test - normal case
+*/
+void valid_nick_rename_special_should_void(Server& s)
+{
+    try {
+
+        TEST_SETUP(test, s, 1);
+        TcpSocket& so = *sockets.at(0);
+        send_valid_password_assert(so);
+        send_valid_nick_assert(so);
 
         // test
         send_line(so, validNickSpecialMsg);
@@ -86,6 +109,30 @@ void valid_change_should_void(Server& s)
         LOG_TEST.error(e.what());
     }
 }
+/**
+ @brief integration test - error case
+*/
+void valid_change_should_notice(Server& s)
+{
+    try {
+        TEST_SETUP(test, s, 2);
+        TcpSocket& so  = *sockets.at(0);
+        TcpSocket& so2 = *sockets.at(1);
+        make_op(so);
+        authenticate_and_join_second_user(so2);
+
+        send_line(so, validNickChangeMsg);
+        std::string reply = recv_lines(so);
+        AssertReply ar(reply);
+        ar.is_empty();
+        std::string reply2 = recv_lines(so2);
+        AssertReply ar2(reply2);
+        ar2.is_formatted_transfer("roro", "NICK", "rorotheboss");
+
+    } catch (const std::runtime_error& e) {
+        LOG_TEST.error(e.what());
+    }
+}
 
 /************************************************************
  *		❌ ERRORS											*
@@ -158,8 +205,10 @@ void test_nick(Server& s, t_results* r)
 {
     print_test_series("command NICK");
     run_test(r, [&] { valid_nick_should_void(s); }, "roro");
-    run_test(r, [&] { valid_nick_special_should_void(s); }, "[roro]");
+    run_test(r, [&] { valid_nick_should_void(s); }, "roro->roro the boss should void himself but notice others");
+    run_test(r, [&] { valid_nick_special_should_void(s); }, "[roro] should void himself");
+    run_test(r, [&] { valid_nick_rename_special_should_void(s); }, "roro->[roro] should void himself");
     run_test(r, [&] { no_arg_should_err(s); }, "no arg");
     run_test(r, [&] { starting_with_number_should_err(s); }, "3oro");
     run_test(r, [&] { taken_should_err(s); }, "taken");
-}
+}
diff --git a/test/srcs/testPing.cpp b/test/srcs/testPing.cpp
