forked from open-telemetry/opentelemetry-collector-contrib
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[cmd/telemetrygen] Add TLS/mTLS support to telemetrygen (open-telemet…
…ry#29681) **Description:** Implementing robust security measures is essential for any tracing ingestion service and infrastructure. This adds TLS/mTLS support to telemetrygen traces so that it can be used to test the security implementation. To illustrate the usage, a new example, `secure-tracing` is added to examples collection. **Link to tracking Issue:** <Issue number if applicable> **Testing:** Tested with the `secure-tracing` example. **Documentation:** - telemetrygen README has been updated with a link to secure-tracing. - secure-tracing README contains setup of a testing environment and test script via telemetrygen
- Loading branch information
Showing
20 changed files
with
592 additions
and
24 deletions.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Use this changelog template to create an entry for release notes. | ||
|
||
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
change_type: enhancement | ||
|
||
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) | ||
component: cmd/telemetrygen | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: This updates telemetrygen with TLS/mTLS options to test the security of telemetry ingestion services and infrastructure for secure communication. To illustrate the usage, a new example, secure-tracing is added to examples collection. | ||
|
||
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. | ||
issues: [29681] | ||
|
||
# (Optional) One or more lines of additional information to render under the primary note. | ||
# These lines will be padded with 2 spaces and then inserted directly into the document. | ||
# Use pipe (|) for multiline entries. | ||
subtext: | ||
|
||
# If your change doesn't affect end users or the exported elements of any package, | ||
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. | ||
# Optional: The change log or logs in which this entry should be included. | ||
# e.g. '[user]' or '[user, api]' | ||
# Include 'user' if the change is relevant to end users. | ||
# Include 'api' if there is a change to a library API. | ||
# Default: '[user]' | ||
change_logs: [] |
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,77 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package common | ||
|
||
import ( | ||
"crypto/tls" | ||
"crypto/x509" | ||
"errors" | ||
"os" | ||
|
||
"google.golang.org/grpc/credentials" | ||
) | ||
|
||
// caPool loads CA certificate from a file and returns a CertPool. | ||
// The certPool is used to set RootCAs in certificate verification. | ||
func caPool(caFile string) (*x509.CertPool, error) { | ||
pool := x509.NewCertPool() | ||
if caFile != "" { | ||
data, err := os.ReadFile(caFile) | ||
if err != nil { | ||
return nil, err | ||
} | ||
if !pool.AppendCertsFromPEM(data) { | ||
return nil, errors.New("failed to add CA certificate to root CA pool") | ||
} | ||
} | ||
return pool, nil | ||
} | ||
|
||
func GetTLSCredentialsForGRPCExporter(caFile string, cAuth ClientAuth) (credentials.TransportCredentials, error) { | ||
|
||
pool, err := caPool(caFile) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
creds := credentials.NewTLS(&tls.Config{ | ||
RootCAs: pool, | ||
}) | ||
|
||
// Configuration for mTLS | ||
if cAuth.Enabled { | ||
keypair, err := tls.LoadX509KeyPair(cAuth.ClientCertFile, cAuth.ClientKeyFile) | ||
if err != nil { | ||
return nil, err | ||
} | ||
creds = credentials.NewTLS(&tls.Config{ | ||
RootCAs: pool, | ||
Certificates: []tls.Certificate{keypair}, | ||
}) | ||
} | ||
|
||
return creds, nil | ||
} | ||
|
||
func GetTLSCredentialsForHTTPExporter(caFile string, cAuth ClientAuth) (*tls.Config, error) { | ||
pool, err := caPool(caFile) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
tlsCfg := tls.Config{ | ||
RootCAs: pool, | ||
} | ||
|
||
// Configuration for mTLS | ||
if cAuth.Enabled { | ||
keypair, err := tls.LoadX509KeyPair(cAuth.ClientCertFile, cAuth.ClientKeyFile) | ||
if err != nil { | ||
return nil, err | ||
} | ||
tlsCfg.ClientAuth = tls.RequireAndVerifyClientCert | ||
tlsCfg.Certificates = []tls.Certificate{keypair} | ||
} | ||
return &tlsCfg, nil | ||
} |
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
Oops, something went wrong.