nanopenguin/verts-twmailer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed login

Browse Source 
has memory leaks
This commit is contained in:
Benedikt Galbavy 2023-11-19 17:43:31 +01:00
parent e8f7d8e55d
commit 5124ff12e9
2 changed files with 140 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
client/client.cpp
View File

@ -10,6 +10,8 @@
#include <string> #include <string>
#include <string.h> #include <string.h>
#include <termios.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define BUF 1024 #define BUF 1024
@ -28,6 +30,7 @@ enum commands {
inline bool isInteger(const std::string & s); inline bool isInteger(const std::string & s);
void printUsage(); void printUsage();
const std::string getpass();
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -113,9 +116,8 @@ int main(int argc, char **argv)
std::string loggedInPassword; std::string loggedInPassword;
do { do {
printf("Please specify a command (SEND, LIST, READ, DEL, QUIT, LOGIN): "); printf("Please specify a command (LOGIN, SEND, LIST, READ, DEL, QUIT): ");
if (fgets(buffer, BUF - 1, stdin) != NULL) if (fgets(buffer, BUF - 1, stdin) != NULL) {
{
size = strlen(buffer); size = strlen(buffer);
if (buffer[size - 2] == '\r' && buffer[size - 1] == '\n') if (buffer[size - 2] == '\r' && buffer[size - 1] == '\n')
{ {
@ -140,72 +142,70 @@ int main(int argc, char **argv)
switch (cmd) { switch (cmd) {
case LOGIN: case LOGIN:
if (!isLoggedIn) { if (isLoggedIn) {
printf("LDAP Username: ");
fgets(buffer, BUF - 1, stdin);
loggedInUsername = buffer;
loggedInUsername.pop_back();
printf("Password: ");
fgets(buffer, BUF - 1, stdin);
loggedInPassword = buffer;
loggedInPassword.pop_back();
snprintf(buffer, sizeof(buffer), "LOGIN\n%s\n%s\n", loggedInUsername.c_str(), loggedInPassword.c_str());
isLoggedIn = true;
} else {
printf("Already logged in as %s\n", loggedInUsername.c_str()); printf("Already logged in as %s\n", loggedInUsername.c_str());
continue;
} }
printf("LDAP Username: ");
fgets(buffer, BUF - 1, stdin);
loggedInUsername = buffer;
loggedInUsername.pop_back();
printf("Password: ");
loggedInPassword = getpass();
snprintf(buffer, sizeof(buffer), "LOGIN\n%s\n%s\n", loggedInUsername.c_str(), loggedInPassword.c_str());
isLoggedIn = true;
break; break;
case SEND: case SEND:
if (isLoggedIn) { if (!isLoggedIn) {
char receiver[BUF], subject[81], message[BUF * 10]; printf("Please login first.\n");
printf("Receiver: "); continue;;
fgets(receiver, BUF - 1, stdin); }
printf("Subject: "); char receiver[BUF], subject[81], message[BUF * 10];
fgets(subject, 80, stdin); printf("Receiver: ");
printf("Message (send by typing \".\" in a seperate line): "); fgets(receiver, BUF - 1, stdin);
char line[BUF]; printf("Subject: ");
message[0] = '\0'; fgets(subject, 80, stdin);
while (true) { printf("Message (send by typing \".\" in a seperate line): ");
fgets(line, BUF - 1, stdin); char line[BUF];
if (strcmp(line, ".\n") == 0) message[0] = '\0';
break; while (true) {
strcat(message, line); fgets(line, BUF - 1, stdin);
} if (strcmp(line, ".\n") == 0)
snprintf(buffer, sizeof(buffer), "SEND\n%s\n%s\n%s\n%s.\n", loggedInUsername.c_str(), receiver, subject, message); break;
} else { strcat(message, line);
printf("Please login first.\n"); }
} snprintf(buffer, sizeof(buffer), "SEND\n%s\n%s\n%s\n%s.\n", loggedInUsername.c_str(), receiver, subject, message);
break; break;
case LIST: case LIST:
if (isLoggedIn) { if (isLoggedIn) {
snprintf(buffer, sizeof(buffer), "LIST\n%s", loggedInUsername.c_str());
} else {
printf("Please login first.\n"); printf("Please login first.\n");
} continue;
}
snprintf(buffer, sizeof(buffer), "LIST\n%s", loggedInUsername.c_str());
break; break;
case READ: case READ:
if (isLoggedIn) { if (isLoggedIn) {
printf("Message Number: ");
fgets(msgNum, 9, stdin);
snprintf(buffer, sizeof(buffer), "READ\n%s\n%s", loggedInUsername.c_str(), msgNum);
} else {
printf("Please login first.\n"); printf("Please login first.\n");
} continue;
break; }
printf("Message Number: ");
fgets(msgNum, 9, stdin);
snprintf(buffer, sizeof(buffer), "READ\n%s\n%s", loggedInUsername.c_str(), msgNum);
break;
case DEL: case DEL:
if (isLoggedIn) { if (isLoggedIn) {
printf("Message Number: ");
fgets(msgNum, 9, stdin);
snprintf(buffer, sizeof(buffer), "DEL\n%s\n%s", loggedInUsername.c_str(), msgNum);
} else {
printf("Please login first.\n"); printf("Please login first.\n");
} continue;
}
printf("Message Number: ");
fgets(msgNum, 9, stdin);
snprintf(buffer, sizeof(buffer), "DEL\n%s\n%s", loggedInUsername.c_str(), msgNum);
break; break;
case QUIT: case QUIT:
// should never be reached;
break; break;
} }
@ -300,4 +300,76 @@ inline bool isInteger(const std::string & s)
void printUsage() void printUsage()
{ {
printf("Usage: <twmailer-server [host/ip (default: 127.0.0.1)] [port]>\n"); printf("Usage: <twmailer-server [host/ip (default: 127.0.0.1)] [port]>\n");
}
int getch()
{
int ch;
// https://man7.org/linux/man-pages/man3/termios.3.html
struct termios t_old, t_new;
// https://man7.org/linux/man-pages/man3/termios.3.html
// tcgetattr() gets the parameters associated with the object referred
// by fd and stores them in the termios structure referenced by
// termios_p
tcgetattr(STDIN_FILENO, &t_old);
// copy old to new to have a base for setting c_lflags
t_new = t_old;
// https://man7.org/linux/man-pages/man3/termios.3.html
//
// ICANON Enable canonical mode (described below).
// * Input is made available line by line (max 4096 chars).
// * In noncanonical mode input is available immediately.
//
// ECHO Echo input characters.
t_new.c_lflag &= ~(ICANON | ECHO);
// sets the attributes
// TCSANOW: the change occurs immediately.
tcsetattr(STDIN_FILENO, TCSANOW, &t_new);
ch = getchar();
// reset stored attributes
tcsetattr(STDIN_FILENO, TCSANOW, &t_old);
return ch;
}
const std::string getpass()
{
int show_asterisk = 0;
const char BACKSPACE = 127;
const char RETURN = 10;
unsigned char ch = 0;
std::string password;
while ((ch = getch()) != RETURN)
{
if (ch == BACKSPACE)
{
if (password.length() != 0)
{
if (show_asterisk)
{
printf("\b \b"); // backslash: \b
}
password.resize(password.length() - 1);
}
}
else
{
password += ch;
if (show_asterisk)
{
printf("*");
}
}
}
printf("\n");
return password;
} }

36
server/server.cpp
View File

@ -71,7 +71,7 @@ std::string getSha1(const std::string& p_arg);
void *clientCommunication(void *data); void *clientCommunication(void *data);
void signalHandler(int sig); void signalHandler(int sig);
std::string cmdLOGIN(std::vector<std::string>& received); std::string cmdLOGIN(std::vector<std::string>& received, std::string& loggedInUsername);
std::string cmdSEND(std::vector<std::string>& received, const std::string& loggedInUsername); std::string cmdSEND(std::vector<std::string>& received, const std::string& loggedInUsername);
std::string cmdLIST(std::vector<std::string>& received, const std::string& loggedInUsername); std::string cmdLIST(std::vector<std::string>& received, const std::string& loggedInUsername);
std::string cmdREAD(std::vector<std::string>& received, const std::string& loggedInUsername); std::string cmdREAD(std::vector<std::string>& received, const std::string& loggedInUsername);
@ -260,12 +260,6 @@ void *clientCommunication(void *data)
lines.push_back(line); lines.push_back(line);
} }
std::vector<std::string> received;
while (std::getline(ss, line, '\n')) {
received.push_back(line);
}
enum commands cmd; enum commands cmd;
// can't wait for reflections (maybe c++26?) // can't wait for reflections (maybe c++26?)
@ -281,26 +275,29 @@ void *clientCommunication(void *data)
switch (cmd) { switch (cmd) {
case LOGIN: case LOGIN:
loggedInUsername = cmdLOGIN(received); response = cmdLOGIN(lines, loggedInUsername);
break; break;
case SEND: case SEND:
if (received.size() < 5 || received.back().compare(".") != 0) { if (lines.size() < 5 || lines.back().compare(".") != 0) {
incomplete_message = buffer; incomplete_message = buffer;
continue; continue;
} }
response = cmdSEND(received, loggedInUsername); response = cmdSEND(lines, loggedInUsername);
break; break;
case LIST: case LIST:
response = cmdLIST(received, loggedInUsername); response = cmdLIST(lines, loggedInUsername);
break; break;
case READ: case READ:
response = cmdREAD(received, loggedInUsername); response = cmdREAD(lines, loggedInUsername);
break; break;
case DEL: case DEL:
response = cmdDEL(received, loggedInUsername); response = cmdDEL(lines, loggedInUsername);
break; break;
case QUIT: case QUIT:
break; break;
default:
// invalid command
response = "ERR\n";
} }
if (send(*current_socket, response.c_str(), response.size(), 0) == -1) { if (send(*current_socket, response.c_str(), response.size(), 0) == -1) {
@ -397,7 +394,7 @@ inline void exiting()
printf("Saving... \n"); printf("Saving... \n");
} }
std::string cmdLOGIN(std::vector<std::string>& received) std::string cmdLOGIN(std::vector<std::string>& received, std::string& loggedInUsername)
{ {
if (received.size() < 3) { if (received.size() < 3) {
return "ERR\n"; return "ERR\n";
@ -423,19 +420,20 @@ std::string cmdLOGIN(std::vector<std::string>& received)
return "ERR\n"; return "ERR\n";
} }
std::string ldapBindUser = "uid=" + received[1] + ",ou=people,dc=technikum-wien,dc=at"; std::string ldapBindUser = "uid=" + received.at(1) + ",ou=people,dc=technikum-wien,dc=at";
std::string ldapBindPassword = received[2]; std::string ldapBindPassword = received.at(2);
BerValue bindCredentials; BerValue bindCredentials;
bindCredentials.bv_val = (char*)ldapBindPassword.c_str(); bindCredentials.bv_val = (char*) ldapBindPassword.c_str();
bindCredentials.bv_len = ldapBindPassword.length(); bindCredentials.bv_len = ldapBindPassword.length();
rc = ldap_sasl_bind_s(ldapHandle, ldapBindUser.c_str(), LDAP_SASL_SIMPLE, &bindCredentials, NULL, NULL, NULL); BerValue *servercredp;
rc = ldap_sasl_bind_s(ldapHandle, ldapBindUser.c_str(), LDAP_SASL_SIMPLE, &bindCredentials, NULL, NULL, &servercredp);
if (rc != LDAP_SUCCESS) { if (rc != LDAP_SUCCESS) {
ldap_unbind_ext_s(ldapHandle, NULL, NULL); ldap_unbind_ext_s(ldapHandle, NULL, NULL);
return "ERR\n"; return "ERR\n";
} }
loggedInUsername = received.at(1);
ldap_unbind_ext_s(ldapHandle, NULL, NULL); ldap_unbind_ext_s(ldapHandle, NULL, NULL);
return "OK\n"; return "OK\n";