Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display IP address and port of user on Login and Quit #41

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Display IP address and port of user on Login and Quit #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/server/server.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class Server
if (send_ready)
write_socks.remove(user_sock);

if (user.login_denied)
if (user.login_error)
recv_success = send_success = false;
}
else if (!send_ready) {
Expand Down Expand Up @@ -359,13 +359,7 @@ class Server

void add_user(User user)
{
const username = user.username;

writefln!("User %s logging in with version %s")(
blue ~ username ~ norm, user.h_client_version
);
if (db.is_admin(username)) writefln!("%s is an admin")(username);
users[username] = user;
users[user.username] = user;
}

User get_user(string username)
Expand Down Expand Up @@ -395,14 +389,25 @@ class Server
if (username in users)
users.remove(username);

if (user.status == Status.offline)
if (user.status == Status.offline) {
writefln!(
"User %s @ %s denied (%s)")(
red ~ username ~ norm,
bold ~ user.h_ip_address ~ norm,
red ~ user.login_error ~ norm
);
return;
}

user.leave_joined_rooms();
global_room.remove_user(username);

user.set_status(Status.offline);
writefln!("User %s has quit")(red ~ username ~ norm);
writefln!(
"User %s @ %s quit")(
red ~ username ~ norm,
bold ~ user.h_address ~ norm
);
}

private void send_to_all(scope SMessage msg)
Expand Down
49 changes: 29 additions & 20 deletions src/server/user.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module soulfind.server.user;
@safe:

import core.time : seconds;
import soulfind.defines : blue, max_msg_size, norm, red, server_username;
import soulfind.defines : blue, bold, max_msg_size, norm, red, server_username;
import soulfind.server.messages;
import soulfind.server.pm : PM;
import soulfind.server.room : Room;
Expand All @@ -32,7 +32,7 @@ class User

uint status;
SysTime connected_at;
bool login_denied;
string login_error;

private Server server;

Expand Down Expand Up @@ -70,11 +70,14 @@ class User
return format!("%d.%d")(major_version, minor_version);
}

string h_ip_address()
{
return InternetAddress.addrToString(ip_address);
}

string h_address()
{
return format!("%s:%d")(
InternetAddress.addrToString(ip_address), port
);
return format!("%s:%d")(h_ip_address, port);
}


Expand Down Expand Up @@ -460,31 +463,29 @@ class User
if (status != Status.offline)
break;

const error = server.check_login(msg.username, msg.password);
username = msg.username;
login_error = server.check_login(username, msg.password);

if (error) {
username = msg.username;
login_denied = true;
writefln!("User %s denied (%s)")(
red ~ username ~ norm, red ~ error ~ norm
);
scope response_msg = new SLogin(false, error);
if (login_error) {
scope response_msg = new SLogin(false, login_error);
send_message(response_msg);
break;
}

auto user = server.get_user(msg.username);
auto user = server.get_user(username);

if (user && user.status != Status.offline) {
writefln!("User %s already logged in with version %s")(
red ~ msg.username ~ norm, user.h_client_version
writefln!(
"User %s @ %s already logged in with version %s")(
red ~ username ~ norm,
bold ~ user.h_address ~ norm,
user.h_client_version
);
scope relogged_msg = new SRelogged();
user.send_message(relogged_msg);
server.del_user(user);
}

username = msg.username;
major_version = msg.major_version;
minor_version = msg.minor_version;
priv_expiration = server.db.get_user_privileges(username);
Expand Down Expand Up @@ -525,6 +526,14 @@ class User
case SetWaitPort:
scope msg = new USetWaitPort(msg_buf, username);
port = cast(ushort) msg.port;

writefln!(
"%s %s @ %s logged in with version %s")(
server.db.is_admin(username) ? "Admin" : "User",
blue ~ username ~ norm,
bold ~ h_address ~ norm,
h_client_version
);
break;

case GetPeerAddress:
Expand Down Expand Up @@ -667,9 +676,9 @@ class User
break;

debug (user) writefln!(
"User %s trying to connect indirectly to peer %s @ %s")(
blue ~ username ~ norm, blue ~ msg.username ~ norm,
h_address
"User %s @ %s connecting indirectly to peer %s @ %s")(
blue ~ username ~ norm, bold ~ h_address ~ norm,
blue ~ msg.username ~ norm, bold ~ user.h_address ~ norm
);

scope response_msg = new SConnectToPeer(
Expand Down