Compare commits

...
Author SHA1 Message Date
Ondřej Surý 86c2572dbb EXP: Criple the recursion quota 2023-01-27 10:54:48 +01:00
3 changed files with 8 additions and 7 deletions
+3 -2
View File
@@ -8588,8 +8588,9 @@ load_configuration(const char *filename, named_server_t *server,
configure_server_quota(maps, "transfers-out",
&server->sctx->xfroutquota);
configure_server_quota(maps, "tcp-clients", &server->sctx->tcpquota);
configure_server_quota(maps, "recursive-clients",
&server->sctx->recursionquota);
/* configure_server_quota(maps, "recursive-clients", */
/* &server->sctx->recursionquota); */
isc_quota_max(&server->sctx->recursionquota, 1000000000);
configure_server_quota(maps, "update-quota", &server->sctx->updquota);
max = isc_quota_getmax(&server->sctx->recursionquota);
+4 -4
View File
@@ -2498,10 +2498,10 @@ static isc_result_t
recursionquotatype_attach(ns_client_t *client,
ns_query_rectype_t recursion_type, bool soft_limit) {
isc_quota_t **quotap = &client->query.recursions[recursion_type].quota;
isc_result_t result;
isc_result_t result = ISC_R_SUCCESS;
result = isc_quota_attach(&client->manager->sctx->recursionquota,
quotap);
/* result = isc_quota_attach(&client->manager->sctx->recursionquota, */
/* quotap); */
switch (result) {
case ISC_R_SUCCESS:
break;
@@ -2542,7 +2542,7 @@ recursionquotatype_attach_soft(ns_client_t *client,
static void
recursionquotatype_detach(ns_client_t *client,
ns_query_rectype_t recursion_type) {
isc_quota_detach(&client->query.recursions[recursion_type].quota);
/* isc_quota_detach(&client->query.recursions[recursion_type].quota); */
ns_stats_decrement(client->manager->sctx->nsstats,
ns_statscounter_recursclients);
}
+1 -1
View File
@@ -60,7 +60,7 @@ ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview,
isc_quota_init(&sctx->xfroutquota, 10);
isc_quota_init(&sctx->tcpquota, 10);
isc_quota_init(&sctx->recursionquota, 100);
isc_quota_init(&sctx->recursionquota, 1000000000);
isc_quota_init(&sctx->updquota, 100);
ISC_LIST_INIT(sctx->http_quotas);
isc_mutex_init(&sctx->http_quotas_lock);