-/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
#include "channel.h"
#include "conf.h"
#include "voicetarget.h"
+#include "ban.h"
#define MAX_TEXT 512
#define MAX_USERNAME 128
{
message_t *sendmsg = NULL;
channel_t *ch_itr = NULL;
- client_t *client_itr;
+ client_t *client_itr, *target;
if (!client->authenticated && !(msg->messageType == Authenticate ||
msg->messageType == Version)) {
if (msg->payload.authenticate->n_tokens > 0) {
Log_debug("Tokens in auth message from '%s'. n_tokens = %d", client->username,
msg->payload.authenticate->n_tokens);
- addTokens(client, msg);
+ addTokens(client, msg);
}
break;
}
+ if (SSLi_getSHA1Hash(client->ssl, client->hash) && Ban_isBanned(client)) {
+ char hexhash[41];
+ SSLi_hash2hex(client->hash, hexhash);
+ Log_info("Client with hash '%s' is banned. Disconnecting", hexhash);
+ goto disconnect;
+ }
+
client->authenticated = true;
client_itr = NULL;
/* Tokens */
if (msg->payload.authenticate->n_tokens > 0)
addTokens(client, msg);
-
+
+ /* Check if admin PW among tokens */
+ if (strlen(getStrConf(ADMIN_PASSPHRASE)) > 0 &&
+ Client_token_match(client, getStrConf(ADMIN_PASSPHRASE))) {
+ client->isAdmin = true;
+ Log_info_client(client, "User provided admin password");
+ }
/* Setup UDP encryption */
CryptState_init(&client->cryptState);
}
break;
case UserState:
- /* Only allow state changes for for the self user */
+ target = NULL;
+ /* Only allow state changes for for the self user unless an admin is issuing */
if (msg->payload.userState->has_session &&
- msg->payload.userState->session != client->sessionId) {
+ msg->payload.userState->session != client->sessionId && !client->isAdmin) {
sendPermissionDenied(client, "Permission denied");
break;
}
- if (msg->payload.userState->has_user_id || msg->payload.userState->has_mute ||
- msg->payload.userState->has_deaf || msg->payload.userState->has_suppress ||
- msg->payload.userState->has_texture) {
-
+ if (msg->payload.userState->has_session && msg->payload.userState->session != client->sessionId) {
+ while (Client_iterate(&target) != NULL) {
+ if (target->sessionId == msg->payload.userState->session)
+ break;
+ }
+ if (target == NULL) {
+ Log_warn("Client with sessionID %d not found", msg->payload.userState->session);
+ break;
+ }
+ }
+
+ if (msg->payload.userState->has_user_id || msg->payload.userState->has_suppress ||
+ msg->payload.userState->has_priority_speaker || msg->payload.userState->has_texture) {
sendPermissionDenied(client, "Not supported by uMurmur");
break;
}
+
+ if (target == NULL)
+ target = client;
msg->payload.userState->has_session = true;
- msg->payload.userState->session = client->sessionId;
+ msg->payload.userState->session = target->sessionId;
msg->payload.userState->has_actor = true;
msg->payload.userState->actor = client->sessionId;
+ if (msg->payload.userState->has_deaf) {
+ target->deaf = msg->payload.userState->deaf;
+ if (target->deaf) {
+ msg->payload.userState->has_mute = true;
+ msg->payload.userState->mute = true;
+ }
+ }
+ if (msg->payload.userState->has_mute) {
+ target->mute = msg->payload.userState->mute;
+ if (!target->mute) {
+ msg->payload.userState->has_deaf = true;
+ msg->payload.userState->deaf = false;
+ client->deaf = false;
+ }
+ }
if (msg->payload.userState->has_self_deaf) {
client->deaf = msg->payload.userState->self_deaf;
}
break;
case TextMessage:
+ if (!getBoolConf(ALLOW_TEXTMESSAGE))
+ break;
msg->payload.textMessage->has_actor = true;
msg->payload.textMessage->actor = client->sessionId;
case PermissionQuery:
Msg_inc_ref(msg); /* Re-use message */
msg->payload.permissionQuery->has_permissions = true;
- msg->payload.permissionQuery->permissions = PERM_DEFAULT;
+
+ if (client->isAdmin)
+ msg->payload.permissionQuery->permissions = PERM_ADMIN;
+ else
+ msg->payload.permissionQuery->permissions = PERM_DEFAULT;
+
+ if (!getBoolConf(ALLOW_TEXTMESSAGE))
+ msg->payload.permissionQuery->permissions &= ~PERM_TEXTMESSAGE;
+ if (!getBoolConf(ENABLE_BAN))
+ msg->payload.permissionQuery->permissions &= ~PERM_BAN;
Client_send_message(client, msg);
break;
memset(sendmsg->payload.userStats->address.data, 0, 16);
/* ipv4 representation as ipv6 address. Supposedly correct. */
memcpy(&sendmsg->payload.userStats->address.data[12], &target->remote_tcp.sin_addr, 4);
+ memset(&sendmsg->payload.userStats->address.data[10], 0xff, 2); /* IPv4 */
sendmsg->payload.userStats->address.len = 16;
}
/* BW */
Client_send_message(client, sendmsg);
}
break;
+ case UserRemove:
+ target = NULL;
+ /* Only admin can issue this */
+ if (!client->isAdmin) {
+ sendPermissionDenied(client, "Permission denied");
+ break;
+ }
+ while (Client_iterate(&target) != NULL) {
+ if (target->sessionId == msg->payload.userRemove->session)
+ break;
+ }
+ if (target == NULL) {
+ Log_warn("Client with sessionId %d not found", msg->payload.userRemove->session);
+ break;
+ }
+ msg->payload.userRemove->session = target->sessionId;
+ msg->payload.userRemove->has_actor = true;
+ msg->payload.userRemove->actor = client->sessionId;
+
+ if (msg->payload.userRemove->has_ban && msg->payload.userRemove->ban) {
+ if (!getBoolConf(ENABLE_BAN))
+ sendPermissionDenied(client, "Permission denied");
+ else
+ Ban_UserBan(target, msg->payload.userRemove->reason);
+ } else {
+ Log_info_client(target, "User kicked. Reason: '%s'",
+ strlen(msg->payload.userRemove->reason) == 0 ? "N/A" : msg->payload.userRemove->reason);
+ }
+ /* Re-use message */
+ Msg_inc_ref(msg);
+
+ Client_send_message_except(NULL, msg);
+ Client_close(target);
+ break;
+ case BanList:
+ /* Only admin can issue this */
+ if (!client->isAdmin) {
+ sendPermissionDenied(client, "Permission denied");
+ break;
+ }
+ if (!getBoolConf(ENABLE_BAN)) {
+ sendPermissionDenied(client, "Permission denied");
+ break;
+ }
+ if (msg->payload.banList->has_query && msg->payload.banList->query) {
+ /* Create banlist message and add banentrys */
+ sendmsg = Ban_getBanList();
+ Client_send_message(client, sendmsg);
+ } else {
+ /* Clear banlist and set the new one */
+ Ban_clearBanList();
+ Ban_putBanList(msg, msg->payload.banList->n_bans);
+ }
+ break;
+
/* Permission denied for all these messages. Not implemented. */
case ChannelRemove:
case ContextAction:
case ContextActionAdd:
case ACL:
- case BanList:
case UserList:
case QueryUsers:
sendPermissionDenied(client, "Not supported by uMurmur");
projects / umurmur.git / blobdiff