-
Notifications
You must be signed in to change notification settings - Fork 13
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
ROX-23255: emailsender read auth cfg from kubernetes #1860
Merged
johannes94
merged 8 commits into
jmalsam/ROX-23255-emailsender-auth
from
jmalsam/ROX-23255-emailsender-sa-auth
Jun 6, 2024
Merged
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c89eaf5
generate auth config from service account token
johannes94 92c3be6
default SA config to false
johannes94 c9a8236
helm value for auth type
johannes94 9821978
helm value for auth type serviceaccount
johannes94 1a32483
rewrite to use internal kubernetes svc
johannes94 06023d0
fix template for new env variable name
johannes94 1ac092b
add Bearer in auth head
johannes94 60d8eac
adding a comment on why we do not use ocm sdk to load jwks
johannes94 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package shared | ||
|
||
import ( | ||
"crypto/tls" | ||
"crypto/x509" | ||
"fmt" | ||
"os" | ||
) | ||
|
||
// TLSWithAdditionalCAs returns a tls config with addiotional trusted ca certificates. | ||
// It uses the systems default certificates and appends the CA certificates in the given files. | ||
func TLSWithAdditionalCAs(caFiles ...string) (*tls.Config, error) { | ||
rootCAs, err := x509.SystemCertPool() | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to load system cert pool: %w", err) | ||
} | ||
|
||
for _, caFile := range caFiles { | ||
ca, err := os.ReadFile(caFile) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to read ca file '%s': %w", caFile, err) | ||
} | ||
rootCAs.AppendCertsFromPEM(ca) | ||
} | ||
|
||
return &tls.Config{ | ||
RootCAs: rootCAs, | ||
}, nil | ||
} |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kurlov I copied a lot of this logic from the PR you already review in the core repo. The function itself is still somewhat different, as it errors on failed certificates loads and does not return a full http.Transport like here.