Skip to content

sensitive information leak to log #12018

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
sureshanaparti merged 16 commits into from
Jan 28, 2026
Merged

sensitive information leak to log #12018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1ee7c6d
sensitive information leak to log
cyl-auth Nov 7, 2025
7e09770
Update agent/src/main/java/com/cloud/agent/resource/consoleproxy/Cons…
YLChen-007 Nov 7, 2025
08b1d9e
Update core/src/main/java/com/cloud/storage/template/HttpTemplateDown…
YLChen-007 Nov 7, 2025
e084644
Update engine/schema/src/main/java/com/cloud/upgrade/DatabaseCreator.…
YLChen-007 Nov 7, 2025
4a614b6
Update plugins/hypervisors/baremetal/src/main/java/com/cloud/baremeta…
YLChen-007 Nov 7, 2025
c97662d
Update plugins/hypervisors/baremetal/src/main/java/com/cloud/baremeta…
YLChen-007 Nov 7, 2025
0e85b58
Update plugins/hypervisors/baremetal/src/main/java/com/cloud/baremeta…
YLChen-007 Nov 7, 2025
badf6bc
Update plugins/hypervisors/baremetal/src/main/java/com/cloud/baremeta…
YLChen-007 Nov 7, 2025
d9f18b6
Update plugins/hypervisors/baremetal/src/main/java/com/cloud/baremeta…
YLChen-007 Nov 7, 2025
460e71e
Update plugins/hypervisors/baremetal/src/main/java/com/cloud/baremeta…
YLChen-007 Nov 7, 2025
53e1861
Update utils/src/main/java/com/cloud/utils/UriUtils.java
YLChen-007 Nov 7, 2025
3393f3e
Merge branch '4.20' into my-fix-420-mask-sensitive-information3
DaanHoogland Jan 5, 2026
830a5a5
Update plugins/hypervisors/baremetal/src/main/java/com/cloud/baremeta…
DaanHoogland Jan 5, 2026
145699f
Merge remote-tracking branch 'upstream/4.20' into clean-pr-12018
cyl-auth Jan 27, 2026
a6689b6
Sync with 4.20 and fix conflict in BaremetalPingPxeResource
cyl-auth Jan 27, 2026
6fbc565
Apply suggestions from code review
DaanHoogland Jan 27, 2026
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
2 changes: 1 addition & 1 deletion agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ private void launchConsoleProxy(final byte[] ksBits, final String ksPassword, fi
final Object resource = this;
logger.info("Building class loader for com.cloud.consoleproxy.ConsoleProxy");
if (consoleProxyMain == null) {
logger.info("Running com.cloud.consoleproxy.ConsoleProxy with encryptor password={}", encryptorPassword);
logger.info("Running com.cloud.consoleproxy.ConsoleProxy");
consoleProxyMain = new Thread(new ManagedContextRunnable() {
@Override
protected void runInContext() {
Expand Down
4 changes: 2 additions & 2 deletions .../baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
com.trilead.ssh2.Connection sshConnection = null;
try {
super.configure(name, params);
logger.debug(String.format("Trying to connect to DHCP server(IP=%1$s, username=%2$s, password=%3$s)", _ip, _username, _password));
logger.debug(String.format("Trying to connect to DHCP server(IP=%1$s, username=%2$s", _ip, _username));
sshConnection = SSHCmdHelper.acquireAuthorizedConnection(_ip, _username, _password);
if (sshConnection == null) {
throw new ConfigurationException(String.format("Cannot connect to DHCP server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, _password));
throw new ConfigurationException(String.format("Cannot connect to DHCP server(IP=%1$s, username=%2$s", _ip, _username));
}

if (!SSHCmdHelper.sshExecuteCmd(sshConnection, "[ -f '/usr/sbin/dnsmasq' ]")) {
Expand Down
6 changes: 3 additions & 3 deletions ...metal/src/main/java/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ private Answer execute(VmDataCommand cmd) {

sshConnection.connect(null, 60000, 60000);
if (!sshConnection.authenticateWithPassword(_username, _password)) {
logger.debug("SSH Failed to authenticate");
throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, _password));
logger.debug("SSH Failed to authenticate with user {} credentials", _username);
throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s", _ip, _username));
}

String script = String.format("python /usr/bin/baremetal_user_data.py '%s'", arg);
Expand Down Expand Up @@ -167,7 +167,7 @@ private Answer execute(PrepareKickstartPxeServerCommand cmd) {
sshConnection.connect(null, 60000, 60000);
if (!sshConnection.authenticateWithPassword(_username, _password)) {
logger.debug("SSH Failed to authenticate");
throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, _password));
throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s", _ip, _username));
}

String copyTo = String.format("%s/%s", _tftpDir, cmd.getTemplateUuid());
Expand Down
10 changes: 5 additions & 5 deletions .../baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
sshConnection.connect(null, 60000, 60000);
if (!sshConnection.authenticateWithPassword(_username, _password)) {
logger.debug("SSH Failed to authenticate");
throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, "******"));
throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=******", _ip, _username));
}

String cmd = String.format("[ -f /%1$s/pxelinux.0 ] && [ -f /%2$s/kernel ] && [ -f /%3$s/initrd.gz ] ", _tftpDir, _tftpDir, _tftpDir);
Expand Down Expand Up @@ -150,8 +150,8 @@ protected PreparePxeServerAnswer execute(PreparePxeServerCommand cmd) {
try {
sshConnection.connect(null, 60000, 60000);
if (!sshConnection.authenticateWithPassword(_username, _password)) {
logger.debug("SSH Failed to authenticate");
throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, _password));
logger.debug("SSH Failed to authenticate with user {} credentials", _username);
throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s", _ip, _username));
}

String script =
Expand Down Expand Up @@ -179,7 +179,7 @@ protected Answer execute(PrepareCreateTemplateCommand cmd) {
sshConnection.connect(null, 60000, 60000);
if (!sshConnection.authenticateWithPassword(_username, _password)) {
logger.debug("SSH Failed to authenticate");
throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, _password));
throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s", _ip, _username));
}

String script =
Expand Down Expand Up @@ -237,7 +237,7 @@ private Answer execute(VmDataCommand cmd) {
sshConnection.connect(null, 60000, 60000);
if (!sshConnection.authenticateWithPassword(_username, _password)) {
logger.debug("SSH Failed to authenticate");
throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, _password));
throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s", _ip, _username));
}

String script = String.format("python /usr/bin/baremetal_user_data.py '%s'", arg);
Expand Down
8 changes: 6 additions & 2 deletions utils/src/main/java/com/cloud/utils/UriUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,12 @@ public static InputStream getInputStreamFromUrl(String url, String user, String
if ((user != null) && (password != null)) {
httpclient.getParams().setAuthenticationPreemptive(true);
Credentials defaultcreds = new UsernamePasswordCredentials(user, password);
httpclient.getState().setCredentials(new AuthScope(hostAndPort.first(), hostAndPort.second(), AuthScope.ANY_REALM), defaultcreds);
LOGGER.info("Added username=" + user + ", password=" + password + "for host " + hostAndPort.first() + ":" + hostAndPort.second());
httpclient.getState().setCredentials(
new AuthScope(hostAndPort.first(), hostAndPort.second(), AuthScope.ANY_REALM), defaultcreds);
LOGGER.info("Added username={} along with password for host {}:{}"
, user
, hostAndPort.first()
, hostAndPort.second());
}
// Execute the method.
GetMethod method = new GetMethod(url);
Expand Down
Loading