smallsolar/MiniChat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make the user and nick and password more secure

Browse Source
This commit is contained in:
mochaoui
2024-04-28 18:55:00 +01:00
parent e9c1d60f46
commit beb4db3d02
2 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Server.cpp
View File

@@ -334,16 +334,6 @@ bool Server::dontputthesameusername(const std::string& username) {
return false; return false;
} }
int Server::findUserFdforkickregulars(const std::string& username) {
std::map<int, std::string>::iterator it;
for (it = usernamesregulars.begin(); it != usernamesregulars.end(); ++it) {
if (it->second == username) {
return it->first;
}
}
return -1;
}
// brodcasting msg to all nicks in the channel // brodcasting msg to all nicks in the channel
void Server::broadcastMessage(const std::string& channel, const std::string& senderNickname, const std::string& msg) { void Server::broadcastMessage(const std::string& channel, const std::string& senderNickname, const std::string& msg) {
@@ -517,15 +507,6 @@ void Server::smallbroadcastMOOD(std::string nicknamesender, const std::string& c
} }
} }
void Server::kickUser(int fd) {
close(fd);
std::map<int, std::string>::iterator it = usernamesregulars.find(fd);
if (it != usernamesregulars.end()) {
usernamesregulars.erase(it);
}
}
int stringToInt(const std::string& str) { int stringToInt(const std::string& str) {
std::stringstream ss(str); std::stringstream ss(str);
int result; int result;
@@ -562,14 +543,28 @@ void Server::handleClientData(int fd)
//******************* FROM THERE IM STARTING TOP GGG ************ //******************* FROM THERE IM STARTING TOP GGG ************
if ((startsWith(command, "pass") || startsWith(command, "PASS")) && auth == 0) if ((startsWith(command, "pass ") || startsWith(command, "PASS ")) && auth == 0)
{ {
std::string cmd, password; std::string passwordLine = command.substr(command.find(" ") + 1);
std::istringstream iss(command); passwordLine = trim(passwordLine);
iss >> cmd >> password;
password = trim(password); // Remove leading/trailing whitespace // Check if the password starts and ends with a quote
if (!passwordLine.empty() && ((passwordLine[0] == '"' && passwordLine.size() > 1 && passwordLine[passwordLine.size() - 1] == '"') ||
(passwordLine[0] == '\'' && passwordLine.size() > 1 && passwordLine[passwordLine.size() - 1] == '\'')))
{
// Remove the quotes
passwordLine = passwordLine.substr(1, passwordLine.size() - 2);
}
// Validate the password
if (passwordLine.empty())
{
std::string errorMessage = "Error: Password cannot be empty\n";
send(fd, errorMessage.c_str(), errorMessage.length(), 0);
return;
}
std::string passwordoftheserver = getPassowrd(); std::string passwordoftheserver = getPassowrd();
if (passwordoftheserver != password) if (passwordoftheserver != passwordLine)
{ {
std::string errorMessage = "Error: Incorrect Password\n"; std::string errorMessage = "Error: Incorrect Password\n";
send(fd, errorMessage.c_str(), errorMessage.length(), 0); send(fd, errorMessage.c_str(), errorMessage.length(), 0);
@@ -617,19 +612,24 @@ void Server::handleClientData(int fd)
std::cout << "ping was sent" << std::endl; std::cout << "ping was sent" << std::endl;
} }
else if ((startsWith(command, "nick") || startsWith(command, "NICK")) && auth == 1) else if ((startsWith(command, "nick ") || startsWith(command, "NICK ")) && auth == 1)
{ {
std::string cmd, nick; std::string cmd, nick;
std::istringstream iss(command); std::istringstream iss(command);
iss >> cmd >> nick; iss >> cmd >> nick;
nick = trim(nick); nick = trim(nick);
if (iss.fail())
// Check if there are more tokens after the nickname
std::string remaining;
if (iss >> remaining)
{ {
std::string errorMessage = "Error: Command requires 1 parameters\n"; std::string errorMessage = "Error: Command requires only 1 parameter\n";
send(fd, errorMessage.c_str(), errorMessage.length(), 0); send(fd, errorMessage.c_str(), errorMessage.length(), 0);
return; return;
} }
if (dontputthesamenick(nick) == true)
// Validate the nickname
if (dontputthesamenick(nick))
{ {
std::string confirmation = "Please Use a Different Nickname : \n"; std::string confirmation = "Please Use a Different Nickname : \n";
send(fd, confirmation.c_str(), confirmation.length(), 0); send(fd, confirmation.c_str(), confirmation.length(), 0);
@@ -642,7 +642,7 @@ void Server::handleClientData(int fd)
if (_clients[i].getFd() == fd) if (_clients[i].getFd() == fd)
{ {
_clients[i].setNick(nick); _clients[i].setNick(nick);
std::cout << "Password set for client " << fd << ": " << nick << std::endl; std::cout << "Nickname set for client " << fd << ": " << nick << std::endl;
break; break;
} }
} }
@@ -650,8 +650,8 @@ void Server::handleClientData(int fd)
send(fd, confirmation.c_str(), confirmation.length(), 0); send(fd, confirmation.c_str(), confirmation.length(), 0);
getClientByFd(fd).setAuthentication(2); getClientByFd(fd).setAuthentication(2);
} }
} }
else if ((startsWith(command, "user") || startsWith(command, "USER")) && auth == 2) else if ((startsWith(command, "user") || startsWith(command, "USER")) && auth == 2)
{ {
@@ -663,7 +663,8 @@ void Server::handleClientData(int fd)
dontworry1 = trim(dontworry1); dontworry1 = trim(dontworry1);
realname = trim(realname); realname = trim(realname);
if (iss.fail()) std::string reme;
if (iss.fail() || iss >> reme)
{ {
std::string errorMessage = "Error: Command requires at least four parameters\n"; std::string errorMessage = "Error: Command requires at least four parameters\n";
send(fd, errorMessage.c_str(), errorMessage.length(), 0); send(fd, errorMessage.c_str(), errorMessage.length(), 0);

3
Server.hpp
View File

@@ -39,10 +39,7 @@ class Server {
std::vector<Client> _clients; std::vector<Client> _clients;
// THAT'S THA DATA OF TOOOP GGG START FROM THERE . // THAT'S THA DATA OF TOOOP GGG START FROM THERE .
std::map<int, std::string> nicknames; // Replace unordered_map with map std::map<int, std::string> nicknames; // Replace unordered_map with map
std::map<int, std::string> usernamesoperators; // Replace unordered_map with map
std::map<int, std::string> usernames; // Replace unordered_map with map std::map<int, std::string> usernames; // Replace unordered_map with map
std::map<int, std::string> usernamesregulars;
// std::map<std::string, std::vector<std::string> > channels; //here a chanel name and list of client in every chanel // std::map<std::string, std::vector<std::string> > channels; //here a chanel name and list of client in every chanel
std::map<std::string, Channel> channels; std::map<std::string, Channel> channels;