Skip to content
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

Jump to bottom

core: Check for real FIPS when adding username to a VNC ticket #474

Merged
merged 1 commit into from
Jun 17, 2022
Merged

core: Check for real FIPS when adding username to a VNC ticket #474

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ger/modules/bll/src/main/java/org/ovirt/engine/core/bll/ConfigureConsoleOptionsQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private void fillCommonPart(ConsoleOptions options) {
options.setSmartcardEnabled(getCachedVm().isSmartcardEnabled());
if (getParameters().isSetTicket()) {
options.setTicket(generateTicket());
if (isKernelFips()) {
if (isFips()) {
options.setUsername(ConfigureConsoleOptionsParams.VNC_USERNAME_PREFIX + getCachedVm().getId());
}
}
Expand Down Expand Up @@ -333,8 +333,8 @@ protected VdsDynamic getHost() {
return vdsDynamicDao.get(getCachedVm().getRunOnVds());
}

protected boolean isKernelFips() {
return vdsStaticDao.get(getCachedVm().getRunOnVds()).isKernelCmdlineFips();
protected boolean isFips() {
return getHost().isFipsEnabled();
}

protected boolean isVncEncryptionEnabled() {
Expand Down Expand Up @@ -397,7 +397,7 @@ private String determineHost() {
new IdQueryParameters(getCachedVm().getId()));
result = returnValue.getReturnValue();
} else if (getParameters().getOptions().getGraphicsType() == GraphicsType.VNC
&& (isKernelFips() || isVncEncryptionEnabled())) {
&& (isFips() || isVncEncryptionEnabled())) {
// If VNC encyption is enabled (at cluster level or because of FIPS mode)
// the console descriptor must contain host name,
// to match TLS certificate for connection
Expand Down
6 changes: 3 additions & 3 deletions ...modules/bll/src/test/java/org/ovirt/engine/core/bll/ConfigureConsoleOptionsQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public void shouldCallSetTicket() {
result.setActionReturnValue("nbusr123");
doReturn(result).when(backend).runAction(eq(ActionType.SetVmTicket), any());
doReturn(null).when(getQuery()).getHost();
doReturn(false).when(getQuery()).isKernelFips();
doReturn(false).when(getQuery()).isFips();
doReturn(false).when(getQuery()).isVncEncryptionEnabled();

getQuery().getQueryReturnValue().setSucceeded(true);
Expand All @@ -157,7 +157,7 @@ public void shouldFillUseSsl() {
VdsDynamic vds = new VdsDynamic();
vds.setVncEncryptionEnabled(true);
doReturn(vds).when(getQuery()).getHost();
doReturn(false).when(getQuery()).isKernelFips();
doReturn(false).when(getQuery()).isFips();
doReturn(false).when(getQuery()).isVncEncryptionEnabled();

getQuery().getQueryReturnValue().setSucceeded(true);
Expand Down Expand Up @@ -188,7 +188,7 @@ public void shouldFillUsernameInFipsMode() {
VdsDynamic vdsDynamic = new VdsDynamic();
vdsDynamic.setVncEncryptionEnabled(true);
doReturn(vdsDynamic).when(getQuery()).getHost();
doReturn(true).when(getQuery()).isKernelFips();
doReturn(true).when(getQuery()).isFips();

getQuery().getQueryReturnValue().setSucceeded(true);
getQuery().executeQueryCommand();
Expand Down