mirror of
https://github.com/containers/podman.git
synced 2026-07-09 06:44:58 -04:00
d0f97989ad
systemd interprets % as specifier characters in unit configuration files (e.g. %H, %u, %40). Proxy environment variable values that contain percent-encoded URL characters (such as %40 for @ in usernames) cause systemd to emit warnings and fail to parse the generated /etc/systemd/system.conf.d/default-env.conf: system.conf.d/default-env.conf:2: Failed to resolve specifiers in HTTP_PROXY=http://user%40example.com@proxy:3128 Fix by adding a bash variable substitution that doubles every % to %% before writing to the systemd unit conf files. The profile.d and environment.d destinations do not need this escaping and continue to use the original value. Fixes #28698 Signed-off-by: crawfordxx <crawfordxx@users.noreply.github.com>
62 lines
2.0 KiB
Go
62 lines
2.0 KiB
Go
package proxyenv
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
"go.podman.io/common/libnetwork/etchosts"
|
|
"go.podman.io/common/pkg/config"
|
|
"go.podman.io/podman/v6/pkg/machine"
|
|
"go.podman.io/podman/v6/pkg/machine/vmconfigs"
|
|
)
|
|
|
|
const proxySetupScriptTemplate = `#!/bin/bash
|
|
|
|
SYSTEMD_SYSTEM_CONF=/etc/systemd/system.conf.d/default-env.conf
|
|
SYSTEMD_USER_CONF=/etc/systemd/user.conf.d/default-env.conf
|
|
ENVD_CONF=/etc/environment.d/default-env.conf
|
|
PROFILE_CONF=/etc/profile.d/default-env.sh
|
|
|
|
mkdir -p /etc/profile.d /etc/environment.d /etc/systemd/system.conf.d/ /etc/systemd/user.conf.d/
|
|
rm -f $SYSTEMD_SYSTEM_CONF $SYSTEMD_USER_CONF $ENVD_CONF $PROFILE_CONF
|
|
|
|
echo "[Manager]" >> $SYSTEMD_SYSTEM_CONF
|
|
echo "[Manager]" >> $SYSTEMD_USER_CONF
|
|
for proxy in %s; do
|
|
systemd_proxy="${proxy//%%/%%%%}"
|
|
printf "DefaultEnvironment=\"%%s\"\n" "$systemd_proxy" >> $SYSTEMD_SYSTEM_CONF
|
|
printf "DefaultEnvironment=\"%%s\"\n" "$systemd_proxy" >> $SYSTEMD_USER_CONF
|
|
printf "%%s\n" "$proxy" >> $ENVD_CONF
|
|
printf "export %%s\n" "$proxy" >> $PROFILE_CONF
|
|
done
|
|
|
|
systemctl daemon-reload
|
|
`
|
|
|
|
func getProxyScript(isWSL bool) io.Reader {
|
|
var envs []string
|
|
for _, key := range config.ProxyEnv {
|
|
if value, ok := os.LookupEnv(key); ok {
|
|
// WSL does not use host.containers.internal as valid name for the VM.
|
|
if !isWSL {
|
|
value = strings.ReplaceAll(value, "127.0.0.1", etchosts.HostContainersInternal)
|
|
value = strings.ReplaceAll(value, "localhost", etchosts.HostContainersInternal)
|
|
}
|
|
// %q to quote the value correctly
|
|
envs = append(envs, fmt.Sprintf("%q", key+"="+value))
|
|
}
|
|
}
|
|
|
|
script := fmt.Sprintf(proxySetupScriptTemplate, strings.Join(envs, " "))
|
|
logrus.Tracef("Final environment variable setup script: %s", script)
|
|
return strings.NewReader(script)
|
|
}
|
|
|
|
func ApplyProxies(mc *vmconfigs.MachineConfig) error {
|
|
return machine.LocalhostSSHWithStdin("root", mc.SSH.IdentityPath, mc.Name, mc.SSH.Port, []string{"/usr/bin/bash"},
|
|
getProxyScript(mc.WSLHypervisor != nil))
|
|
}
|