-
Notifications
You must be signed in to change notification settings - Fork 101
add a new collector that gets information about a server's TLS certificates #1765
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
Open
laverya
wants to merge
22
commits into
main
Choose a base branch
from
laverya/sc-121804/finish-validating-failing-mitm-cert-check
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 10 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
843afb6
add a new collector that gets information about a server's TLS certif…
laverya d57b212
check issuer in analyzer, update test
laverya 8475f6e
add analyzer and unit tests
laverya c34b425
Merge branch 'main' into laverya/sc-121804/finish-validating-failing-…
laverya 92a599a
make schemas
laverya 70a099a
add replicated.app analyze test
laverya 9aba086
make generate
laverya e35578f
Merge branch 'main' into laverya/sc-121804/finish-validating-failing-…
laverya 5fccca2
go mod tidy examples
laverya 6df1106
Update pkg/analyze/host_tls.go
laverya e832664
include error in collect results instead of returning
laverya 33c4487
add to struct, make generate schemas
laverya d10a121
collector name is required in analyzer
laverya d6bce85
fix unit tests
laverya 09ff342
add this to the e2e tests
laverya 4ee38f3
fix getting host analyzer
laverya d3b915f
fix collection
laverya e139fb5
use dorequest to collect tls info
laverya 727d82e
support collecting certificate from behind a proxy
laverya b2c10c7
rename to tlsCertificate
laverya 8eb674c
allow fetching the expected set of certs from the remote server
laverya 6539de6
make generate schemas
laverya 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 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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| package analyzer | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/pkg/errors" | ||
| "github.com/replicatedhq/troubleshoot/pkg/analyze/types" | ||
| troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" | ||
| ) | ||
|
|
||
| type AnalyzeHostTLS struct { | ||
| hostAnalyzer *troubleshootv1beta2.TLSAnalyze | ||
| } | ||
|
|
||
| func (a *AnalyzeHostTLS) Title() string { | ||
| return hostAnalyzerTitleOrDefault(a.hostAnalyzer.AnalyzeMeta, "TLS") | ||
| } | ||
|
|
||
| func (a *AnalyzeHostTLS) IsExcluded() (bool, error) { | ||
| return isExcluded(a.hostAnalyzer.Exclude) | ||
| } | ||
|
|
||
| func (a *AnalyzeHostTLS) Analyze( | ||
| getCollectedFileContents func(string) ([]byte, error), findFiles getChildCollectedFileContents, | ||
| ) ([]*AnalyzeResult, error) { | ||
|
|
||
| collectorName := a.hostAnalyzer.CollectorName | ||
| if collectorName == "" { | ||
| collectorName = "result" | ||
| } | ||
|
|
||
| const nodeBaseDir = "host-collectors/tls" | ||
| localPath := fmt.Sprintf("%s/%s.json", nodeBaseDir, collectorName) | ||
| fileName := fmt.Sprintf("%s.json", collectorName) | ||
|
|
||
| collectedContents, err := retrieveCollectedContents( | ||
| getCollectedFileContents, | ||
| localPath, | ||
| nodeBaseDir, | ||
| fileName, | ||
| ) | ||
| if err != nil { | ||
| return []*AnalyzeResult{{Title: a.Title()}}, err | ||
| } | ||
|
|
||
| results, err := analyzeHostCollectorResults(collectedContents, a.hostAnalyzer.Outcomes, a.CheckCondition, a.Title()) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to analyze http request") | ||
| } | ||
|
|
||
| return results, nil | ||
| } | ||
|
|
||
| func (a *AnalyzeHostTLS) CheckCondition(when string, data []byte) (bool, error) { | ||
|
|
||
| var tlsInfo types.TLSInfo | ||
| if err := json.Unmarshal(data, &tlsInfo); err != nil { | ||
| return false, fmt.Errorf("failed to unmarshal data into tlsInfo: %v", err) | ||
| } | ||
| return compareHostTLSResult(when, &tlsInfo) | ||
| } | ||
|
|
||
| // currently this supports only checks like "issuer == foo" | ||
| func compareHostTLSResult(when string, tlsInfo *types.TLSInfo) (bool, error) { | ||
| parts := strings.SplitN(when, " ", 3) | ||
| if len(parts) < 3 { | ||
| return false, fmt.Errorf("invalid when clause: %s", when) | ||
| } | ||
|
|
||
| checkType := parts[0] | ||
| if checkType != "issuer" { | ||
| return false, fmt.Errorf("invalid check type: %s", checkType) | ||
| } | ||
|
|
||
| issuer := parts[2] | ||
|
|
||
| for _, cert := range tlsInfo.PeerCertificates { | ||
| if cert.Issuer == issuer { | ||
| return true, nil | ||
| } | ||
| } | ||
|
|
||
| return false, 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.
Uh oh!
There was an error while loading. Please reload this page.