Skip to content

manifest/subscription: support scheme specifier for subscription proxy url #2115

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.

Sign up for GitHub

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

Merged
achilleas-k merged 1 commit into from
Jan 13, 2026
Merged

manifest/subscription: support scheme specifier for subscription proxy url #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions pkg/manifest/subscription.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package manifest

import (
"fmt"
"net/url"
"path/filepath"
"strings"

Expand Down Expand Up @@ -132,10 +133,14 @@ func subscriptionService(
commands = append(commands, fmt.Sprintf("/usr/sbin/subscription-manager config --server.hostname %s", shutil.Quote(subscriptionOptions.ServerUrl)))
}
if subscriptionOptions.Proxy != "" {
proxy := strings.Split(subscriptionOptions.Proxy, ":")
commands = append(commands, fmt.Sprintf("/usr/sbin/subscription-manager config --server.proxy_hostname %s", shutil.Quote(proxy[0])))
if len(proxy) == 2 {
commands = append(commands, fmt.Sprintf("/usr/sbin/subscription-manager config --server.proxy_port %s", shutil.Quote(proxy[1])))
scheme, hostname, port, err := parseProxyUrl(subscriptionOptions.Proxy)
if err != nil {
return nil, nil, nil, nil, fmt.Errorf("invalid proxy url: %v", err)
}
commands = append(commands, fmt.Sprintf("/usr/sbin/subscription-manager config --server.proxy_scheme %s", shutil.Quote(scheme)))
commands = append(commands, fmt.Sprintf("/usr/sbin/subscription-manager config --server.proxy_hostname %s", shutil.Quote(hostname)))
if port != "" {
commands = append(commands, fmt.Sprintf("/usr/sbin/subscription-manager config --server.proxy_port %s", shutil.Quote(port)))
}
}

Expand Down Expand Up @@ -270,6 +275,20 @@ WantedBy=multi-user.target
`
}

// Parses a proxy url in formats host:port * scheme://host:port
// Defaults to http if scheme is not specified
// Port may be blank
func parseProxyUrl(proxyUrl string) (scheme, hostname, port string, err error) {
if !strings.Contains(proxyUrl, "://") {
proxyUrl = fmt.Sprintf("http://%s", proxyUrl)
}
proxyUri, err := url.Parse(proxyUrl)
if err != nil {
return scheme, hostname, port, fmt.Errorf("invalid proxy URI: %s", proxyUrl)
}
return proxyUri.Scheme, proxyUri.Hostname(), proxyUri.Port(), nil
}

func getCurlToAssociateSystem(subscriptionOptions subscription.ImageOptions) string {
patchURL := strings.TrimSuffix(subscriptionOptions.PatchURL, "/")
addTemplateURL := fmt.Sprintf("%s/templates/%s/subscribed-systems", patchURL, subscriptionOptions.TemplateUUID)
Expand Down
14 changes: 9 additions & 5 deletions pkg/manifest/subscription_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func TestSubscriptionService(t *testing.T) {
Insights: true,
Rhc: false,
TemplateUUID: "template-uuid",
Proxy: "proxy-url",
Proxy: "https://proxy-url",
PatchURL: "https://cert.console.redhat.com/api/patch/v3/",
},
srvcOpts: nil,
Expand All @@ -160,10 +160,11 @@ func TestSubscriptionService(t *testing.T) {
Type: osbuild.OneshotServiceType,
ExecStart: []string{
"/usr/sbin/subscription-manager config --server.hostname 'theserverurl-wi'",
"/usr/sbin/subscription-manager config --server.proxy_scheme 'https'",
"/usr/sbin/subscription-manager config --server.proxy_hostname 'proxy-url'",
`/usr/sbin/subscription-manager register --org="${ORG_ID}" --activationkey="${ACTIVATION_KEY}" --baseurl 'thebaseurl-wi'`,
"/usr/bin/insights-client --register", // added when insights is enabled
"curl -v --retry 5 --cert /etc/pki/consumer/cert.pem --key /etc/pki/consumer/key.pem -X PATCH 'https://cert.console.redhat.com/api/patch/v3/templates/template-uuid/subscribed-systems' --proxy 'proxy-url'",
"curl -v --retry 5 --cert /etc/pki/consumer/cert.pem --key /etc/pki/consumer/key.pem -X PATCH 'https://cert.console.redhat.com/api/patch/v3/templates/template-uuid/subscribed-systems' --proxy 'https://proxy-url'",
"/usr/sbin/subscription-manager refresh",
"/usr/bin/rm '" + subkeyFilepath + "'",
},
Expand Down Expand Up @@ -387,7 +388,7 @@ func TestSubscriptionService(t *testing.T) {
Rhc: true,
TemplateName: "template-name",
TemplateUUID: "template-uuid",
Proxy: "proxy-url",
Proxy: "proxy-url:8080",
PatchURL: "https://cert.console.redhat.com/api/patch/v3/",
},
srvcOpts: &subscriptionServiceOptions{
Expand All @@ -412,10 +413,12 @@ func TestSubscriptionService(t *testing.T) {
Type: osbuild.OneshotServiceType,
ExecStart: []string{
"/usr/sbin/subscription-manager config --server.hostname 'theserverurl-wir'",
"/usr/sbin/subscription-manager config --server.proxy_scheme 'http'",
"/usr/sbin/subscription-manager config --server.proxy_hostname 'proxy-url'",
"/usr/sbin/subscription-manager config --server.proxy_port '8080'",
`/usr/bin/rhc connect --organization="${ORG_ID}" --activation-key="${ACTIVATION_KEY}"`,
"/usr/sbin/semanage permissive --add rhcd_t", // added when rhc is enabled
"curl -v --retry 5 --cert /etc/pki/consumer/cert.pem --key /etc/pki/consumer/key.pem -X PATCH 'https://cert.console.redhat.com/api/patch/v3/templates/template-uuid/subscribed-systems' --proxy 'proxy-url'",
"curl -v --retry 5 --cert /etc/pki/consumer/cert.pem --key /etc/pki/consumer/key.pem -X PATCH 'https://cert.console.redhat.com/api/patch/v3/templates/template-uuid/subscribed-systems' --proxy 'proxy-url:8080'",
"/usr/sbin/subscription-manager refresh",
"/usr/bin/rm '" + subkeyFilepath + "'",
},
Expand Down Expand Up @@ -597,7 +600,7 @@ func TestSubscriptionService(t *testing.T) {
BaseUrl: "thebaseurl-pp",
Insights: false,
Rhc: false,
Proxy: "proxy-url:8080",
Proxy: "http://proxy-url:8080",
},
srvcOpts: nil,
expectedStage: &osbuild.Stage{
Expand All @@ -619,6 +622,7 @@ func TestSubscriptionService(t *testing.T) {
Type: osbuild.OneshotServiceType,
ExecStart: []string{
"/usr/sbin/subscription-manager config --server.hostname 'theserverurl-pp'",
"/usr/sbin/subscription-manager config --server.proxy_scheme 'http'",
"/usr/sbin/subscription-manager config --server.proxy_hostname 'proxy-url'",
"/usr/sbin/subscription-manager config --server.proxy_port '8080'",
"/usr/sbin/subscription-manager register --org=\"${ORG_ID}\" --activationkey=\"${ACTIVATION_KEY}\" --baseurl 'thebaseurl-pp'",
Expand Down
Loading