Skip to content

Don't use strtok(3) #276

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+29 −2
Open

Don't use strtok(3) #276

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
84552ff
Fix utils not detecting symbols and add strtok_r
haesbaert Jul 24, 2025
4bd8a7d
Add src to include path since it needs config.h
haesbaert Sep 11, 2025
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
1 change: 1 addition & 0 deletions kubernetes/ConfigureChecks.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ include(CheckSymbolExists)
check_symbol_exists(strndup "string.h" HAVE_STRNDUP)
check_symbol_exists(secure_getenv "stdlib.h" HAVE_SECURE_GETENV)
check_symbol_exists(getenv "stdlib.h" HAVE_GETENV)
check_symbol_exists(strtok_r "string.h" HAVE_STRTOK_R)
3 changes: 2 additions & 1 deletion kubernetes/config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#cmakedefine HAVE_STRNDUP
#cmakedefine HAVE_SECURE_GETENV
#cmakedefine HAVE_GETENV
#cmakedefine HAVE_GETENV
#cmakedefine HAVE_STRTOK_R
1 change: 1 addition & 0 deletions kubernetes/config/authn_plugin/plugins/oidc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ include_directories(../../)
include_directories(../../../)
include_directories(../../../../include/)
include_directories(../../../../external/)
include_directories(../../../../src/)

aux_source_directory(. DIR_SRCS)

Expand Down
13 changes: 12 additions & 1 deletion kubernetes/config/authn_plugin/plugins/oidc/libkubernetes_oidc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "config.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a build error due to this including. https://github.com/kubernetes-client/c/actions/runs/17549510255/job/50128037985?pr=276

maybe need to include the relative path of config.h or change the CMakeLists.txt in the oidc directory.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I included the src directory in 4bd8a7d
I'm not sure how to trigger a build that builds that, so I couldn't properly test.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The build still fails.

You can build locally using the following command.

cd kubernetes/config/authn_plugin/plugins/oidc
mkdir build
cd build
cmake ..
make

#include "authn_plugin.h"
#include "authn_plugin_util.h"
#include "kube_config_util.h"
Expand Down Expand Up @@ -41,12 +42,22 @@ static time_t get_token_expiration_time(const char *token_string)
}

char *p = NULL;
p = strtok(dup_token_string, OIDC_ID_TOKEN_DELIM); /* jwt header */
#ifdef HAVE_STRTOK_R
char *last = NULL;

p = strtok_r(dup_token_string, OIDC_ID_TOKEN_DELIM, &last); /* jwt header */
#else
p = strtok(dup_token_string, OIDC_ID_TOKEN_DELIM);
#endif
if (!p) {
fprintf(stderr, "%s: The token <%s> is not a valid JWT token.\n", fname, token_string);
goto end;
}
#ifdef HAVE_STRTOK_R
p = strtok_r(NULL, OIDC_ID_TOKEN_DELIM, &last); /* jwt part2 */
#else
p = strtok(NULL, OIDC_ID_TOKEN_DELIM); /* jwt part2 */
#endif
if (!p) {
fprintf(stderr, "%s: The token <%s> is not a valid JWT token.\n", fname, token_string);
goto end;
Expand Down
1 change: 1 addition & 0 deletions kubernetes/src/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <stdlib.h>
#include "../include/utils.h"
#include <string.h>
#include "config.h"

// based on https://github.com/libssh/libssh-mirror/commit/247983e9820fd264cb5a59c14cc12846c028bd08#diff-744295d01685fa411dbfd78679ea20b51dfa4ac7d2d722df53f3d86d728493f8
#if !defined(HAVE_STRNDUP)
Expand Down
12 changes: 12 additions & 0 deletions kubernetes/watch/watch_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <stdbool.h>
#include <string.h>
#include <stdlib.h>
#include "config.h"
#include "../include/list.h"
#include "watch_util.h"

Expand All @@ -18,7 +19,14 @@ static int wu_convert_to_json_array(list_t * json_array, const char *json_string
char *json_string_dup = strdup(json_string);

char *token = NULL;
#ifdef HAVE_STRTOK_R
char *last = NULL;

token = strtok_r(json_string_dup, JSON_ARRAY_DELIM, &last);
#else
token = strtok(json_string_dup, JSON_ARRAY_DELIM);
#endif

while (token) {
cJSON *cjson = cJSON_Parse(token);
if (cjson == NULL) {
Expand All @@ -27,7 +35,11 @@ static int wu_convert_to_json_array(list_t * json_array, const char *json_string
}
cJSON_Delete(cjson);
list_addElement(json_array, strdup(token));
#ifdef HAVE_STRTOK_R
token = strtok_r(NULL, JSON_ARRAY_DELIM, &last);
#else
token = strtok(NULL, JSON_ARRAY_DELIM);
#endif
}

end:
Expand Down
Loading