mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 05:41:26 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: jws: return size_t in JWS functions

Browse Source 
JWS functions are supposed to return 0 upon error or when nothing was
produced. This was done in order to put easily the return value in
trash->data without having to check the return value.

However functions like a2base64url() or snprintf() could return a
negative value, which would be casted in a unsigned int if this happen.

This patch add checks on the JWS functions to ensure that no negative
value can be returned, and change the prototype from int to size_t.

This is also related to issue #3114.

Must be backported to 3.2.
This commit is contained in:
William Lallemand 2025-09-11 14:25:03 +02:00
parent 66a7ebfeef
commit e52e6f66ac
2 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/haproxy/jws.h
View File

@ -6,13 +6,13 @@
#include <haproxy/openssl-compat.h> #include <haproxy/openssl-compat.h>
#include <haproxy/jwt-t.h> #include <haproxy/jwt-t.h>
int bn2base64url(const BIGNUM *bn, char *dst, size_t dsize); size_t bn2base64url(const BIGNUM *bn, char *dst, size_t dsize);
int EVP_PKEY_to_pub_jwk(EVP_PKEY *pkey, char *dst, size_t dsize); size_t EVP_PKEY_to_pub_jwk(EVP_PKEY *pkey, char *dst, size_t dsize);
enum jwt_alg EVP_PKEY_to_jws_alg(EVP_PKEY *pkey); enum jwt_alg EVP_PKEY_to_jws_alg(EVP_PKEY *pkey);
int jws_b64_payload(char *payload, char *dst, size_t dsize); size_t jws_b64_payload(char *payload, char *dst, size_t dsize);
int jws_b64_protected(enum jwt_alg alg, char *kid, char *jwk, char *nonce, char *url, char *dst, size_t dsize); size_t jws_b64_protected(enum jwt_alg alg, char *kid, char *jwk, char *nonce, char *url, char *dst, size_t dsize);
int jws_b64_signature(EVP_PKEY *pkey, enum jwt_alg alg, char *b64protected, char *b64payload, char *dst, size_t dsize); size_t jws_b64_signature(EVP_PKEY *pkey, enum jwt_alg alg, char *b64protected, char *b64payload, char *dst, size_t dsize);
int jws_flattened(char *protected, char *payload, char *signature, char *dst, size_t dsize); size_t jws_flattened(char *protected, char *payload, char *signature, char *dst, size_t dsize);
int jws_thumbprint(EVP_PKEY *pkey, char *dst, size_t dsize); size_t jws_thumbprint(EVP_PKEY *pkey, char *dst, size_t dsize);
#endif /* ! _HAPROXY_JWK_H_ */ #endif /* ! _HAPROXY_JWK_H_ */

38
src/jws.c
View File

