Add support for IPv6 literal hostname in url #181
Closed
Conversation
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
added 2 commits
October 31, 2018 12:09
Axel was previously unable to parse ipv6 address as hostname of url. This has been fixed, conforming to RFC 2732 Closes #169 Signed-off-by: Shankar <shankar_m@protonmail.com>
Axel failed to add port number to the absolute-url in the request-target message to the proxy if the port number is not the default value to that specific protocol. This has been fixed. Signed-off-by: Shankar <shankar_m@protonmail.com>
ismaell
requested changes
Feb 12, 2019
| if (strrchr(conn->host, '@') != NULL) { | ||
| strncpy(conn->user, conn->host, sizeof(conn->user) - 1); | ||
| if (strrchr(url, '@') != NULL) { | ||
| strncpy(conn->user, url, sizeof(conn->user) - 1); |
There was a problem hiding this comment.
Please replace strncpy with strlcpy.
| if (strrchr(conn->host, '@') != NULL) { | ||
| strncpy(conn->user, conn->host, sizeof(conn->user) - 1); | ||
| if (strrchr(url, '@') != NULL) { | ||
| strncpy(conn->user, url, sizeof(conn->user) - 1); | ||
| i = strrchr(conn->user, '@'); |
There was a problem hiding this comment.
This could be accomplished by reducing the size to be copied.
| i = strrchr(conn->user, '@'); | ||
| *i = 0; | ||
| strncpy(conn->host, i + 1, sizeof(conn->host) - 1); | ||
| strncpy(url, i + 1, sizeof(url) - 1); |
| // Look for IPv6 literal hostname | ||
| if (*url == '[') { | ||
| strncpy(conn->host, url + 1, sizeof(conn->host) - 1); | ||
| if ((i = strrchr(conn->host, ']')) != NULL) { |
There was a problem hiding this comment.
strrchr + strlcpy instead of fixing up the result.
|
|
||
| if (inet_pton(AF_INET6, hostname, buf)) | ||
| return 1; | ||
| return 0; |
There was a problem hiding this comment.
should be
return hostname && 1 == inet_pton(AF_INET6, hostname, buf);
| strcpy(string, scheme_from_proto(conn->proto)); | ||
|
|
||
| if (*conn->user != 0 && strcmp(conn->user, "anonymous") != 0) | ||
| sprintf(string + strlen(string), "%s:%s@", | ||
| conn->user, conn->pass); | ||
|
|
||
| sprintf(string + strlen(string), "%s:%i%s%s", |
There was a problem hiding this comment.
The URL formatting should be split to somewhere else so it can be shared between conn.c and http.c
|
@shankar ping. |
|
Merged with minor edits. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Commit bfd6e88:
Axel was previously unable to parse ipv6 address as hostname of url.
This has been fixed, conforming to RFC 2732
Closes #169
Commit 8de7c1a:
Axel did not add port number to the absolute url in the GET request to the proxy if it is not the default port. This has been fixed in this commit.
@ismaell please review my pull requests.