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.

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

Fix memory leak when kubeconfig is invalid #169

Merged
merged 3 commits into from
Jan 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions examples/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
all:
cd create_pod; make
cd list_pod_with_invalid_kubeconfig; make
cd list_pod; make
cd list_pod_incluster; make
cd delete_pod; make
Expand All @@ -15,6 +16,7 @@ all:

clean:
cd create_pod; make clean
cd list_pod_with_invalid_kubeconfig; make clean
cd list_pod; make clean
cd list_pod_incluster; make clean
cd delete_pod; make clean
Expand All @@ -31,6 +33,7 @@ clean:
test:
cd create_pod; make test;
kubectl wait --for=condition=ready --all pod -n default --timeout=60s
cd list_pod_with_invalid_kubeconfig; make test
cd list_pod; make test
cd delete_pod; make test
kubectl wait --for=delete pod/test-pod-6 -n default --timeout=120s
Expand All @@ -46,6 +49,7 @@ test:
memcheck:
cd create_pod; make memcheck;
kubectl wait --for=condition=ready --all pod -n default --timeout=60s
cd list_pod_with_invalid_kubeconfig; make memcheck
cd list_pod; make memcheck
cd delete_pod; make memcheck
kubectl wait --for=delete pod/test-pod-6 -n default --timeout=120s
Expand Down
1 change: 1 addition & 0 deletions examples/list_pod_with_invalid_kubeconfig/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
list_pod_with_invalid_kubeconfig
17 changes: 17 additions & 0 deletions examples/list_pod_with_invalid_kubeconfig/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
INCLUDE:=-I../../kubernetes/
LIBS:=-L../../kubernetes/build -lyaml -lwebsockets -lkubernetes -L/usr/local/lib
CFLAGS:=-g
BIN:=list_pod_with_invalid_kubeconfig

.PHONY : all clean test memcheck
all:
gcc main.c $(CFLAGS) $(INCLUDE) $(LIBS) -o $(BIN)

test:
./$(BIN)

memcheck:
valgrind --tool=memcheck --leak-check=full ./$(BIN)

clean:
rm ./$(BIN)
67 changes: 67 additions & 0 deletions examples/list_pod_with_invalid_kubeconfig/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
#include <config/kube_config.h>
#include <api/CoreV1API.h>
#include <stdio.h>

void list_pod(apiClient_t * apiClient)
{
v1_pod_list_t *pod_list = NULL;
pod_list = CoreV1API_listNamespacedPod(apiClient, "default", /*namespace */
NULL, /* pretty */
0, /* allowWatchBookmarks */
NULL, /* continue */
NULL, /* fieldSelector */
NULL, /* labelSelector */
0, /* limit */
NULL, /* resourceVersion */
NULL, /* resourceVersionMatch */
0, /* timeoutSeconds */
0 /* watch */
);
printf("The return code of HTTP request=%ld\n", apiClient->response_code);
if (pod_list) {
printf("Get pod list:\n");
listEntry_t *listEntry = NULL;
v1_pod_t *pod = NULL;
list_ForEach(listEntry, pod_list->items) {
pod = listEntry->data;
printf("\tThe pod name: %s\n", pod->metadata->name);
}
v1_pod_list_free(pod_list);
pod_list = NULL;
} else {
printf("Cannot get any pod.\n");
}
}

int main()
{
char *basePath = NULL;
sslConfig_t *sslConfig = NULL;
list_t *apiKeys = NULL;
int rc = load_kube_config(&basePath, &sslConfig, &apiKeys, "non-existent-file");
if (rc != 0) {
printf("Cannot load kubernetes configuration.\n");
/* Return 0 to avoid Github/Action check failures.
You should return a non-zero value in a production environment. */
return 0;
}
apiClient_t *apiClient = apiClient_create_with_base_path(basePath, sslConfig, apiKeys);
if (!apiClient) {
printf("Cannot create a kubernetes client.\n");
/* Return 0 to avoid Github/Action check failures.
You should return a non-zero value in a production environment. */
return 0;
}

list_pod(apiClient);

apiClient_free(apiClient);
apiClient = NULL;
free_client_config(basePath, sslConfig, apiKeys);
basePath = NULL;
sslConfig = NULL;
apiKeys = NULL;
apiClient_unsetupGlobalEnv();

return 0;
}
23 changes: 10 additions & 13 deletions kubernetes/config/kube_config_yaml.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ mapping :: = MAPPING - START(node node) * MAPPING - END

#define VALUE_TRUE_LOWERCASE_STRING "true"

static char *load_file_content(const char *path) {
static char *load_file_content(const char *path)
{

static char fname[] = "load_file_content()";

Expand All @@ -73,8 +74,7 @@ static char *load_file_content(const char *path) {
long s = ftell(fh);
rewind(fh);
buffer = malloc(s);
if ( buffer != NULL )
{
if (buffer != NULL) {
fread(buffer, s, 1, fh);
}
fclose(fh);
Expand Down Expand Up @@ -217,7 +217,7 @@ static int parse_kubeconfig_yaml_property_mapping(kubeconfig_property_t * proper
} else if (0 == strcmp(key->data.scalar.value, KEY_SERVER)) {
property->server = strdup(value->data.scalar.value);
} else if (0 == strcmp(key->data.scalar.value, KEY_INSECURE_SKIP_TLS_VERIFY)) {
property->insecure_skip_tls_verify = (0 == strcmp(value->data.scalar.value, VALUE_TRUE_LOWERCASE_STRING)); //libyaml fails to parse true, but it can parse "true"!
property->insecure_skip_tls_verify = (0 == strcmp(value->data.scalar.value, VALUE_TRUE_LOWERCASE_STRING)); //libyaml fails to parse true, but it can parse "true"!
}
} else if (KUBECONFIG_PROPERTY_TYPE_USER == property->type) {
if (0 == strcmp(key->data.scalar.value, KEY_CLIENT_CERTIFICATE)) {
Expand Down Expand Up @@ -425,14 +425,6 @@ int kubeyaml_load_kubeconfig(kubeconfig_t * kubeconfig)
{
static char fname[] = "kubeyaml_load_kubeconfig()";

yaml_parser_t parser;
yaml_document_t document;

int done = 0;

/* Create the Parser object. */
yaml_parser_initialize(&parser);

/* Set a file input. */
FILE *input = NULL;
if (kubeconfig->fileName) {
Expand All @@ -446,8 +438,14 @@ int kubeyaml_load_kubeconfig(kubeconfig_t * kubeconfig)
return -1;
}

yaml_parser_t parser;
yaml_document_t document;

/* Create the Parser object. */
yaml_parser_initialize(&parser);
yaml_parser_set_input_file(&parser, input);

int done = 0;
while (!done) {

if (!yaml_parser_load(&parser, &document)) {
Expand Down Expand Up @@ -1121,4 +1119,3 @@ int kubeyaml_save_kubeconfig(const kubeconfig_t * kubeconfig)

return -1;
}