@ -18,7 +18,7 @@
* *
* Return the size of the data dumped in <dst> * Return the size of the data dumped in <dst>
*/ */
int bn2base64url(const BIGNUM *bn, char *dst, size_t dsize) size_t bn2base64url(const BIGNUM *bn, char *dst, size_t dsize)
{ {
struct buffer *bin; struct buffer *bin;
int binlen; int binlen;
@ -36,7 +36,9 @@ int bn2base64url(const BIGNUM *bn, char *dst, size_t dsize)
ret = a2base64url(bin->area, binlen, dst, dsize); ret = a2base64url(bin->area, binlen, dst, dsize);
out: out:
if (ret > 0)
return ret; return ret;
return 0;
} }
/* /*
@ -45,7 +47,7 @@ out:
* *
* Return the size of the data or 0 * Return the size of the data or 0
*/ */
static int EVP_PKEY_EC_to_pub_jwk(EVP_PKEY *pkey, char *dst, size_t dsize) static size_t EVP_PKEY_EC_to_pub_jwk(EVP_PKEY *pkey, char *dst, size_t dsize)
{ {
BIGNUM *x = NULL, *y = NULL; BIGNUM *x = NULL, *y = NULL;
struct buffer *str_x = NULL, *str_y = NULL; struct buffer *str_x = NULL, *str_y = NULL;
@ -125,7 +127,9 @@ out:
BN_free(x); BN_free(x);
BN_free(y); BN_free(y);
if (ret > 0)
return ret; return ret;
return 0;
} }
/* /*
@ -134,7 +138,7 @@ out:
* *
* Return the size of the data or 0 * Return the size of the data or 0
*/ */
static int EVP_PKEY_RSA_to_pub_jwk(EVP_PKEY *pkey, char *dst, size_t dsize) static size_t EVP_PKEY_RSA_to_pub_jwk(EVP_PKEY *pkey, char *dst, size_t dsize)
{ {
BIGNUM *n = NULL, *e = NULL; BIGNUM *n = NULL, *e = NULL;
struct buffer *str_n = NULL, *str_e = NULL; struct buffer *str_n = NULL, *str_e = NULL;
@ -184,7 +188,9 @@ out:
free_trash_chunk(str_n); free_trash_chunk(str_n);
free_trash_chunk(str_e); free_trash_chunk(str_e);
if (ret > 0)
return ret; return ret;
return 0;
} }
/* Convert an EVP_PKEY to a public key JWK /* Convert an EVP_PKEY to a public key JWK
@ -192,9 +198,9 @@ out:
* *
* Return the size of the data or 0 * Return the size of the data or 0
*/ */
int EVP_PKEY_to_pub_jwk(EVP_PKEY *pkey, char *dst, size_t dsize) size_t EVP_PKEY_to_pub_jwk(EVP_PKEY *pkey, char *dst, size_t dsize)
{ {
int ret = 0; size_t ret = 0;
switch (EVP_PKEY_base_id(pkey)) { switch (EVP_PKEY_base_id(pkey)) {
case EVP_PKEY_RSA: case EVP_PKEY_RSA:
@ -217,7 +223,7 @@ int EVP_PKEY_to_pub_jwk(EVP_PKEY *pkey, char *dst, size_t dsize)
* Return the size of the data or 0 * Return the size of the data or 0
*/ */
int jws_b64_protected(enum jwt_alg alg, char *kid, char *jwk, char *nonce, char *url, size_t jws_b64_protected(enum jwt_alg alg, char *kid, char *jwk, char *nonce, char *url,
char *dst, size_t dsize) char *dst, size_t dsize)
{ {
char *acc; char *acc;
@ -262,7 +268,9 @@ int jws_b64_protected(enum jwt_alg alg, char *kid, char *jwk, char *nonce, char
ret = a2base64url(json->area, json->data, dst, dsize); ret = a2base64url(json->area, json->data, dst, dsize);
out: out:
free_trash_chunk(json); free_trash_chunk(json);
if (ret > 0)
return ret; return ret;
return 0;
} }
/* /*
@ -271,13 +279,15 @@ out:
* Return the size of the data or 0 * Return the size of the data or 0
*/ */
int jws_b64_payload(char *payload, char *dst, size_t dsize) size_t jws_b64_payload(char *payload, char *dst, size_t dsize)
{ {
int ret = 0; int ret = 0;
ret = a2base64url(payload, strlen(payload), dst, dsize); ret = a2base64url(payload, strlen(payload), dst, dsize);
if (ret > 0)
return ret; return ret;
return 0;
} }
/* /*
@ -344,7 +354,7 @@ out:
* *
* Return the size of the data or 0 * Return the size of the data or 0
*/ */
int jws_b64_signature(EVP_PKEY *pkey, enum jwt_alg alg, char *b64protected, char *b64payload, char *dst, size_t dsize) size_t jws_b64_signature(EVP_PKEY *pkey, enum jwt_alg alg, char *b64protected, char *b64payload, char *dst, size_t dsize)
{ {
EVP_MD_CTX *ctx; EVP_MD_CTX *ctx;
const EVP_MD *evp_md = NULL; const EVP_MD *evp_md = NULL;
@ -442,8 +452,9 @@ int jws_b64_signature(EVP_PKEY *pkey, enum jwt_alg alg, char *b64protected, char
out: out:
free_trash_chunk(sign); free_trash_chunk(sign);
if (ret > 0)
return ret; return ret;
return 0;
} }
/* /*
@ -451,7 +462,7 @@ out:
* *
* Return the size of the data or 0 * Return the size of the data or 0
*/ */
int jws_thumbprint(EVP_PKEY *pkey, char *dst, size_t dsize) size_t jws_thumbprint(EVP_PKEY *pkey, char *dst, size_t dsize)
{ {
int ret = 0; int ret = 0;
struct buffer *jwk = NULL; struct buffer *jwk = NULL;
@ -480,11 +491,13 @@ int jws_thumbprint(EVP_PKEY *pkey, char *dst, size_t dsize)
out: out:
free_trash_chunk(jwk); free_trash_chunk(jwk);
if (ret > 0)
return ret; return ret;
return 0;
} }
int jws_flattened(char *protected, char *payload, char *signature, char *dst, size_t dsize) size_t jws_flattened(char *protected, char *payload, char *signature, char *dst, size_t dsize)
{ {
int ret = 0; int ret = 0;
@ -497,7 +510,10 @@ int jws_flattened(char *protected, char *payload, char *signature, char *dst, si
if (ret >= dsize) if (ret >= dsize)
ret = 0; ret = 0;
if (ret > 0)
return ret; return ret;
return 0;
} }