Skip to content

Commit

Permalink
httpauth: fix mentioned review points
Browse files Browse the repository at this point in the history
  • Loading branch information
@cHuberCoffee
cHuberCoffee committed Sep 12, 2023
1 parent 94bf45c commit b809a94
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 34 deletions.
2 changes: 1 addition & 1 deletion include/re_httpauth.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ struct httpauth_digest_enc_resp {
/* optional */
char *charset;
bool userhash;
void (*hash_function)(const uint8_t *, size_t, uint8_t *);
void (*hashh)(const uint8_t *, size_t, uint8_t *);
size_t hash_length;
};

Expand Down
69 changes: 36 additions & 33 deletions src/httpauth/digest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


enum {
CNONCE_NC_LENGTH = 9, /* 8 characters + '\0' */
CNONCE_NC_SIZE = 9, /* 8 characters + '\0' */
};


Expand Down Expand Up @@ -645,6 +645,9 @@ static int digest_response(struct httpauth_digest_enc_resp *resp,
size_t hashstringl = (resp->hash_length * 2) + 1;
int err = 0, n = 0;

if (!resp || !resp->hashh)
return EINVAL;

mb = mbuf_alloc(str_len(user) + str_len(passwd) + chall->realm.l + 2);
if (!mb)
return ENOMEM;
Expand All @@ -662,10 +665,10 @@ static int digest_response(struct httpauth_digest_enc_resp *resp,
/* HASH A2 */
if (str_isset(resp->qop) && str_str(resp->qop, "auth-int")) {
if (!entitybody || str_casecmp(entitybody, "") == 0) {
resp->hash_function((uint8_t *)"", str_len(""), hash1);
resp->hashh((uint8_t *)"", 0, hash1);
}
else {
resp->hash_function((uint8_t *)entitybody,
resp->hashh((uint8_t *)entitybody,
str_len(entitybody), hash1);
}

Expand All @@ -679,7 +682,7 @@ static int digest_response(struct httpauth_digest_enc_resp *resp,
if (err)
goto out;

resp->hash_function(mb->buf, mb->end, hash2);
resp->hashh(mb->buf, mb->end, hash2);
mbuf_rewind(mb);

/* HASH A1 */
Expand All @@ -696,7 +699,7 @@ static int digest_response(struct httpauth_digest_enc_resp *resp,
if (err)
goto out;

resp->hash_function(mb->buf, mb->end, hash1);
resp->hashh(mb->buf, mb->end, hash1);
n = re_snprintf(resp->username, hashstringl, "%w",
hash1, hashstringl);
if (n == -1 || n != (int)hashstringl -1) {
Expand All @@ -717,7 +720,7 @@ static int digest_response(struct httpauth_digest_enc_resp *resp,
if (err)
goto out;

resp->hash_function(mb->buf, mb->end, hash1);
resp->hashh(mb->buf, mb->end, hash1);
mbuf_rewind(mb);

if (str_str(resp->algorithm, "-sess")) {
Expand All @@ -726,7 +729,7 @@ static int digest_response(struct httpauth_digest_enc_resp *resp,
if (err)
goto out;

resp->hash_function(mb->buf, mb->end, hash1);
resp->hashh(mb->buf, mb->end, hash1);
mbuf_rewind(mb);
}

Expand All @@ -744,7 +747,7 @@ static int digest_response(struct httpauth_digest_enc_resp *resp,
if (err)
goto out;

resp->hash_function(mb->buf, mb->end, hash1);
resp->hashh(mb->buf, mb->end, hash1);
n = re_snprintf(resp->response, hashstringl, "%w",
hash1, resp->hash_length);
if (n == -1 || n != (int)hashstringl - 1)
Expand Down Expand Up @@ -807,35 +810,35 @@ int httpauth_digest_response_print(struct re_printf *pf,
* Set cnonce and nc and recalculate the response value.
* This function should be used only for unit tests
*
* @param resp Httpauth_new_digest_response object pointer
* @param chall Received and decoded digest challenge
* @param method Used method
* @param user Username
* @param passwd User password
* @param entitybody Entitybody if qop=auth-int
* @param cnonce Cnonce
* @param nc_ Nonce counter
* @param resp Httpauth_new_digest_response object pointer
* @param chall Received and decoded digest challenge
* @param method Used method
* @param user Username
* @param passwd User password
* @param entitybody Entitybody if qop=auth-int
* @param cnonce Cnonce
* @param nonce_counter Nonce counter
*
* @return 0 if success, otherwise errorcode
*/
int httpauth_digest_response_set_cnonce(struct httpauth_digest_enc_resp *resp,
const struct httpauth_digest_chall *chall, const struct pl *method,
const char *user, const char *passwd, const char *entitybody,
const uint32_t cnonce, const uint32_t nc_)
const uint32_t cnonce, const uint32_t nonce_counter)
{
int err = 0, n = 0;

if (!resp || !chall || !method || !passwd)
return EINVAL;

n = re_snprintf(resp->cnonce, CNONCE_NC_LENGTH, "%08x", cnonce);
if (n == -1 || n != CNONCE_NC_LENGTH -1) {
n = re_snprintf(resp->cnonce, CNONCE_NC_SIZE, "%08x", cnonce);
if (n == -1 || n != CNONCE_NC_SIZE -1) {
err = ERANGE;
goto out;
}

n = re_snprintf(resp->nc, CNONCE_NC_LENGTH, "%08x", nc_);
if (n == -1 || n != CNONCE_NC_LENGTH -1) {
n = re_snprintf(resp->nc, CNONCE_NC_SIZE, "%08x", nonce_counter);
if (n == -1 || n != CNONCE_NC_SIZE -1) {
err = ERANGE;
goto out;
}
Expand Down Expand Up @@ -905,8 +908,8 @@ int httpauth_digest_response_full(struct httpauth_digest_enc_resp **presp,
return ENOMEM;
}

resp->cnonce = mem_zalloc(CNONCE_NC_LENGTH, NULL);
resp->nc = mem_zalloc(CNONCE_NC_LENGTH, NULL);
resp->cnonce = mem_zalloc(CNONCE_NC_SIZE, NULL);
resp->nc = mem_zalloc(CNONCE_NC_SIZE, NULL);
if (!resp->cnonce || !resp->nc) {
err = ENOMEM;
goto out;
Expand Down Expand Up @@ -957,46 +960,46 @@ int httpauth_digest_response_full(struct httpauth_digest_enc_resp **presp,
if (err)
goto out;

n = re_snprintf(resp->cnonce, CNONCE_NC_LENGTH, "%08x", cnonce);
if (n == -1 || n != CNONCE_NC_LENGTH -1) {
n = re_snprintf(resp->cnonce, CNONCE_NC_SIZE, "%08x", cnonce);
if (n == -1 || n != CNONCE_NC_SIZE -1) {
err = ERANGE;
goto out;
}

n = re_snprintf(resp->nc, CNONCE_NC_LENGTH, "%08x", nc++);
if (n == -1 || n != CNONCE_NC_LENGTH -1) {
n = re_snprintf(resp->nc, CNONCE_NC_SIZE, "%08x", nc++);
if (n == -1 || n != CNONCE_NC_SIZE -1) {
err = ERANGE;
goto out;
}

if (pl_strstr(&chall->algorithm, "SHA256-sess")) {
resp->hash_function = &sha256;
resp->hashh = &sha256;
resp->hash_length = SHA256_DIGEST_LENGTH;
err = str_dup(&resp->algorithm, "SHA256-sess");
}
else if (pl_strstr(&chall->algorithm, "SHA256")) {
resp->hash_function = &sha256;
resp->hashh = &sha256;
resp->hash_length = SHA256_DIGEST_LENGTH;
err = str_dup(&resp->algorithm, "SHA256");
}
else if (pl_strstr(&chall->algorithm, "SHA1-sess")) {
resp->hash_function = &sha1;
resp->hashh = &sha1;
resp->hash_length = SHA_DIGEST_LENGTH;
err = str_dup(&resp->algorithm, "SHA1-sess");
}
else if (pl_strstr(&chall->algorithm, "SHA1")) {
resp->hash_function = &sha1;
resp->hashh = &sha1;
resp->hash_length = SHA_DIGEST_LENGTH;
err = str_dup(&resp->algorithm, "SHA1");
}
else if (pl_strstr(&chall->algorithm, "MD5-sess")) {
resp->hash_function = &md5;
resp->hashh = &md5;
resp->hash_length = MD5_SIZE;
err = str_dup(&resp->algorithm, "MD5-sess");
}
else if (!pl_isset(&chall->algorithm) ||
pl_strstr(&chall->algorithm, "MD5")) {
resp->hash_function = &md5;
resp->hashh = &md5;
resp->hash_length = MD5_SIZE;
err = str_dup(&resp->algorithm, "MD5");
}
Expand Down

0 comments on commit b809a94

Please sign in to comment.