Fixup: C code

fisx · fisx · commit a67c66a7e061 · 2025-06-04T21:15:30.000+02:00
diff --git a/services/nginz/third_party/nginx-zauth-module/zauth_module.c b/services/nginz/third_party/nginx-zauth-module/zauth_module.c
@@ -499,24 +499,24 @@ static ngx_int_t zauth_parse_request (ngx_http_request_t * r) {
 static ZauthResult token_from_header (ngx_str_t const * hdr, ZauthToken ** t) {
         const char bearer[] = "Bearer ";
         const char aws4_hmac_sha256[] = "AWS4-HMAC-SHA256 ";
-        if (hdr->len >= sizeof(bearer) && strncmp((char const *) hdr->data, bearer, sizeof(bearer)) == 0) {
-                return zauth_token_parse(&hdr->data[sizeof(bearer)], hdr->len - sizeof(bearer), t);
-        } else if (hdr->len >= sizeof(aws4_hmac_sha256) && strncmp((char const *) hdr->data, aws4_hmac_sha256, sizeof(aws4_hmac_sha256)) == 0) {
-                return token_from_aws_hmac_header(&hdr->data[sizeof(aws4_hmac_sha256)], hdr->len - sizeof(aws4_hmac_sha256), t);
+        if (hdr->len >= sizeof(bearer) - 1 && strncmp((char const *) hdr->data, bearer, sizeof(bearer) - 1) == 0) {
+                return zauth_token_parse(&hdr->data[sizeof(bearer) - 1], hdr->len - sizeof(bearer) - 1, t);
+        } else if (hdr->len >= sizeof(aws4_hmac_sha256) - 1 && strncmp((char const *) hdr->data, aws4_hmac_sha256, sizeof(aws4_hmac_sha256) - 1) == 0) {
+                return token_from_aws_hmac_header(&hdr->data[sizeof(aws4_hmac_sha256) - 1], hdr->len - sizeof(aws4_hmac_sha256) - 1, t);
         } else {
                 return ZAUTH_PARSE_ERROR;
         }
 }
 
 static ZauthResult token_from_query (ngx_str_t const * query, ZauthToken ** t) {
         const char param_name[] = "access_token=";
-        uint8_t const * start = memmem(query->data, query->len, param_name, sizeof(param_name));
+        uint8_t const * start = memmem(query->data, query->len, param_name, sizeof(param_name) - 1);
 
         if (start == NULL) {
                 return ZAUTH_PARSE_ERROR;
         }
 
-        uint8_t const * token_start = start + sizeof(param_name);
+        uint8_t const * token_start = start + sizeof(param_name) - 1;
         size_t          token_len   = query->len - (token_start - query->data);
         uint8_t const * token_end   = memchr(token_start, '&', token_len);
 
@@ -528,13 +528,13 @@ static ZauthResult token_from_query (ngx_str_t const * query, ZauthToken ** t) {
 // https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-auth-using-authorization-header.html
 static ZauthResult token_from_aws_hmac_header(uint8_t const * auth_header, size_t auth_header_len, ZauthToken ** t) {
         const char component_name[] = "Credential=";
-        uint8_t const * start = memmem(auth_header, auth_header_len, component_name, sizeof(component_name));
+        uint8_t const * start = memmem(auth_header, auth_header_len, component_name, sizeof(component_name) - 1);
 
         if (start == NULL) {
                 return ZAUTH_PARSE_ERROR;
         }
 
-        uint8_t const * token_start   = start + sizeof(component_name);
+        uint8_t const * token_start   = start + sizeof(component_name) - 1;
         size_t          remaining_len = auth_header_len - (token_start - auth_header);
         uint8_t const * token_end     = memchr(token_start, ',', remaining_len);
 
