Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KCP: stop messing with the RawPath #1883

Merged
merged 1 commit into from
Sep 2, 2022

Conversation

p0lyn0mial
Copy link
Contributor

Generally, the RawPath is only available when some chars have been encoded. The Path always fully expands the URL.

Since we trim the Path, naturally we would like also to trim the RawPath. To do that correctly we would have to consider encoded slash char as well (%2F).

For example the code breaks on %2Fclusters%2F*/apis/apis.kcp.dev/v1alpha1/apiexports

Because we don't really need to deal with encoded chars and we don't use the RawPath only the Path we could simplify.
This PR simply recomputes the URL after trimming and overwrites it in the HTTP requests.

Summary

Related issue(s)

Fixes #

…coded. The Path always fully expands the URL.

Since we trim the Path, naturally we would like also to trim the RawPath. To do that correctly we would have to consider encoded slash char as well (%2F).

For example the code breaks on %2Fclusters%2F*/apis/apis.kcp.dev/v1alpha1/apiexports

Because we don't really need to deal with encoded chars and we don't use the RawPath only the Path we could simplify.
This PR simply recomputes the URL after trimming and overwrites it in the HTTP requests.
@p0lyn0mial
Copy link
Contributor Author

/assign @stevekuznetsov @sttts

newURL, err := url.Parse(req.URL.String())
if err != nil {
responsewriters.ErrorNegotiated(
apierrors.NewInternalError(fmt.Errorf("unable to resolve %s, err %w", req.URL.Path, err)),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is InternalError because it is on us. Not sure if we want to expose all the details to an end user.

return
}
req.URL.RawPath = req.URL.RawPath[slash:]
newURL, err := url.Parse(req.URL.String())
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we don't really use the RawPath we could simply overwrite the Path and leave the RawPath untouched.

@sttts
Copy link
Member

sttts commented Sep 2, 2022

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 2, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 2, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sttts

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 2, 2022
@openshift-merge-robot openshift-merge-robot merged commit 54e9d16 into kcp-dev:main Sep 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants