X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=apps%2Fsilcd%2Fserver_query.c;h=6475c57301b06b7dcde972704472061994bf0c7a;hp=81b460e3281633eb51bde77fc656720bdc588582;hb=382d15d447b7a95390decfa783836ae4fe255b3d;hpb=1bd345c1a5cb700f10e74378cae18fd5d145976b diff --git a/apps/silcd/server_query.c b/apps/silcd/server_query.c index 81b460e3..6475c573 100644 --- a/apps/silcd/server_query.c +++ b/apps/silcd/server_query.c @@ -388,8 +388,8 @@ void silc_server_query_parse(SilcServer server, SilcServerQuery query) if (!tmp) continue; - id = silc_id_payload_parse_id(tmp, tmp_len, NULL); - if (!id) { + id = silc_id_payload_parse_id(tmp, tmp_len, &id_type); + if (!id || id_type != SILC_ID_CLIENT) { silc_server_query_add_error(server, query, TRUE, i + 4, SILC_STATUS_ERR_BAD_CLIENT_ID); continue; @@ -407,6 +407,8 @@ void silc_server_query_parse(SilcServer server, SilcServerQuery query) for (i = 0; i < query->ids_count; i++) silc_free(query->ids[i].id); silc_free(query->ids); + query->ids = NULL; + query->ids_count = 0; silc_free(id); return; } @@ -426,8 +428,16 @@ void silc_server_query_parse(SilcServer server, SilcServerQuery query) /* Get requested attributes if set */ tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len); - if (tmp) + if (tmp && tmp_len <= SILC_ATTRIBUTE_MAX_REQUEST_LEN) { query->attrs = silc_attribute_payload_parse(tmp, tmp_len); + + /* When Requested Attributes is present we will assure that this + client cannot execute the WHOIS command too fast. This would be + same as having SILC_CF_LAG_STRICT. */ + if (cmd->sock->type == SILC_SOCKET_TYPE_CLIENT && + cmd->sock->user_data) + ((SilcClientEntry)cmd->sock->user_data)->fast_command = 6; + } break; case SILC_COMMAND_WHOWAS: @@ -506,18 +516,33 @@ void silc_server_query_parse(SilcServer server, SilcServerQuery query) /* Normal server must check whether this ID exist, and if not then send the query to router, unless done so already */ if (server->server_type == SILC_SERVER && !query->resolved) { - if (!silc_idlist_find_client_by_id(server->local_list, - id, TRUE, NULL)) { - if (cmd->sock->type != SILC_SOCKET_TYPE_CLIENT || - !silc_idlist_find_client_by_id(server->global_list, + if (id_type == SILC_ID_CLIENT) { + if (!silc_idlist_find_client_by_id(server->local_list, id, TRUE, NULL)) { - silc_server_query_send_router(server, query); - for (i = 0; i < query->ids_count; i++) - silc_free(query->ids[i].id); - silc_free(query->ids); - silc_free(id); - return; + if (cmd->sock->type != SILC_SOCKET_TYPE_CLIENT || + !silc_idlist_find_client_by_id(server->global_list, + id, TRUE, NULL)) { + silc_server_query_send_router(server, query); + for (i = 0; i < query->ids_count; i++) + silc_free(query->ids[i].id); + silc_free(query->ids); + query->ids = NULL; + query->ids_count = 0; + silc_free(id); + return; + } } + } else { + /* For now all other ID's except Client ID's are explicitly + sent to router for resolving. */ + silc_server_query_send_router(server, query); + for (i = 0; i < query->ids_count; i++) + silc_free(query->ids[i].id); + silc_free(query->ids); + query->ids = NULL; + query->ids_count = 0; + silc_free(id); + return; } } @@ -746,6 +771,11 @@ void silc_server_query_process(SilcServer server, SilcServerQuery query, } } + /* Remove the NOATTR status periodically */ + if (client_entry->data.status & SILC_IDLIST_STATUS_NOATTR && + client_entry->updated + 600 < time(NULL)) + client_entry->data.status &= ~SILC_IDLIST_STATUS_NOATTR; + /* When requested attributes is present and local client is detached we cannot send the command to the client, we'll reply on behalf of the client instead. */ @@ -862,6 +892,21 @@ void silc_server_query_resolve(SilcServer server, SilcServerQuery query, for (i = 0; i < query->querylist_count; i++) { r = &query->querylist[i]; + /* If Requested Attributes were present put them to this resolving */ + if (query->attrs && query->querycmd == SILC_COMMAND_WHOIS) { + len = r->argc + 1; + r->arg = silc_realloc(r->arg, sizeof(*r->arg) * len); + r->arg_lens = silc_realloc(r->arg_lens, sizeof(*r->arg_lens) * len); + r->arg_types = silc_realloc(r->arg_types, sizeof(*r->arg_types) * len); + + tmp = silc_argument_get_arg_type(cmd->args, 3, &len); + if (tmp) + r->arg[r->argc] = silc_memdup(tmp, len); + r->arg_lens[r->argc] = len; + r->arg_types[r->argc] = 3; + r->argc++; + } + /* Send WHOIS command */ res_cmd = silc_command_payload_encode(SILC_COMMAND_WHOIS, r->argc, r->arg, r->arg_lens, @@ -911,7 +956,7 @@ void silc_server_query_resolve(SilcServer server, SilcServerQuery query, case SILC_COMMAND_WHOIS: case SILC_COMMAND_IDENTIFY: /* Take existing query context if exist for this connection */ - for (i = 0; i < query->queries_count; i++) + for (i = 0; i < query->querylist_count; i++) if (query->querylist[i].sock == sock) { r = &query->querylist[i]; break; @@ -931,21 +976,6 @@ void silc_server_query_resolve(SilcServer server, SilcServerQuery query, r->timeout = 3; } - /* If Requested Attributes were present put them to this resolving */ - if (query->attrs && query->querycmd == SILC_COMMAND_WHOIS) { - len = r->argc + 1; - r->arg = silc_realloc(r->arg, sizeof(*r->arg) * len); - r->arg_lens = silc_realloc(r->arg_lens, sizeof(*r->arg_lens) * len); - r->arg_types = silc_realloc(r->arg_types, sizeof(*r->arg_types) * len); - - tmp = silc_argument_get_arg_type(cmd->args, 3, &len); - if (tmp) - r->arg[r->argc] = silc_memdup(tmp, len); - r->arg_lens[r->argc] = len; - r->arg_types[r->argc] = 3; - r->argc++; - } - len = r->argc + 1; r->arg = silc_realloc(r->arg, sizeof(*r->arg) * len); r->arg_lens = silc_realloc(r->arg_lens, sizeof(*r->arg_lens) * len); @@ -977,6 +1007,7 @@ void silc_server_query_resolve(SilcServer server, SilcServerQuery query, client_entry->data.status |= SILC_IDLIST_STATUS_RESOLVING; client_entry->data.status &= ~SILC_IDLIST_STATUS_RESOLVED; client_entry->resolve_cmd_ident = ident; + client_entry->updated = time(NULL); /* Save the queried ID, which we will reprocess after we get this and all other queries back. */ @@ -1237,7 +1268,7 @@ void silc_server_query_send_reply(SilcServer server, attributes we will reply to them on behalf of the client. */ len = 0; if (query->attrs) { - if (!entry->attrs) { + if (!entry->attrs && SILC_IS_LOCAL(entry)) { tmpattrs = silc_server_query_reply_attrs(server, query, entry); entry->attrs = silc_memdup(tmpattrs->data, tmpattrs->len); entry->attrs_len = tmpattrs->len; @@ -1523,7 +1554,7 @@ SilcBuffer silc_server_query_reply_attrs(SilcServer server, SilcAttributeObjPk pk; SilcAttributeObjService service; unsigned char *tmp; - unsigned char sign[2048]; + unsigned char sign[2048 + 1]; SilcUInt32 sign_len; SILC_LOG_DEBUG(("Constructing Requested Attributes")); @@ -1534,11 +1565,6 @@ SilcBuffer silc_server_query_reply_attrs(SilcServer server, attribute = silc_attribute_get_attribute(attr); switch (attribute) { - case SILC_ATTRIBUTE_USER_INFO: - /* Put USER_INFO */ - SILC_NOT_IMPLEMENTED("SILC_ATTRIBUTE_USER_INFO"); - break; - case SILC_ATTRIBUTE_SERVICE: /* Put SERVICE. Put only SILC service. */ memset(&service, 0, sizeof(service)); @@ -1547,9 +1573,13 @@ SilcBuffer silc_server_query_reply_attrs(SilcServer server, silc_strncat(service.address, sizeof(service.address), server->server_name, strlen(server->server_name)); service.status = !(client_entry->mode & SILC_UMODE_DETACHED); + if (client_entry->connection) + service.idle = time(NULL) - client_entry->data.last_receive; buffer = silc_attribute_payload_encode(buffer, attribute, SILC_ATTRIBUTE_FLAG_VALID, &service, sizeof(service)); + if (!buffer) + return NULL; break; case SILC_ATTRIBUTE_STATUS_MOOD: @@ -1559,6 +1589,8 @@ SilcBuffer silc_server_query_reply_attrs(SilcServer server, (void *) SILC_ATTRIBUTE_MOOD_NORMAL, sizeof(SilcUInt32)); + if (!buffer) + return NULL; break; case SILC_ATTRIBUTE_STATUS_FREETEXT: @@ -1569,6 +1601,8 @@ SilcBuffer silc_server_query_reply_attrs(SilcServer server, buffer = silc_attribute_payload_encode(buffer, attribute, SILC_ATTRIBUTE_FLAG_VALID, tmp, strlen(tmp)); + if (!buffer) + return NULL; break; case SILC_ATTRIBUTE_PREFERRED_CONTACT: @@ -1578,6 +1612,8 @@ SilcBuffer silc_server_query_reply_attrs(SilcServer server, (void *) SILC_ATTRIBUTE_CONTACT_CHAT, sizeof(SilcUInt32)); + if (!buffer) + return NULL; break; case SILC_ATTRIBUTE_USER_PUBLIC_KEY: @@ -1591,6 +1627,8 @@ SilcBuffer silc_server_query_reply_attrs(SilcServer server, SILC_ATTRIBUTE_FLAG_INVALID, &pk, sizeof(pk)); silc_free(pk.data); + if (!buffer) + return NULL; break; } @@ -1598,6 +1636,8 @@ SilcBuffer silc_server_query_reply_attrs(SilcServer server, buffer = silc_attribute_payload_encode(buffer, attribute, SILC_ATTRIBUTE_FLAG_INVALID, NULL, 0); + if (!buffer) + return NULL; break; default: @@ -1610,6 +1650,8 @@ SilcBuffer silc_server_query_reply_attrs(SilcServer server, buffer = silc_attribute_payload_encode(buffer, attribute, SILC_ATTRIBUTE_FLAG_INVALID, NULL, 0); + if (!buffer) + return NULL; break; } } @@ -1624,11 +1666,14 @@ SilcBuffer silc_server_query_reply_attrs(SilcServer server, SILC_ATTRIBUTE_FLAG_INVALID, &pk, sizeof(pk)); silc_free(pk.data); + if (!buffer) + return NULL; /* Finally compute the digital signature of all the data we provided as an indication that we provided rightfull information, and this also authenticates our public key. */ - if (silc_pkcs_sign_with_hash(server->pkcs, server->sha1hash, + if (silc_pkcs_get_key_len(server->pkcs) / 8 <= sizeof(sign) -1 && + silc_pkcs_sign_with_hash(server->pkcs, server->sha1hash, buffer->data, buffer->len, sign, &sign_len)) { pk.type = NULL; @@ -1640,6 +1685,8 @@ SilcBuffer silc_server_query_reply_attrs(SilcServer server, SILC_ATTRIBUTE_FLAG_VALID, &pk, sizeof(pk)); } + if (!buffer) + return NULL; return buffer; }