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

Add explicit conversion short * to char * with adding null terminator #12

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −11
Open

Add explicit conversion short * to char * with adding null terminator #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 17 additions & 11 deletions src/ngx_http_ssl_ja4_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,13 @@ int ngx_ssl_ja4(ngx_connection_t *c, ngx_pool_t *pool, ngx_ssl_ja4_t *ja4)
return NGX_DECLINED;
}

size_t hex_str_len = sizeof(c->ssl->ciphers[i]);

// Add c->ssl->ciphers to ja4->ciphers
for (i = 0; i < c->ssl->ciphers_sz; ++i)
{
size_t hex_str_len = strlen(c->ssl->ciphers[i]) + 1; // +1 for null terminator

// Allocate memory for the hex string and copy it
ja4->ciphers[ja4->ciphers_sz] = ngx_pnalloc(pool, hex_str_len);
ja4->ciphers[ja4->ciphers_sz] = ngx_pnalloc(pool, hex_str_len + 1); // +1 for null terminator
if (ja4->ciphers[ja4->ciphers_sz] == NULL)
{
// Handle allocation failure and clean up previously allocated memory
Expand All @@ -188,7 +188,8 @@ int ngx_ssl_ja4(ngx_connection_t *c, ngx_pool_t *pool, ngx_ssl_ja4_t *ja4)
ja4->ciphers = NULL;
return NGX_DECLINED;
}
ngx_memcpy(ja4->ciphers[ja4->ciphers_sz], c->ssl->ciphers[i], hex_str_len);
ngx_memcpy(ja4->ciphers[ja4->ciphers_sz], (char *)(c->ssl->ciphers + i), hex_str_len);
ja4->ciphers[ja4->ciphers_sz][hex_str_len] = '\0';
ja4->ciphers_sz++;
}

Expand Down Expand Up @@ -250,16 +251,17 @@ int ngx_ssl_ja4(ngx_connection_t *c, ngx_pool_t *pool, ngx_ssl_ja4_t *ja4)
}
for (i = 0; i < c->ssl->extensions_sz; ++i)
{
if (!ngx_ssl_ja4_is_ext_greased(c->ssl->extensions[i]))

size_t ext_len = sizeof(c->ssl->extensions[i]) + 1; // +1 for null terminator
char *ext = ngx_pnalloc(pool, ext_len);
ngx_memcpy(ext, (char *)(c->ssl->extensions + i), ext_len - 1);
ext[ext_len - 1] = '\0';
if (!ngx_ssl_ja4_is_ext_greased(ext))
{
char *ext = c->ssl->extensions[i];
size_t ext_len = strlen(ext) + 1; // +1 for null terminator

ja4->extensions_count++;

// ignored extensions are only counted, not hashed
if (!ngx_ssl_ja4_is_ext_ignored(c->ssl->extensions[i]))
if (!ngx_ssl_ja4_is_ext_ignored(ext))
{

// Allocate memory for the extension string and copy it
Expand All @@ -272,19 +274,20 @@ int ngx_ssl_ja4(ngx_connection_t *c, ngx_pool_t *pool, ngx_ssl_ja4_t *ja4)
ngx_pfree(pool, ja4->extensions[j]);
}
ngx_pfree(pool, ja4->extensions);
ngx_pfree(pool, ext);
ja4->extensions = NULL;
return NGX_DECLINED;
}
ngx_memcpy(ja4->extensions[ja4->extensions_sz], ext, ext_len);
ja4->extensions_sz++;
}
// for no psk ignored extensions are not counted, not hashed
if (ngx_ssl_ja4_is_ext_ignored(c->ssl->extensions[i]))
if (ngx_ssl_ja4_is_ext_ignored(ext))
{
continue;
}
// check if the extension is not a PSK extension
if (!ngx_ssl_ja4_is_ext_dynamic(c->ssl->extensions[i]))
if (!ngx_ssl_ja4_is_ext_dynamic(ext))
{
// Allocate memory for the extension string and copy it
ja4->extensions_no_psk[ja4->extensions_no_psk_count] = ngx_pnalloc(pool, ext_len);
Expand All @@ -297,13 +300,15 @@ int ngx_ssl_ja4(ngx_connection_t *c, ngx_pool_t *pool, ngx_ssl_ja4_t *ja4)
ngx_pfree(pool, ja4->extensions_no_psk[j]);
}
ngx_pfree(pool, ja4->extensions_no_psk);
ngx_pfree(pool, ext);
ja4->extensions_no_psk = NULL;
return NGX_DECLINED;
}
ngx_memcpy(ja4->extensions_no_psk[ja4->extensions_no_psk_count], ext, ext_len);
ja4->extensions_no_psk_count++;
}
}
ngx_pfree(pool, ext);
}
/* Now, let's sort the ja4->extensions array */
// what is going on with the mem alloc in these arguments...
Expand Down Expand Up @@ -1504,3 +1509,4 @@ ngx_module_t ngx_http_ssl_ja4_module = {
NULL, /* exit process */
NULL, /* exit master */
NGX_MODULE_V1_PADDING};