S3 Code Rewrite #1958
Open
S3 Code Rewrite #1958
+1,388
−1,279
Conversation
This file contains hidden or 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
daviesrob
reviewed
Oct 3, 2025
hfile_s3.c
Outdated
|
|
||
|
|
||
| if (ret) { | ||
| fprintf(stderr, "Unable to open file.\n"); |
Member
There was a problem hiding this comment.
It would be good to do something like hfile_libcul's easy_errno() here.
daviesrob
reviewed
Oct 7, 2025
daviesrob
reviewed
Nov 6, 2025
Add code to read from S3 sources in the same style as the current writing code. Merge the s3_write.c code into hfile_s3.c to put all the S3 code in the same file. This should simplify the S3 code and give us a little more flexibility in how we use it.
daviesrob
reviewed
Nov 11, 2025
daviesrob
reviewed
Nov 13, 2025
daviesrob
reviewed
Nov 20, 2025
Comment on lines
+1307
to
+1334
| struct curl_slist *headers = NULL; | ||
|
|
||
| // add the scheme marker | ||
| ksprintf(&final_url, "s3w+%s", url.s); | ||
| if (auth->l) | ||
| if ((headers = curl_slist_append(headers, auth->s)) == NULL) | ||
| goto error; | ||
|
|
||
| if(final_url.l == 0) goto error; | ||
| if ((headers = curl_slist_append(headers, date->s)) == NULL) | ||
| goto error; | ||
|
|
||
| fp = hopen(final_url.s, mode, "va_list", argsp, | ||
| "s3_auth_callback", write_authorisation_callback, | ||
| "s3_auth_callback_data", ad, | ||
| "redirect_callback", redirect_endpoint_callback, | ||
| "set_region_callback", set_region, | ||
| NULL); | ||
| free(final_url.s); | ||
| if (content->l) | ||
| if ((headers = curl_slist_append(headers, content->s)) == NULL) | ||
| goto error; | ||
|
|
||
| if (fp == NULL) goto error; | ||
| if (range) { | ||
| if ((headers = curl_slist_append(headers, range->s)) == NULL) | ||
| goto error; | ||
| } | ||
|
|
||
| free(url.s); | ||
|
|
||
| return fp; | ||
| if (token->l) { | ||
| if ((headers = curl_slist_append(headers, token->s)) == NULL) | ||
| goto error; | ||
| } | ||
|
|
||
| error: | ||
| curl_easy_setopt(fp->curl, CURLOPT_HTTPHEADER, headers); | ||
|
|
||
| if (fp) hclose_abruptly(fp); | ||
| free(url.s); | ||
| free_auth_data(ad); | ||
| error: | ||
|
|
||
| return NULL; | ||
| return headers; |
Member
There was a problem hiding this comment.
There's a risk of leaking headers here because curl_slist_append() can return NULL. In fact, gievn the number of times it's called, I'd be tempted to wrap it in a function that takes a struct curl_slist **, and returns a non-zero value on error so the dance needed to prevent loss of the pointer doesn't have to be repeated.
Comment on lines
+1111
to
+1112
| static int set_region(void *adv, kstring_t *region) { | ||
| s3_auth_data *ad = (s3_auth_data *) adv; |
Member
There was a problem hiding this comment.
Casting from a void * is no longer needed here.
Suggested change
| static int set_region(void *adv, kstring_t *region) { | |
| s3_auth_data *ad = (s3_auth_data *) adv; | |
| static int set_region(s3_auth_data *ad, kstring_t *region) { |
| return -1; | ||
| } | ||
|
|
||
| ret = set_region((void *)fp->au, ®ion); |
| #ifdef ENABLE_PLUGINS | ||
| // Embed version string for examination via strings(1) or what(1) | ||
| static const char id[] = | ||
| "@(#)hfile_s3 test plugin (htslib)\t" HTS_VERSION_TEXT; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add code to read from S3 sources in the same style as the current writing code. Merge the s3_write.c code into hfile_s3.c to put all the S3 code in the same file.
This should simplify the S3 code and give us a little more flexibility in how we use it.
Still need to remove the old writing code (file removal and other modifications).