particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

worker: support a proxy for repository mtls configuration

Browse source 
Allows setting a proxy for the mtls settings for a specific
repository. This is useful when consuming content from the content
service in consoledot.
This commit is contained in:
Sanne Raymaekers 2024-04-13 14:11:04 +02:00
parent 677e30cc68
commit 05a1e8f054
4 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cmd/osbuild-worker/config.go
View file

@ -83,6 +83,7 @@ type repositoryMTLSConfig struct {
CA string `toml:"ca"`
MTLSClientKey string `toml:"mtls_client_key"`
MTLSClientCert string `toml:"mtls_client_cert"`
Proxy string `toml:"proxy"`
}
type workerConfig struct {

7
cmd/osbuild-worker/jobimpl-depsolve.go
View file

@ -19,6 +19,7 @@ type RepositoryMTLSConfig struct {
CA string
MTLSClientKey string
MTLSClientCert string
Proxy *url.URL
}
func (rmc *RepositoryMTLSConfig) CompareBaseURL(baseURLStr string) (bool, error) {
@ -51,6 +52,12 @@ type DepsolveJobImpl struct {
// (matching map keys).
func (impl *DepsolveJobImpl) depsolve(packageSets map[string][]rpmmd.PackageSet, modulePlatformID, arch, releasever string) (map[string][]rpmmd.PackageSpec, map[string][]rpmmd.RepoConfig, error) {
solver := impl.Solver.NewWithConfig(modulePlatformID, releasever, arch, "")
if impl.RepositoryMTLSConfig.Proxy != nil {
err := solver.SetProxy(impl.RepositoryMTLSConfig.Proxy.String())
if err != nil {
return nil, nil, err
}
}
depsolvedSets := make(map[string][]rpmmd.PackageSpec)
repoConfigs := make(map[string][]rpmmd.RepoConfig)

3
cmd/osbuild-worker/jobimpl-osbuild.go
View file

@ -491,6 +491,9 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
}
extraEnv = append(extraEnv, fmt.Sprintf("OSBUILD_SOURCES_CURL_SSL_CLIENT_KEY=%s", impl.RepositoryMTLSConfig.MTLSClientKey))
extraEnv = append(extraEnv, fmt.Sprintf("OSBUILD_SOURCES_CURL_SSL_CLIENT_CERT=%s", impl.RepositoryMTLSConfig.MTLSClientCert))
if impl.RepositoryMTLSConfig.Proxy != nil {
extraEnv = append(extraEnv, fmt.Sprintf("OSBUILD_SOURCES_CURL_PROXY=%s", impl.RepositoryMTLSConfig.Proxy.String()))
}
}
// Run osbuild and handle two kinds of errors

10
cmd/osbuild-worker/main.go
View file

@ -440,11 +440,21 @@ func main() {
if err != nil {
logrus.Fatalf("Repository MTL baseurl not valid: %v", err)
}
var proxyURL *url.URL
if config.RepositoryMTLSConfig.Proxy != "" {
proxyURL, err = url.Parse(config.RepositoryMTLSConfig.Proxy)
if err != nil {
logrus.Fatalf("Repository Proxy url not valid: %v", err)
}
}
repositoryMTLSConfig = &RepositoryMTLSConfig{
BaseURL: baseURL,
CA: config.RepositoryMTLSConfig.CA,
MTLSClientKey: config.RepositoryMTLSConfig.MTLSClientKey,
MTLSClientCert: config.RepositoryMTLSConfig.MTLSClientCert,
Proxy: proxyURL,
}
}