-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Topic Id to Metadata Response (#4300)
* Added new data type UUID for topic id. * Added topic id support in Metadata Response.
- Loading branch information
Showing
14 changed files
with
305 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ set( | |
| rdbuf.c | ||
| rdcrc32.c | ||
| rdfnv1a.c | ||
| rdbase64.c | ||
| rdkafka.c | ||
| rdkafka_assignor.c | ||
| rdkafka_broker.c | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| * librdkafka - The Apache Kafka C/C++ library | ||
| * | ||
| * Copyright (c) 2023 Confluent Inc. | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright notice, | ||
| * this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| * POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #include "rdbase64.h" | ||
|
|
||
| #if WITH_SSL | ||
| #include <openssl/ssl.h> | ||
| #endif | ||
|
|
||
| /** | ||
| * @brief Base64 encode binary input \p in, and write base64-encoded string | ||
| * and it's size to \p out. out->ptr will be NULL in case of some issue | ||
| * with the conversion or the conversion is not supported. | ||
| * | ||
| * @remark out->ptr must be freed after use. | ||
| */ | ||
| void rd_base64_encode(const rd_chariov_t *in, rd_chariov_t *out) { | ||
|
|
||
| #if WITH_SSL | ||
| size_t max_len; | ||
|
|
||
| /* OpenSSL takes an |int| argument so the input cannot exceed that. */ | ||
| if (in->size > INT_MAX) { | ||
| out->ptr = NULL; | ||
| return; | ||
| } | ||
|
|
||
| max_len = (((in->size + 2) / 3) * 4) + 1; | ||
| out->ptr = rd_malloc(max_len); | ||
|
|
||
| out->size = EVP_EncodeBlock((unsigned char *)out->ptr, | ||
| (unsigned char *)in->ptr, (int)in->size); | ||
|
|
||
| rd_assert(out->size < max_len); | ||
| out->ptr[out->size] = 0; | ||
| #else | ||
| out->ptr = NULL; | ||
| #endif | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * @brief Base64 encode binary input \p in. | ||
| * @returns a newly allocated, base64-encoded string or NULL in case of some | ||
| * issue with the conversion or the conversion is not supported. | ||
| * | ||
| * @remark Returned string must be freed after use. | ||
| */ | ||
| char *rd_base64_encode_str(const rd_chariov_t *in) { | ||
| rd_chariov_t out; | ||
| rd_base64_encode(in, &out); | ||
| return out.ptr; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * @brief Base64 decode input string \p in. Ignores leading and trailing | ||
| * whitespace. | ||
| * @returns * 0 on successes in which case a newly allocated binary string is | ||
| * set in \p out (and size). | ||
| * * -1 on invalid Base64. | ||
| * * -2 on conversion not supported. | ||
| */ | ||
| int rd_base64_decode(const rd_chariov_t *in, rd_chariov_t *out) { | ||
|
|
||
| #if WITH_SSL | ||
| size_t ret_len; | ||
|
|
||
| /* OpenSSL takes an |int| argument, so |in->size| must not exceed | ||
| * that. */ | ||
| if (in->size % 4 != 0 || in->size > INT_MAX) { | ||
| return -1; | ||
| } | ||
|
|
||
| ret_len = ((in->size / 4) * 3); | ||
| out->ptr = rd_malloc(ret_len + 1); | ||
|
|
||
| if (EVP_DecodeBlock((unsigned char *)out->ptr, (unsigned char *)in->ptr, | ||
| (int)in->size) == -1) { | ||
| rd_free(out->ptr); | ||
| out->ptr = NULL; | ||
| return -1; | ||
| } | ||
|
|
||
| /* EVP_DecodeBlock will pad the output with trailing NULs and count | ||
| * them in the return value. */ | ||
| if (in->size > 1 && in->ptr[in->size - 1] == '=') { | ||
| if (in->size > 2 && in->ptr[in->size - 2] == '=') { | ||
| ret_len -= 2; | ||
| } else { | ||
| ret_len -= 1; | ||
| } | ||
| } | ||
|
|
||
| out->ptr[ret_len] = 0; | ||
| out->size = ret_len; | ||
|
|
||
| return 0; | ||
| #else | ||
| return -2; | ||
| #endif | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * librdkafka - The Apache Kafka C/C++ library | ||
| * | ||
| * Copyright (c) 2023 Confluent Inc. | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright notice, | ||
| * this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| * POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
|
|
||
| #ifndef _RDBASE64_H_ | ||
| #define _RDBASE64_H_ | ||
|
|
||
| #include "rd.h" | ||
|
|
||
| void rd_base64_encode(const rd_chariov_t *in, rd_chariov_t *out); | ||
|
|
||
| char *rd_base64_encode_str(const rd_chariov_t *in); | ||
|
|
||
| int rd_base64_decode(const rd_chariov_t *in, rd_chariov_t *out); | ||
|
|
||
| #endif /* _RDBASE64_H_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.