Skip to content

Conversation

@dmcgowan
Copy link
Member

Backport

The TLS fallback should only be used when the protocol is ambiguous due
to provided TLS configurations and defaulting to http. Do not add TLS
configurations when defaulting to http. When the port is 80 or will be
defaulted to 80, there is no protocol ambiguity and TLS fallback should
not be used.

Signed-off-by: Derek McGowan <[email protected]>
(cherry picked from commit d48ceb6)
Signed-off-by: Derek McGowan <[email protected]>
When the HTTP fallback is used, the scheme changes from HTTPS to HTTP
which can cause a mismatch on redirect, causing the authorizer to get
stripped out. Since the redirect host must match the redirect host in
this case, credentials are only sent to the same origin host that
returned the redirect.

This fixes an issue for a push getting a 401 unauthorized on the PUT
request even though credentials are available.

Signed-off-by: Derek McGowan <[email protected]>
(cherry picked from commit 466ee87)
Signed-off-by: Derek McGowan <[email protected]>
Copy link
Member

@akhilerm akhilerm left a comment

Choose a reason for hiding this comment

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

/lgtm

@AkihiroSuda
Copy link
Member

I see the Merge pull request button, but can't find the "Merge queue" button 🤔

@AkihiroSuda AkihiroSuda merged commit 6a9a187 into containerd:release/1.7 Oct 26, 2023
@dmcgowan
Copy link
Member Author

We haven't enabled the merge queue for 1.7 yet

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants