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

Odyssey fixes ch1nn1y (fix some coverity issues) #574

Merged
merged 17 commits into from
Feb 14, 2024
Merged

Odyssey fixes ch1nn1y (fix some coverity issues) #574

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7e477db
make some functions from mdb_iamproxy.c static
Feb 5, 2024
1935a76
fix new line symbol missing
Feb 5, 2024
1625161
make apply_fmt
Feb 5, 2024
70dac36
Merge branch 'yandex:master' into master
AndrewOvvv Feb 5, 2024
951450a
fix warnings during building
Feb 5, 2024
c05140d
make apply_fmt
Feb 5, 2024
b753435
fix issues
Feb 7, 2024
8664383
fix some coverity issues
Feb 7, 2024
9092189
make apply_fmt
Feb 7, 2024
dbd8ff1
Merge branch 'yandex:master' into odyssey_fixes_ch1nn1y
AndrewOvvv Feb 8, 2024
f81f527
fix memory leak
Feb 9, 2024
5e206c0
Merge branch 'odyssey_fixes_ch1nn1y' of github.com:AndrewOvvv/odyssey…
Feb 9, 2024
d5fe759
make apply_fmt
Feb 9, 2024
708e95d
add label and add free of watchdog
Feb 9, 2024
45cde96
make apply_fmt
Feb 9, 2024
f37420c
remove commented line
Feb 9, 2024
617c4c8
remove some mutex locks
Feb 9, 2024
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
57 changes: 32 additions & 25 deletions sources/config_reader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,18 +769,18 @@ static int od_config_reader_storage(od_config_reader_t *reader,

/* name */
if (!od_config_reader_string(reader, &storage->name))
return NOT_OK_RESPONSE;
goto error;

if (od_rules_storage_match(reader->rules, storage->name) != NULL) {
od_config_reader_error(reader, NULL,
"duplicate storage definition: %s",
storage->name);
return NOT_OK_RESPONSE;
goto error;
}
od_rules_storage_add(reader->rules, storage);
/* { */
if (!od_config_reader_symbol(reader, '{'))
return NOT_OK_RESPONSE;
goto error;

for (;;) {
od_token_t token;
Expand All @@ -789,51 +789,53 @@ static int od_config_reader_storage(od_config_reader_t *reader,
switch (rc) {
case OD_PARSER_KEYWORD:
break;
case OD_PARSER_EOF:
case OD_PARSER_EOF: {
od_config_reader_error(reader, &token,
"unexpected end of config file");
return NOT_OK_RESPONSE;
goto error;
}
case OD_PARSER_SYMBOL:
/* } */
if (token.value.num == '}') {
return OK_RESPONSE;
}
/* fall through */
default:
default: {
od_config_reader_error(
reader, &token,
"incorrect or unexpected parameter");
return NOT_OK_RESPONSE;
goto error;
}
}
od_keyword_t *keyword;
keyword = od_keyword_match(od_config_keywords, &token);
if (keyword == NULL) {
od_config_reader_error(reader, &token,
"unknown parameter");
return NOT_OK_RESPONSE;
goto error;
}

switch (keyword->id) {
/* type */
case OD_LTYPE:
if (!od_config_reader_string(reader, &storage->type))
return NOT_OK_RESPONSE;
goto error;
continue;
/* host */
case OD_LHOST:
if (od_config_reader_storage_host(reader, storage) !=
OK_RESPONSE)
return NOT_OK_RESPONSE;
goto error;
continue;
/* port */
case OD_LPORT:
if (!od_config_reader_number(reader, &storage->port))
return NOT_OK_RESPONSE;
goto error;
continue;
/* target_session_attrs */
case OD_LTARGET_SESSION_ATTRS:
if (!od_config_reader_string(reader, &tmp)) {
return NOT_OK_RESPONSE;
goto error;
}

if (strcmp(tmp, "read-write") == 0) {
Expand All @@ -846,7 +848,7 @@ static int od_config_reader_storage(od_config_reader_t *reader,
storage->target_session_attrs =
OD_TARGET_SESSION_ATTRS_RO;
} else {
return NOT_OK_RESPONSE;
goto error;
}

free(tmp);
Expand All @@ -857,57 +859,62 @@ static int od_config_reader_storage(od_config_reader_t *reader,
case OD_LTLS:
if (!od_config_reader_string(reader,
&storage->tls_opts->tls))
return NOT_OK_RESPONSE;
goto error;
continue;
/* tls_ca_file */
case OD_LTLS_CA_FILE:
if (!od_config_reader_string(
reader, &storage->tls_opts->tls_ca_file))
return NOT_OK_RESPONSE;
goto error;
continue;
/* tls_key_file */
case OD_LTLS_KEY_FILE:
if (!od_config_reader_string(
reader, &storage->tls_opts->tls_key_file))
return NOT_OK_RESPONSE;
goto error;
continue;
/* tls_cert_file */
case OD_LTLS_CERT_FILE:
if (!od_config_reader_string(
reader, &storage->tls_opts->tls_cert_file))
return NOT_OK_RESPONSE;
goto error;
continue;
/* tls_protocols */
case OD_LTLS_PROTOCOLS:
if (!od_config_reader_string(
reader, &storage->tls_opts->tls_protocols))
return NOT_OK_RESPONSE;
goto error;
continue;
/* server_max_routing */
case OD_LSERVERS_MAX_ROUTING:
if (!od_config_reader_number(
reader, &storage->server_max_routing))
return NOT_OK_RESPONSE;
goto error;
continue;
/* watchdog */
case OD_LWATCHDOG:
storage->watchdog =
od_storage_watchdog_allocate(reader->global);
if (storage->watchdog == NULL) {
return NOT_OK_RESPONSE;
}
if (storage->watchdog == NULL)
goto error;
if (od_config_reader_watchdog(reader, storage->watchdog,
extentions) ==
NOT_OK_RESPONSE)
return NOT_OK_RESPONSE;
goto error;
continue;
default:
default: {
od_config_reader_error(reader, &token,
"unexpected parameter");
return NOT_OK_RESPONSE;
goto error;
}
}
}
/* unreach */
error:
if (storage->watchdog) {
od_storage_watchdog_free(storage->watchdog);
}
od_rules_storage_free(storage);
return NOT_OK_RESPONSE;
}

Expand Down
12 changes: 5 additions & 7 deletions sources/ldap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,7 @@ od_ldap_server_t *od_ldap_server_pull(od_logger_t *logger, od_rule_t *rule,
od_debug(logger, "auth_ldap", NULL, NULL,
"pulling ldap_server from ldap_pool");
if (rule->ldap_pool_ttl > 0) {
if ((int)time(NULL) -
ldap_server->idle_timestamp >
if (time(NULL) - ldap_server->idle_timestamp >
rule->ldap_pool_ttl) {
od_debug(
logger, "auth_ldap", NULL, NULL,
Expand Down Expand Up @@ -418,7 +417,6 @@ od_ldap_server_t *od_ldap_server_pull(od_logger_t *logger, od_rule_t *rule,
rc = od_ldap_endpoint_wait(le, timeout);

if (rc == -1) {
od_ldap_endpoint_unlock(le);
return NULL;
}

Expand Down Expand Up @@ -476,7 +474,7 @@ static inline od_retcode_t od_ldap_server_attach(od_client_t *client)
OD_SERVER_UNDEF);
od_ldap_server_free(server);
} else {
server->idle_timestamp = (int)time(NULL);
server->idle_timestamp = time(NULL);
od_ldap_server_pool_set(
client->rule->ldap_endpoint->ldap_search_pool, server,
OD_SERVER_IDLE);
Expand Down Expand Up @@ -523,7 +521,7 @@ od_retcode_t od_auth_ldap(od_client_t *cl, kiwi_password_t *tok)

switch (ldap_rc) {
case LDAP_SUCCESS: {
serv->idle_timestamp = (int)time(NULL);
serv->idle_timestamp = time(NULL);
od_ldap_server_pool_set(cl->rule->ldap_endpoint->ldap_auth_pool,
serv, OD_SERVER_IDLE);
rc = OK_RESPONSE;
Expand All @@ -532,7 +530,7 @@ od_retcode_t od_auth_ldap(od_client_t *cl, kiwi_password_t *tok)
case LDAP_INVALID_SYNTAX:
/* fallthrough */
case LDAP_INVALID_CREDENTIALS: {
serv->idle_timestamp = (int)time(NULL);
serv->idle_timestamp = time(NULL);
od_ldap_server_pool_set(cl->rule->ldap_endpoint->ldap_auth_pool,
serv, OD_SERVER_IDLE);
rc = NOT_OK_RESPONSE;
Expand Down Expand Up @@ -654,7 +652,7 @@ od_retcode_t od_ldap_endpoint_free(od_ldap_endpoint_t *le)
}

if (le->ldap_auth_pool) {
od_ldap_server_pool_free(le->ldap_search_pool);
od_ldap_server_pool_free(le->ldap_auth_pool);
}

pthread_mutex_destroy(&le->lock);
Expand Down
2 changes: 1 addition & 1 deletion sources/od_ldap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ typedef struct {

od_global_t *global;
void *route;
int idle_timestamp;
int64_t idle_timestamp;

od_list_t link;
} od_ldap_server_t;
Expand Down
2 changes: 2 additions & 0 deletions sources/route.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,14 @@ static inline int od_route_reload_cb(od_server_t *server, void **argv)

static inline void od_route_kill_client_pool(od_route_t *route)
{
od_route_lock(route);
od_client_pool_foreach(&route->client_pool, OD_CLIENT_ACTIVE,
od_route_kill_cb, NULL);
od_client_pool_foreach(&route->client_pool, OD_CLIENT_PENDING,
od_route_kill_cb, NULL);
od_client_pool_foreach(&route->client_pool, OD_CLIENT_QUEUE,
od_route_kill_cb, NULL);
od_route_unlock(route);
}

static inline void od_route_grac_shutdown_pool(od_route_t *route)
Expand Down
4 changes: 2 additions & 2 deletions sources/router.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ od_router_status_t od_router_route(od_router_t *router, od_client_t *client)
switch (ldap_rc) {
case OK_RESPONSE: {
od_ldap_endpoint_lock(rule->ldap_endpoint);
ldap_server->idle_timestamp = (int)time(NULL);
ldap_server->idle_timestamp = time(NULL);
od_ldap_server_pool_set(
rule->ldap_endpoint->ldap_search_pool,
ldap_server, OD_SERVER_IDLE);
Expand All @@ -439,7 +439,7 @@ od_router_status_t od_router_route(od_router_t *router, od_client_t *client)
}
case LDAP_INSUFFICIENT_ACCESS: {
od_ldap_endpoint_lock(rule->ldap_endpoint);
ldap_server->idle_timestamp = (int)time(NULL);
ldap_server->idle_timestamp = time(NULL);
od_ldap_server_pool_set(
rule->ldap_endpoint->ldap_search_pool,
ldap_server, OD_SERVER_IDLE);
Expand Down
4 changes: 2 additions & 2 deletions sources/rules.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,12 +1380,12 @@ void od_rules_print(od_rules_t *rules, od_logger_t *logger)
od_log(logger, "rules", NULL, NULL,
" storage_user %s",
rule->storage_user);
if (rule->catchup_checks)
if (rule->catchup_timeout)
od_log(logger, "rules", NULL, NULL,
" catchup timeout %d", rule->catchup_timeout);
if (rule->catchup_checks)
od_log(logger, "rules", NULL, NULL,
" catchup timeout %d", rule->catchup_checks);
" catchup checks %d", rule->catchup_checks);

od_log(logger, "rules", NULL, NULL,
" log_debug %s",
Expand Down
Loading