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

Fix IP leak from server #1135

Merged
merged 2 commits into from
Jul 15, 2022
Merged

Fix IP leak from server #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfd53ad
Don't send out player IP adresses on disconnect
lmoureaux Jul 14, 2022
2538f5f
Remove conn_addr_public
lmoureaux Jul 14, 2022
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
23 changes: 7 additions & 16 deletions common/networking/connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ static void default_conn_close_callback(struct connection *pconn)
{
fc_assert_msg(conn_close_callback != default_conn_close_callback,
"Closing a socket (%s) before calling "
"close_socket_set_callback().",
"connections_set_close_callback().",
conn_description(pconn));
}

Expand Down Expand Up @@ -422,14 +422,15 @@ static void free_socket_packet_buffer(struct socket_packet_buffer *buf)
const char *conn_description(const struct connection *pconn, bool is_private)
{
static char buffer[MAX_LEN_NAME * 2 + MAX_LEN_ADDR + 128];

const auto addr = is_private ? pconn->addr : conn_addr_public(pconn);

buffer[0] = '\0';

if (*pconn->username != '\0') {
fc_snprintf(buffer, sizeof(buffer), _("%s from %s"), pconn->username,
qUtf8Printable(addr));
if (is_private) {
fc_snprintf(buffer, sizeof(buffer), _("%s from %s"), pconn->username,
qUtf8Printable(pconn->addr));
} else {
fc_snprintf(buffer, sizeof(buffer), "%s", pconn->username);
}
} else {
sz_strlcpy(buffer, "server");
}
Expand All @@ -456,16 +457,6 @@ const char *conn_description(const struct connection *pconn, bool is_private)
return buffer;
}

/**
* Generate a fake hostname to tell publicly.
*/
const char *conn_addr_public(const struct connection *pconn)
{
static char buf[256];
snprintf(buf, 256, "user-%s-host", pconn->username);
return buf;
}

/**
Return TRUE iff the connection is currently allowed to edit.
*/
Expand Down
1 change: 0 additions & 1 deletion common/networking/connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@ void conn_list_compression_thaw(const struct conn_list *pconn_list);

const char *conn_description(const struct connection *pconn,
bool is_private = true);
const char *conn_addr_public(const struct connection *pconn);
bool conn_controls_player(const struct connection *pconn);
bool conn_is_global_observer(const struct connection *pconn);
enum cmdlevel conn_get_access(const struct connection *pconn);
Expand Down
18 changes: 7 additions & 11 deletions server/connecthand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,11 @@ void establish_new_connection(struct connection *pconn)
* connection_attach()), otherwise pconn will receive it too. */
if (conn_controls_player(pconn)) {
package_event(&connect_info, nullptr, E_CONNECTION, ftc_server,
_("%s has connected from %s (player %s)."),
pconn->username, conn_addr_public(pconn),
_("%s has connected (player %s)."), pconn->username,
player_name(conn_get_player(pconn)));
} else {
package_event(&connect_info, nullptr, E_CONNECTION, ftc_server,
_("%s has connected from %s."), pconn->username,
conn_addr_public(pconn));
_("%s has connected."), pconn->username);
}
conn_list_iterate(game.est_connections, aconn)
{
Expand Down Expand Up @@ -414,7 +412,7 @@ bool handle_login_request(struct connection *pconn,
fc_snprintf(msg, sizeof(msg), _("Invalid username '%s'"), req->username);
reject_new_connection(msg, pconn);
qInfo(_("%s was rejected: Invalid name [%s]."), req->username,
conn_addr_public(pconn));
qUtf8Printable(pconn->addr));
return false;
}

Expand All @@ -438,7 +436,7 @@ bool handle_login_request(struct connection *pconn,
req->username);
reject_new_connection(msg, pconn);
qInfo(_("%s was rejected: Duplicate login name [%s]."), req->username,
conn_addr_public(pconn));
qUtf8Printable(pconn->addr));
return false;
}
}
Expand Down Expand Up @@ -477,16 +475,14 @@ bool handle_login_request(struct connection *pconn,
*/
void lost_connection_to_client(struct connection *pconn)
{
const char *desc = conn_description(pconn);

fc_assert_ret(true == pconn->server.is_closing);

qInfo(_("Lost connection: %s."), desc);
qInfo(_("Lost connection: %s."), conn_description(pconn, true));

// Special color (white on black) for player loss
notify_conn(game.est_connections, nullptr, E_CONNECTION,
conn_controls_player(pconn) ? ftc_player_lost : ftc_server,
_("Lost connection: %s."), desc);
_("Lost connection: %s."), conn_description(pconn, false));

connection_detach(pconn, true);
send_conn_info_remove(pconn->self, game.est_connections);
Expand All @@ -511,7 +507,7 @@ static void package_conn_info(struct connection *pconn,
packet->access_level = pconn->access_level;

sz_strlcpy(packet->username, pconn->username);
sz_strlcpy(packet->addr, conn_addr_public(pconn));
sz_strlcpy(packet->addr, "");
sz_strlcpy(packet->capability, pconn->capability);
}

Expand Down