packages/ovirt-engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!42 Init package ovirt-engine of version 4.4.4.1

Browse Source 
From: @jxy_git 
Reviewed-by: @wm-wm-wm 
Signed-off-by: @wm-wm-wm
This commit is contained in:
openeuler-ci-bot 2022-06-30 01:43:07 +00:00 committed by Gitee
commit 849fda8b2a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
12 changed files with 1604 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-add-dependent-package-to-lib.patch
View File

@ -1,21 +1,23 @@
From c26b3207515396163d30dfcfff4c1b2d51e3b7d0 Mon Sep 17 00:00:00 2001 From 24785efaa96c6e57a07738538ad8946a28bccb5b Mon Sep 17 00:00:00 2001
From: tmp <tmp@huawei.com> From: wangge <wangge20@huawei.com>
Date: Tue, 14 Sep 2021 19:50:06 +0800 Date: Sun, 26 Sep 2021 11:19:33 +0800
Subject: [PATCH] add dependent package to lib Subject: [PATCH] add dependent package to lib
--- ---
backend/manager/modules/utils/pom.xml | 24 ++++++++++++++++++++++++ backend/manager/modules/utils/pom.xml | 26 ++++++++++++++++++++++-
backend/pom.xml | 24 ++++++++++++++++++++++++ backend/pom.xml | 30 +++++++++++++++++++++++++++
2 files changed, 48 insertions(+) 2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/backend/manager/modules/utils/pom.xml b/backend/manager/modules/utils/pom.xml diff --git a/backend/manager/modules/utils/pom.xml b/backend/manager/modules/utils/pom.xml
index dc6f6ca..163d31d 100644 index 505d367..19cc06a 100644
--- a/backend/manager/modules/utils/pom.xml --- a/backend/manager/modules/utils/pom.xml
+++ b/backend/manager/modules/utils/pom.xml +++ b/backend/manager/modules/utils/pom.xml
@@ -167,6 +167,30 @@ @@ -166,7 +166,31 @@
</goals>
</execution> </execution>
</executions> </executions>
</plugin> - </plugin>
+ </plugin>
+ +
+ <plugin> + <plugin>
+ <groupId>org.apache.maven.plugins</groupId> + <groupId>org.apache.maven.plugins</groupId>
@ -44,10 +46,10 @@ index dc6f6ca..163d31d 100644
</build> </build>
diff --git a/backend/pom.xml b/backend/pom.xml diff --git a/backend/pom.xml b/backend/pom.xml
index 996f4e8..6b77fdd 100644 index 2bac37b..bc57848 100644
--- a/backend/pom.xml --- a/backend/pom.xml
+++ b/backend/pom.xml +++ b/backend/pom.xml
@@ -47,6 +47,30 @@ @@ -47,6 +47,36 @@
<fail>true</fail> <fail>true</fail>
</configuration> </configuration>
</plugin> </plugin>
@ -61,7 +63,7 @@ index 996f4e8..6b77fdd 100644
+ <goals> + <goals>
+ <goal>copy</goal> + <goal>copy</goal>
+ </goals> + </goals>
+ <phase>package</phase> + <phase>package</phase>
+ <configuration> + <configuration>
+ <artifactItems> + <artifactItems>
+ <artifactItem> + <artifactItem>
@ -69,7 +71,13 @@ index 996f4e8..6b77fdd 100644
+ <artifactId>sshd-core</artifactId> + <artifactId>sshd-core</artifactId>
+ <version>${sshd-core.version}</version> + <version>${sshd-core.version}</version>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory> + <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </artifactItem> + </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-common</artifactId>
+ <version>${sshd-core.version}</version>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </artifactItem>
+ </artifactItems> + </artifactItems>
+ </configuration> + </configuration>
+ </execution> + </execution>

1106
0002-add-support-running-on-kunpeng-platform.patch Normal file
View File

File diff suppressed because it is too large Load Diff

40
0003-add-virt-chipset-support.patch Normal file
View File

@ -0,0 +1,40 @@
From 54a5c1a7ba6d8b7f68b7bf6b31e94e1a44685338 Mon Sep 17 00:00:00 2001
From: wangge <wangge20@huawei.com>
Date: Wed, 29 Sep 2021 16:19:14 +0800
Subject: [PATCH] add virt chipset support
---
.../core/vdsbroker/monitoring/VirtMonitoringStrategy.java | 3 +++
packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VirtMonitoringStrategy.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VirtMonitoringStrategy.java
index 886a721..b889773 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VirtMonitoringStrategy.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VirtMonitoringStrategy.java
@@ -242,6 +242,9 @@ public class VirtMonitoringStrategy implements MonitoringStrategy {
if (!StringUtils.isEmpty(matchedEmulatedMachine)) {
setClusterEmulatedMachine(vds, matchedEmulatedMachine);
return true;
+ } else if (supported.contains(ChipsetType.VIRT.getChipsetName())) {
+ setClusterEmulatedMachine(vds, ChipsetType.VIRT.getChipsetName());
+ return true;
}
return false;
}
diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
index f50171b..3f42535 100644
--- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -976,7 +976,7 @@ select fn_db_update_config_value('ClusterEmulatedMachines','pc-i440fx-rhel7.3.0,
select fn_db_update_config_value('ClusterEmulatedMachines','pc-i440fx-rhel7.6.0,pc-i440fx-2.12,pseries-rhel7.6.0-sxxm,s390-ccw-virtio-2.12','4.3');
-- Since 4.4 every x86 cluster keeps two emulated machine types: for i440fx and q35 chipsets. Thus, host must support
-- both chipsets and ClusterEmulatedMachines list also should contain values for both of them.
-select fn_db_update_config_value_for_versions_from_up_to('ClusterEmulatedMachines','pc-q35-rhel8.1.0,pc-q35-4.1,pc-i440fx-rhel7.6.0,pc-i440fx-2.12,pseries-rhel8.1.0,s390-ccw-virtio-2.12','4.4','4.5');
+select fn_db_update_config_value_for_versions_from_up_to('ClusterEmulatedMachines','pc-q35-rhel8.1.0,pc-q35-4.1,pc-i440fx-rhel7.6.0,pc-i440fx-2.12,pseries-rhel8.1.0,s390-ccw-virtio-2.12,virt','4.4','4.5');
select fn_db_update_config_value('SpiceDriverNameInGuest','{"windows": "RHEV-Spice", "linux" : "xorg-x11-drv-qxl" }','general');
select fn_db_update_config_value('SupportedClusterLevels','4.2,4.3,4.4,4.5','general');
select fn_db_update_config_value('SupportedVDSMVersions','4.20,4.30,4.40','general');
--
2.27.0

209
0004-fit-cluster-can-not-find-error-under-aarch64-platform.patch Normal file
View File

@ -0,0 +1,209 @@
From 4248a443e716f429c9625dcb61be3c5adce52ed7 Mon Sep 17 00:00:00 2001
From: wangge <wangge20@huawei.com>
Date: Sat, 9 Oct 2021 15:11:00 +0800
Subject: [PATCH] fit cluster can't find error under aarch64 platform
---
.../engine/core/bll/UpdateClusterCommand.java | 3 +-
.../core/bll/validator/ClusterValidator.java | 7 +--
.../common/utils/ClusterEmulatedMachines.java | 56 +++++++++++++++++--
.../builder/vminfo/LibvirtVmXmlBuilder.java | 7 ++-
.../monitoring/VirtMonitoringStrategy.java | 5 +-
5 files changed, 64 insertions(+), 14 deletions(-)
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java
index e23c76a..c66de52 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java
@@ -618,7 +618,8 @@ public class UpdateClusterCommand<T extends ClusterOperationParameters> extends
List<String> available = Config.getValue(ConfigValues.ClusterEmulatedMachines, version.getValue());
return ClusterEmulatedMachines.build(
EmulatedMachineCommonUtils.getSupportedByChipset(ChipsetType.I440FX, supported, available),
- EmulatedMachineCommonUtils.getSupportedByChipset(ChipsetType.Q35, supported, available));
+ EmulatedMachineCommonUtils.getSupportedByChipset(ChipsetType.Q35, supported, available),
+ EmulatedMachineCommonUtils.getSupportedByChipset(ChipsetType.VIRT, supported, available));
}
private void addOrUpdateAddtionalClusterFeatures() {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ClusterValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ClusterValidator.java
index 9e13a3d..4f43154 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ClusterValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ClusterValidator.java
@@ -131,12 +131,11 @@ public class ClusterValidator {
*/
public ValidationResult cpuTypeSupportsVirtService() {
return ValidationResult.failWith(EngineMessage.ACTION_TYPE_FAILED_CPU_NOT_FOUND)
- .when(cluster.supportsVirtService() && !cpuExists());
+ .when(!cluster.supportsVirtService() && !cpuExists());
}
protected boolean cpuExists() {
- return cluster.getCpuName() == null || "".equals(cluster.getCpuName()) ||
- cpuFlagsManagerHandler.checkIfCpusExist(cluster.getCpuName(), cluster.getCompatibilityVersion());
+ return cluster.getCpuName() == null || "".equals(cluster.getCpuName()) || cpuFlagsManagerHandler.checkIfCpusExist(cluster.getCpuName(), cluster.getCompatibilityVersion());
}
public ValidationResult versionSupported() {
@@ -283,7 +282,7 @@ public class ClusterValidator {
*/
public ValidationResult cpuNotFound(boolean cpusExist) {
return ValidationResult.failWith(EngineMessage.CLUSTER_CANNOT_UPDATE_CPU_ILLEGAL)
- .when(newCluster.supportsVirtService()
+ .when(!newCluster.supportsVirtService()
&& (!"".equals(cluster.getCpuName()) || !"".equals(newCluster.getCpuName()))
&& !cpusExist);
}
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ClusterEmulatedMachines.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ClusterEmulatedMachines.java
index 2928da4..36c4946 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ClusterEmulatedMachines.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ClusterEmulatedMachines.java
@@ -6,23 +6,50 @@ public class ClusterEmulatedMachines {
private static final String I440FX_CHIPSET_NAME = ChipsetType.I440FX.getChipsetName();
private static final String Q35_CHIPSET_NAME = ChipsetType.Q35.getChipsetName();
+ private static final String VIRT_CHIPSET_NAME = ChipsetType.VIRT.getChipsetName();
private String i440fxType = "";
private String q35Type = "";
+ private String virtType = "";
private ClusterEmulatedMachines() {
}
+ private ClusterEmulatedMachines(String emulatedMachine) {
+ if (emulatedMachine.contains(VIRT_CHIPSET_NAME)) {
+ this.virtType = VIRT_CHIPSET_NAME;
+ }
+ }
+
private ClusterEmulatedMachines(String i440fxType, String q35Type) {
this.i440fxType = i440fxType;
this.q35Type = q35Type;
}
- public static String build(String i440fxType, String q35Type) {
- if (i440fxType == null) {
- return q35Type;
+ public static String build(String i440fxType, String q35Type, String virtType) {
+ String matchedType = new String();
+ if (i440fxType != null) {
+ if (!matchedType.isEmpty()) {
+ matchedType = matchedType + ";";
+ }
+ matchedType = matchedType + i440fxType;
+ }
+ if (q35Type != null) {
+ if (!matchedType.isEmpty()) {
+ matchedType = matchedType + ";";
+ }
+ matchedType = matchedType + q35Type;
+ }
+ if (virtType != null) {
+ if (!matchedType.isEmpty()) {
+ matchedType = matchedType + ";";
+ }
+ matchedType = matchedType + virtType;
+ }
+ if (matchedType.isEmpty()) {
+ return null;
} else {
- return q35Type == null ? i440fxType : i440fxType + ";" + q35Type;
+ return matchedType;
}
}
@@ -41,7 +68,13 @@ public class ClusterEmulatedMachines {
if (em.length == 2) {
return new ClusterEmulatedMachines(em[0], em[1]);
}
+ if (em.length > 2) {
+ return new ClusterEmulatedMachines(emulatedMachine);
+ }
ChipsetType chipsetType = ChipsetType.fromMachineType(emulatedMachine);
+ if (chipsetType == ChipsetType.VIRT) {
+ return new ClusterEmulatedMachines(VIRT_CHIPSET_NAME);
+ }
if (chipsetType == ChipsetType.Q35) {
return new ClusterEmulatedMachines(replaceChipset(emulatedMachine, ChipsetType.I440FX), emulatedMachine);
} else {
@@ -80,8 +113,21 @@ public class ClusterEmulatedMachines {
return q35Type;
}
+ public String getVirtType() {
+ return virtType;
+ }
+
public String getTypeByChipset(ChipsetType chipsetType) {
- return chipsetType == ChipsetType.Q35 ? q35Type : i440fxType;
+ switch (chipsetType) {
+ case Q35:
+ return q35Type;
+ case I440FX:
+ return i440fxType;
+ case VIRT:
+ return virtType;
+ default:
+ return q35Type;
+ }
}
public static String forChipset(String emulatedMachine, ChipsetType chipsetType) {
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java
index 4e7794a..712d3c3 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java
@@ -692,7 +692,7 @@ public class LibvirtVmXmlBuilder {
writer.writeAttributeString("secure", secureBoot ? "yes" : "no");
writer.writeAttributeString("type", "pflash");
if (vm.getClusterArch().getFamily() == ArchitectureType.aarch64) {
- writer.writeRaw("/usr/share/AAVMF/AAVMF_CODE.fd");
+ writer.writeRaw("/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw");
} else {
writer.writeRaw("/usr/share/OVMF/OVMF_CODE.secboot.fd");
}
@@ -701,7 +701,7 @@ public class LibvirtVmXmlBuilder {
String nvramTemplate = vmCustomProperties.get("nvram_template");
if (nvramTemplate == null) {
if(vm.getClusterArch().getFamily() == ArchitectureType.aarch64){
- nvramTemplate = "/usr/share/AAVMF/AAVMF_CODE.fd";
+ nvramTemplate = "/usr/share/edk2/aarch64/vars-template-pflash.raw";
} else {
nvramTemplate = String.format("/usr/share/OVMF/%s",
secureBoot ? "OVMF_VARS.secboot.fd" : "OVMF_VARS.fd");
@@ -1047,6 +1047,9 @@ public class LibvirtVmXmlBuilder {
case x86:
writeInput();
break;
+ case aarch64:
+ writeInput();
+ break;
case ppc:
if (vmInfoBuildUtils.hasUsbController(vm)) {
writeInput();
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VirtMonitoringStrategy.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VirtMonitoringStrategy.java
index b889773..b027275 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VirtMonitoringStrategy.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VirtMonitoringStrategy.java
@@ -228,7 +228,7 @@ public class VirtMonitoringStrategy implements MonitoringStrategy {
return supported.contains(cluster.getEmulatedMachine());
} else {
ClusterEmulatedMachines ems = ClusterEmulatedMachines.parse(cluster.getEmulatedMachine());
- return supported.contains(ems.getI440fxType()) && supported.contains(ems.getQ35Type());
+ return supported.contains(ems.getVirtType()) || (supported.contains(ems.getI440fxType()) && supported.contains(ems.getQ35Type()));
}
}
}
@@ -237,7 +237,8 @@ public class VirtMonitoringStrategy implements MonitoringStrategy {
String matchedI440fx =
EmulatedMachineCommonUtils.getSupportedByChipset(ChipsetType.I440FX, supported, available);
String matchedQ35 = EmulatedMachineCommonUtils.getSupportedByChipset(ChipsetType.Q35, supported, available);
- String matchedEmulatedMachine = ClusterEmulatedMachines.build(matchedI440fx, matchedQ35);
+ String matchedVirt = EmulatedMachineCommonUtils.getSupportedByChipset(ChipsetType.VIRT, supported, available);
+ String matchedEmulatedMachine = ClusterEmulatedMachines.build(matchedI440fx, matchedQ35, matchedVirt);
if (!StringUtils.isEmpty(matchedEmulatedMachine)) {
setClusterEmulatedMachine(vds, matchedEmulatedMachine);
--
2.27.0

25
0005-fix-interface-report-an-error-when-emulatedMachine-is-null.patch Normal file
View File

@ -0,0 +1,25 @@
From 155932487ade8c3d05504434947eeb67fd76c59e Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Wed, 13 Oct 2021 09:43:38 +0800
Subject: [PATCH] fix interface report an error when emulatedMachine is null
---
.../ovirt/engine/core/common/utils/ClusterEmulatedMachines.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ClusterEmulatedMachines.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ClusterEmulatedMachines.java
index 7d5c902..882b3be 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ClusterEmulatedMachines.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ClusterEmulatedMachines.java
@@ -58,7 +58,7 @@ public class ClusterEmulatedMachines {
}
public static ClusterEmulatedMachines parse(String emulatedMachine) {
- if (emulatedMachine == null) {
+ if (emulatedMachine == null || emulatedMachine.equals("")) {
return new ClusterEmulatedMachines();
}
String[] em = emulatedMachine.split(";");
--
2.27.0

24
0006-add-arm-biostype-in-front-end-api.patch Normal file
View File

@ -0,0 +1,24 @@
From 0bae3aa6270eb2843a8e6aaaea6690350511233f Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Tue, 12 Oct 2021 18:54:58 +0800
Subject: [PATCH] add arm biostype in front end api
---
src/main/java/types/BiosType.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/types/BiosType.java b/src/main/java/types/BiosType.java
index 9044d90..786eafd 100644
--- a/src/main/java/types/BiosType.java
+++ b/src/main/java/types/BiosType.java
@@ -79,5 +79,6 @@ public enum BiosType {
* @status added
* @since 4.3
*/
- Q35_SECURE_BOOT;
+ Q35_SECURE_BOOT,
+ VIRT_OVMF;
}
--
2.27.0

38
0007-add-config-item-for-openeuler.patch Normal file
View File

@ -0,0 +1,38 @@
From f7411c6c0795c0936ae59a4fab6c04d74da2d2bc Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Tue, 16 Nov 2021 09:19:20 +0800
Subject: [PATCH] add config item for openeuler
---
.../roles/ovirt-host-deploy-facts/tasks/host-os.yml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/host-os.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/host-os.yml
index 7e42653..ef92743 100644
--- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/host-os.yml
+++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/host-os.yml
@@ -5,9 +5,15 @@
if ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
else 0 }}"
fc_ver: "{{ ansible_distribution_major_version|int
- if ansible_distribution == 'Fedora'
+ if (ansible_distribution == 'Fedora' or ansible_distribution == 'openEuler')
else 0 }}"
+- name: Check if system is OpenEuler
+ set_fact:
+ ansible_python_interpreter: "{{ 'usr/bin/python3' }}"
+ when:
+ ansible_distribution == 'openEuler'
+
- name: Fetch installed packages
package_facts:
manager: auto
@@ -26,3 +32,4 @@
- name: Detect if host is a prebuilt image
set_fact:
node_host: "{{ not node_presence.changed }}"
+
--
2.27.0

BIN
4.4.20.tar.gz Normal file
View File

Binary file not shown.

112
CVE-2020-10775.patch
View File

@ -1,6 +1,6 @@
diff -Naru a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoPostLoginServlet.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoPostLoginServlet.java diff -Naru a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoPostLoginServlet.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoPostLoginServlet.java
--- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoPostLoginServlet.java 2021-07-20 03:39:24.000000000 +0800 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoPostLoginServlet.java 2020-11-19 01:15:47.000000000 +0800
+++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoPostLoginServlet.java 2022-06-06 14:16:06.807214000 +0800 +++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoPostLoginServlet.java 2022-06-06 10:28:53.426920000 +0800
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
import javax.naming.InitialContext; import javax.naming.InitialContext;
@ -14,108 +14,14 @@ diff -Naru a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa
@Override @Override
- public void init() { - public void init() {
+ public void init() throws ServletException { + public void init() throws ServletException {
String strVal = getServletConfig().getInitParameter("login-as-admin"); String strVal = getServletConfig().getInitParameter("login-as-admin");
if (strVal == null) { if (strVal == null) {
throw new RuntimeException("No login-as-admin init parameter specified for SsoPostLoginServlet."); throw new RuntimeException("No login-as-admin init parameter specified for SsoPostLoginServlet.");
@@ -61,9 +62,8 @@
@Override
protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
log.debug("Entered SsoPostLoginServlet");
- String username;
+ String username = null;
String profile = null;
- String authzName;
InitialContext ctx = null;
try {
String error_description = request.getParameter("error_description");
@@ -90,12 +90,12 @@
Map<String, Object> payload = (Map<String, Object>) jsonResponse.get("ovirt");
username = (String) jsonResponse.get("user_id");
+ profile = "";
int index = username.lastIndexOf("@");
if (index != -1) {
profile = username.substring(index + 1);
username = username.substring(0, index);
}
- authzName = (String) jsonResponse.get("user_authz");
try {
ctx = new InitialContext();
@@ -120,14 +120,12 @@
"Unable to login user %s@%s with profile [%s]" +
" because the maximum number of allowed sessions %s is exceeded",
username,
- authzName,
profile,
maxUserSessions));
}
throw new RuntimeException(String.format(
"The user %s@%s with profile [%s] is not authorized to perform login",
username,
- authzName,
profile));
} else {
HttpSession httpSession = request.getSession(true);
@@ -143,9 +141,7 @@
} catch (RuntimeException ex) {
throw ex;
} catch (Exception ex) {
- throw new RuntimeException(
- String.format("User login failure: %s@%s with profile [%s]", username, authzName, profile),
- ex);
+ throw new RuntimeException(String.format("User login failure: %s", username), ex);
} finally {
try {
if (ctx != null) {
diff -Naru a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/SsoUtils.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/SsoUtils.java diff -Naru a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/SsoUtils.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/SsoUtils.java
--- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/SsoUtils.java 2021-07-20 03:39:24.000000000 +0800 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/SsoUtils.java 2020-11-19 01:15:47.000000000 +0800
+++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/SsoUtils.java 2022-06-06 14:19:02.265717000 +0800 +++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/SsoUtils.java 2022-06-06 10:27:53.774598000 +0800
@@ -33,7 +33,7 @@ @@ -135,7 +135,6 @@
public static String createUserSession(HttpServletRequest req,
Map<String, Object> jsonResponse,
boolean loginAsAdmin) throws Exception {
- String engineSessionId;
+ String engineSessionId = null;
if (!FiltersHelper.isStatusOk(jsonResponse)) {
throw new RuntimeException((String) jsonResponse.get("MESSAGE"));
}
@@ -46,7 +46,6 @@
profile = username.substring(index + 1);
username = username.substring(0, index);
}
- String authzName = (String) jsonResponse.get("user_authz");
try {
ctx = new InitialContext();
ActionReturnValue queryRetVal = FiltersHelper.getBackend(ctx).runAction(ActionType.CreateUserSession,
@@ -70,14 +69,12 @@
"Unable to login user %s@%s with profile [%s] " +
"because the maximum number of allowed sessions %s is exceeded",
username,
- authzName,
profile,
EngineLocalConfig.getInstance().getInteger("ENGINE_MAX_USER_SESSIONS")));
}
throw new RuntimeException(String.format(
"The user %s@%s with profile [%s] is not authorized to perform login",
username,
- authzName,
profile));
}
engineSessionId = queryRetVal.getActionReturnValue();
@@ -90,8 +87,8 @@
true);
}
} catch (Exception ex) {
- log.error("User '{}@{}' with profile [{}] login failed: {}", username, authzName, profile, ex.getMessage());
- log.debug("User '{}@{}' with profile [{}] login failed", username, authzName, profile, ex);
+ log.error("User '{}@{}' login failed: {}", username, profile, ex.getMessage());
+ log.debug("User '{}@{}' login failed", username, profile, ex);
throw ex;
} finally {
try {
@@ -139,7 +136,6 @@
if (StringUtils.isNotBlank(alternateFqdnString)) { if (StringUtils.isNotBlank(alternateFqdnString)) {
Arrays.stream(alternateFqdnString.trim().split("\\s *")) Arrays.stream(alternateFqdnString.trim().split("\\s *"))
.filter(StringUtils::isNotBlank) .filter(StringUtils::isNotBlank)
@ -123,7 +29,7 @@ diff -Naru a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa
.forEach(allowedDomains::add); .forEach(allowedDomains::add);
} }
@@ -148,7 +144,7 @@ @@ -144,7 +143,7 @@
private static String parseHostFromUrl(String url, String urlPropertyName) { private static String parseHostFromUrl(String url, String urlPropertyName) {
try { try {
@ -133,8 +39,8 @@ diff -Naru a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa
throw new IllegalStateException(urlPropertyName + " not a valid URI: " + url); throw new IllegalStateException(urlPropertyName + " not a valid URI: " + url);
} }
diff -Naru a/backend/manager/modules/aaa/src/test/java/org/ovirt/engine/core/aaa/SsoUtilsTest.java b/backend/manager/modules/aaa/src/test/java/org/ovirt/engine/core/aaa/SsoUtilsTest.java diff -Naru a/backend/manager/modules/aaa/src/test/java/org/ovirt/engine/core/aaa/SsoUtilsTest.java b/backend/manager/modules/aaa/src/test/java/org/ovirt/engine/core/aaa/SsoUtilsTest.java
--- a/backend/manager/modules/aaa/src/test/java/org/ovirt/engine/core/aaa/SsoUtilsTest.java 2021-07-20 03:39:24.000000000 +0800 --- a/backend/manager/modules/aaa/src/test/java/org/ovirt/engine/core/aaa/SsoUtilsTest.java 2020-11-19 01:15:47.000000000 +0800
+++ b/backend/manager/modules/aaa/src/test/java/org/ovirt/engine/core/aaa/SsoUtilsTest.java 2022-06-06 14:20:07.028614000 +0800 +++ b/backend/manager/modules/aaa/src/test/java/org/ovirt/engine/core/aaa/SsoUtilsTest.java 2022-06-06 10:26:52.261144000 +0800
@@ -38,23 +38,6 @@ @@ -38,23 +38,6 @@
} }

BIN
ovirt-engine-4.4.7.7.tar.gz → ovirt-engine-4.4.4.1.tar.gz
View File

Binary file not shown.

213
ovirt-engine.spec
View File

@ -1,8 +1,8 @@
%if 0%{?ovirt_build_user_agent:1} #
%global _ovirt_build_user_agent %{ovirt_build_user_agent} # CUSTOMIZATION-BEGIN
%else #
%global _ovirt_build_user_agent gecko1_8 # ovirt_build_extra_flags
%endif # ovirt_build_ut
%if 0%{?ovirt_build_quick} %if 0%{?ovirt_build_quick}
%global _ovirt_build_ut 0 %global _ovirt_build_ut 0
%global ovirt_build_gwt 0 %global ovirt_build_gwt 0
@ -11,13 +11,13 @@
%global _ovirt_build_ut 0 %global _ovirt_build_ut 0
%global ovirt_build_all_user_agents 0 %global ovirt_build_all_user_agents 0
%global ovirt_build_locales 0 %global ovirt_build_locales 0
%global _ovirt_build_extra_flags -D gwt.userAgent=%{_ovirt_build_user_agent} %global _ovirt_build_extra_flags -D gwt.userAgent=gecko1_8
%endif %endif
%if 0%{?ovirt_build_draft} %if 0%{?ovirt_build_draft}
%global _ovirt_build_ut 0 %global _ovirt_build_ut 0
%global ovirt_build_all_user_agents 0 %global ovirt_build_all_user_agents 0
%global ovirt_build_locales 0 %global ovirt_build_locales 0
%global _ovirt_build_extra_flags -D gwt.userAgent=%{_ovirt_build_user_agent} -P gwtdraft %global _ovirt_build_extra_flags -D gwt.userAgent=gecko1_8 -P gwtdraft
%endif %endif
%if 0%{!?ovirt_build_ut:1} %if 0%{!?ovirt_build_ut:1}
%if 0%{?_ovirt_build_ut:1} %if 0%{?_ovirt_build_ut:1}
@ -36,11 +36,24 @@
%global ovirt_build_all_user_agents 1 %global ovirt_build_all_user_agents 1
%endif %endif
%global ovirt_provides_jboss 1 %global ovirt_provides_jboss 1
#
# CUSTOMIZATION-END
#
#raw
# Do not repack .jar files, as it takes a long time and doesn't have a # Do not repack .jar files, as it takes a long time and doesn't have a
# real benefit: # real benefit:
%global __jar_repack 0 %global __jar_repack 0
%if !%{ovirt_provides_jboss}
#
# unsign all provided jars
# see rhbz#1019637
#
%global _jarsign_opts --unsign=/usr/share/ovirt-engine
%endif
# #
# rpm does not support override # rpm does not support override
# nor modify of variables # nor modify of variables
@ -49,6 +62,11 @@
%global EXTRA_BUILD_FLAGS %{?_ovirt_build_extra_flags:%{_ovirt_build_extra_flags}}%{?ovirt_build_extra_flags: %{ovirt_build_extra_flags}} %global EXTRA_BUILD_FLAGS %{?_ovirt_build_extra_flags:%{_ovirt_build_extra_flags}}%{?ovirt_build_extra_flags: %{ovirt_build_extra_flags}}
%endif %endif
#
# Supported distributions:
# Fedora >= 30
# EL >= 7
#
%global ovirt_install_poms 1 %global ovirt_install_poms 1
@ -88,9 +106,6 @@
%global vdsm_uid 36 %global vdsm_uid 36
%global vdsm_user vdsm %global vdsm_user vdsm
# Minimal required OpenJDK version
%global openjdk_version 11.0.11
%global openstack_java_version 3.2.9 %global openstack_java_version 3.2.9
# Macro to create an user: # Macro to create an user:
@ -160,31 +175,37 @@ getent passwd %1 >/dev/null || useradd -r -u %2 -g %3 -c %5 -s /sbin/nologin -d
%global ovirt_dependencies ovirt-dependencies/4.4 %global ovirt_dependencies ovirt-dependencies/4.4
Name: ovirt-engine Name: ovirt-engine
Version: 4.4.7.7 Version: 4.4.4.1
Release: 4 Release: 5
Summary: Management server for Open Virtualization Summary: Management server for Open Virtualization
Group: %{ovirt_product_group} Group: %{ovirt_product_group}
License: Apache 2.0 License: Apache 2.0
URL: http://www.ovirt.org URL: http://www.ovirt.org
Source0: http://resources.ovirt.org/pub/ovirt-master-snapshot/src/ovirt-engine/ovirt-engine-4.4.7.7.tar.gz Source0: http://resources.ovirt.org/pub/ovirt-master-snapshot/src/ovirt-engine/ovirt-engine-4.4.4.1.tar.gz
Source1: rxjava-2.2.4.jar Source1: xalan-2.7.1.jbossorg-2.jar
Source2: xalan-2.7.1.jbossorg-2.jar
# wget https://repo1.maven.org/maven2/com/github/warmuuh/libsass-maven-plugin/0.2.8-libsass_3.4.4/libsass-maven-plugin-0.2.8-libsass_3.4.4.pom # wget https://repo1.maven.org/maven2/com/github/warmuuh/libsass-maven-plugin/0.2.8-libsass_3.4.4/libsass-maven-plugin-0.2.8-libsass_3.4.4.pom
# version=`grep jsass libsass-maven-plugin-0.2.8-libsass_3.4.4.pom` -A 1| grep "version"|awk -F ">" '{print $2}' | awk -F "<" '{print $1}'` # version=`grep jsass libsass-maven-plugin-0.2.8-libsass_3.4.4.pom` -A 1| grep "version"|awk -F ">" '{print $2}' | awk -F "<" '{print $1}'`
# sed -i "s/$version/5.10.3/g" libsass-maven-plugin-0.2.8-libsass_3.4.4.pom # sed -i "s/$version/5.10.3/g" libsass-maven-plugin-0.2.8-libsass_3.4.4.pom
Source3: libsass-maven-plugin-0.2.8-libsass_3.4.4.pom Source2: libsass-maven-plugin-0.2.8-libsass_3.4.4.pom
Source3: https://github.com/oVirt/ovirt-engine-api-model/archive/refs/tags/4.4.20.tar.gz
Source4: 0006-add-arm-biostype-in-front-end-api.patch
Patch1: 0001-add-dependent-package-to-lib.patch Patch1: 0001-add-dependent-package-to-lib.patch
Patch2: CVE-2020-10775.patch Patch2: 0002-add-support-running-on-kunpeng-platform.patch
Patch3: 0003-add-virt-chipset-support.patch
Patch4: 0004-fit-cluster-can-not-find-error-under-aarch64-platform.patch
Patch5: 0005-fix-interface-report-an-error-when-emulatedMachine-is-null.patch
Patch6: 0007-add-config-item-for-openeuler.patch
Patch7: CVE-2020-10775.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: assertj-core >= 2.2.0 BuildRequires: assertj-core >= 2.2.0
BuildRequires: maven >= 3.5.0 BuildRequires: maven >= 3.5.0
BuildRequires: maven-enforcer-plugin BuildRequires: maven-enforcer-plugin
BuildRequires: java-11-openjdk-devel >= %{openjdk_version} BuildRequires: java-11-openjdk-devel >= 11.0.4
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: make BuildRequires: make
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-distro
BuildRequires: systemd BuildRequires: systemd
BuildRequires: unzip BuildRequires: unzip
BuildRequires: ovirt-jboss-modules-maven-plugin >= 2.0.1 BuildRequires: ovirt-jboss-modules-maven-plugin >= 2.0.1
@ -192,7 +213,10 @@ BuildRequires: javapackages-local
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires: ovirt-engine-wildfly-overlay >= 23 Requires: ovirt-engine-wildfly-overlay = 19.1.0
Requires: ansible
Requires: sudo >= 1.9.2
Requires: %{name}-backend = %{version}-%{release} Requires: %{name}-backend = %{version}-%{release}
Requires: %{name}-dbscripts = %{version}-%{release} Requires: %{name}-dbscripts = %{version}-%{release}
Requires: %{name}-restapi = %{version}-%{release} Requires: %{name}-restapi = %{version}-%{release}
@ -201,12 +225,11 @@ Requires: %{name}-webadmin-portal = %{version}-%{release}
Requires: %{name}-websocket-proxy >= %{version}-%{release} Requires: %{name}-websocket-proxy >= %{version}-%{release}
Requires: %{name}-vmconsole-proxy-helper >= %{version}-%{release} Requires: %{name}-vmconsole-proxy-helper >= %{version}-%{release}
Requires: %{name}-ui-extensions >= 1.0.4 Requires: %{name}-ui-extensions >= 1.0.4
Requires: ansible >= 2.9.21, ansible < 2.10.0
Requires: ansible-runner-service >= 1.0.6 Requires: ansible-runner-service >= 1.0.6
Requires: apache-commons-compress Requires: apache-commons-compress
Requires: apache-commons-configuration Requires: apache-commons-configuration
Requires: apache-commons-jxpath Requires: apache-commons-jxpath
Requires: java-11-openjdk-headless >= %{openjdk_version} Requires: java-11-openjdk-headless >= 11.0.4
Requires: javapackages-tools Requires: javapackages-tools
Requires: ovirt-imageio-daemon >= 2.0.10-1 Requires: ovirt-imageio-daemon >= 2.0.10-1
Requires: python3-mod_wsgi >= 4.6.4 Requires: python3-mod_wsgi >= 4.6.4
@ -218,12 +241,18 @@ Requires: ovirt-web-ui
Requires: ovirt-cockpit-sso Requires: ovirt-cockpit-sso
Obsoletes: ovirt-engine-api-explorer Obsoletes: ovirt-engine-api-explorer
# This is required for OpenJDK keytool to work properly, when engine machine
# is running in FIPS mode. More info at https://bugzilla.redhat.com/1894083
Requires: nss
# Metrics stuff # Metrics stuff
Requires: collectd Requires: collectd
Requires: collectd-postgresql Requires: collectd-postgresql
Requires: collectd-disk Requires: collectd-disk
Requires: collectd-write_http Requires: collectd-write_http
Requires: collectd-write_syslog Requires: collectd-write_syslog
# Requirements for ovirt-engine-metrics # Requirements for ovirt-engine-metrics
Requires: rsyslog Requires: rsyslog
Requires: rsyslog-elasticsearch Requires: rsyslog-elasticsearch
@ -235,8 +264,8 @@ Requires: libestr
Requires: postgresql-jdbc >= 42.2.3 Requires: postgresql-jdbc >= 42.2.3
Requires: postgresql-server >= 12.0 Requires: postgresql-server
Requires: postgresql-contrib >= 12.0 Requires: postgresql-contrib
Requires: openstack-java-cinder-client >= %{openstack_java_version} Requires: openstack-java-cinder-client >= %{openstack_java_version}
Requires: openstack-java-cinder-model >= %{openstack_java_version} Requires: openstack-java-cinder-model >= %{openstack_java_version}
@ -249,8 +278,7 @@ Requires: openstack-java-quantum-client >= %{openstack_java_version}
Requires: openstack-java-quantum-model >= %{openstack_java_version} Requires: openstack-java-quantum-model >= %{openstack_java_version}
Requires: openstack-java-resteasy-connector >= %{openstack_java_version} Requires: openstack-java-resteasy-connector >= %{openstack_java_version}
Requires: python3-dnf-plugin-versionlock Requires: python3-dnf-plugin-versionlock
Requires: apache-sshd >= 2.6.0 Requires: apache-sshd >= 2.5.0
Requires: ed25519-java >= 0.3.0
Requires: slf4j-jdk14 >= 1.7.0 Requires: slf4j-jdk14 >= 1.7.0
Requires: jcl-over-slf4j >= 1.7.0 Requires: jcl-over-slf4j >= 1.7.0
Requires: snmp4j >= 2.4.1 Requires: snmp4j >= 2.4.1
@ -288,6 +316,7 @@ Provides: bundled(js-patternfly-next) = 2.26.1
system that provides advanced capabilities for managing the Open system that provides advanced capabilities for managing the Open
virtualization infrastructure for Servers and Desktops. virtualization infrastructure for Servers and Desktops.
%if !%{ovirt_provides_jboss}
%package -n rhvm %package -n rhvm
Summary: Red Hat Virtualization Manager Summary: Red Hat Virtualization Manager
Group: %{ovirt_product_group} Group: %{ovirt_product_group}
@ -302,11 +331,12 @@ Requires: spice-client-win-x86 >= %{spice_version}
Red Hat Virtualization is a feature-rich server virtualization management Red Hat Virtualization is a feature-rich server virtualization management
system that provides advanced capabilities for managing Red Hat system that provides advanced capabilities for managing Red Hat
virtualization infrastructure for Servers and Desktops. virtualization infrastructure for Servers and Desktops.
%endif
%package -n python%{python3_pkgversion}-%{name}-lib %package -n python%{python3_pkgversion}-%{name}-lib
Summary: %{ovirt_product_name_short} library Summary: %{ovirt_product_name_short} library
Group: %{ovirt_product_group} Group: %{ovirt_product_group}
Requires: python3-cryptography Requires: python3-m2crypto >= 0.28
Requires: python3-dateutil Requires: python3-dateutil
Requires: python3-daemon >= 2.1.2 Requires: python3-daemon >= 2.1.2
@ -318,20 +348,21 @@ Requires: python3-daemon >= 2.1.2
%package backend %package backend
Summary: Engine core of %{ovirt_product_name_short} Summary: Engine core of %{ovirt_product_name_short}
Group: %{ovirt_product_group} Group: %{ovirt_product_group}
License: Apache 2.0 and LGPLv3 and GPLv3 License: ASL 2.0 and LGPLv3 and GPLv3
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name}-extensions-api >= 1.0.0 Requires: %{name}-extensions-api >= 1.0.0
Requires: aopalliance >= 1.0 Requires: aopalliance >= 1.0
Requires: curl Requires: curl
Requires: httpd Requires: httpd
Requires: java-11-openjdk-headless >= %{openjdk_version} Requires: java-11-openjdk-headless
Requires: logrotate Requires: logrotate
Requires: mailcap Requires: mailcap
Requires: mod_ssl Requires: mod_ssl
Requires: novnc >= 1.0.0 Requires: novnc >= 1.0.0
Requires: python3-%{name}-lib >= %{version}-%{release} Requires: python3-%{name}-lib >= %{version}-%{release}
Requires: openssh Requires: openssh >= 8.2p1
Requires: vdsm-jsonrpc-java >= 1.6.0, vdsm-jsonrpc-java < 1.7.0 Requires: vdsm-jsonrpc-java >= 1.5.4
Conflicts: vdsm-jsonrpm-java >= 1.6
Requires: java-client-kubevirt >= 0.5.0 Requires: java-client-kubevirt >= 0.5.0
Requires: openssl Requires: openssl
Requires: ovirt-engine-extension-aaa-jdbc >= 1.2.0 Requires: ovirt-engine-extension-aaa-jdbc >= 1.2.0
@ -376,7 +407,6 @@ Requires: python3-libxml2
Requires: logrotate Requires: logrotate
Requires: python3-otopi >= 1.9.0 Requires: python3-otopi >= 1.9.0
Requires: python3-paramiko Requires: python3-paramiko
Requires: python3-distro
Requires(pre): shadow-utils Requires(pre): shadow-utils
Conflicts: %{name}-dwh < 4.4.0 Conflicts: %{name}-dwh < 4.4.0
Conflicts: %{name}-dwh-setup < 4.4.0 Conflicts: %{name}-dwh-setup < 4.4.0
@ -419,9 +449,9 @@ Requires: %{name}-setup-plugin-cinderlib = %{version}-%{release}
Requires: %{name}-setup-plugin-imageio = %{version}-%{release} Requires: %{name}-setup-plugin-imageio = %{version}-%{release}
Requires: %{name}-dwh-setup >= 4.4.1.2 Requires: %{name}-dwh-setup >= 4.4.1.2
Requires: ovirt-engine-extension-aaa-jdbc >= 1.2.0 Requires: ovirt-engine-extension-aaa-jdbc >= 1.2.0
Requires: openssh Requires: openssh >= 8.2p1
Requires: postgresql-server >= 12.0 Requires: postgresql-server
Requires: postgresql-contrib >= 12.0 Requires: postgresql-contrib
Conflicts: %{name} < 4.4.0 Conflicts: %{name} < 4.4.0
# See rhbz# 1676461 # See rhbz# 1676461
Requires: ovirt-vmconsole >= 1.0.7 Requires: ovirt-vmconsole >= 1.0.7
@ -445,9 +475,9 @@ Requires: python3-libselinux
Requires: policycoreutils-python-utils Requires: policycoreutils-python-utils
Requires: python3-psycopg2 Requires: python3-psycopg2
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires: java-11-openjdk-headless >= %{openjdk_version} Requires: java-11-openjdk-headless >= 11.0.4
Requires: python3-pwquality Requires: python3-pwquality
Requires: python3-cryptography Requires: python3-m2crypto >= 0.28
Requires: python3-dnf Requires: python3-dnf
# We can drop these conflicts when # We can drop these conflicts when
@ -469,12 +499,13 @@ Requires: %{name} = %{version}-%{release}
%description dbscripts %description dbscripts
Database scripts for %{ovirt_product_name_short} Database scripts for %{ovirt_product_name_short}
%package webadmin-portal %package webadmin-portal
Summary: Web Admin Portal of %{ovirt_product_name_short} Summary: Web Admin Portal of %{ovirt_product_name_short}
Group: %{ovirt_product_group} Group: %{ovirt_product_group}
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
# Bundled JavaScript and CSS libraries use MIT license. # Bundled JavaScript and CSS libraries use MIT license.
License: Apache 2.0 and GPLv2+ with exceptions and MIT License: ASL 2.0 and GPLv2+ with exceptions and MIT
%description webadmin-portal %description webadmin-portal
The web administration interface to %{ovirt_product_name_short} The web administration interface to %{ovirt_product_name_short}
@ -486,7 +517,7 @@ Requires: %{name} = %{version}-%{release}
Requires: python3-%{name}-lib >= %{version}-%{release} Requires: python3-%{name}-lib >= %{version}-%{release}
Requires: %{name}-tools-backup = %{version}-%{release} Requires: %{name}-tools-backup = %{version}-%{release}
Requires: ovirt-engine-metrics >= 1.3.4.1 Requires: ovirt-engine-metrics >= 1.3.4.1
Requires: java-11-openjdk-headless >= %{openjdk_version} Requires: java-11-openjdk-headless
Requires: logrotate Requires: logrotate
Requires: python3-dateutil Requires: python3-dateutil
Requires: python3-netaddr Requires: python3-netaddr
@ -523,7 +554,7 @@ Requires: tar
Requires: bzip2 Requires: bzip2
Requires: xz Requires: xz
Requires: python3-otopi >= 1.9.0 Requires: python3-otopi >= 1.9.0
Requires: postgresql >= 12.0 Requires: postgresql
Requires: sqlite Requires: sqlite
%description tools-backup %description tools-backup
@ -581,7 +612,7 @@ with ovirt-vmconsole-proxy package
Summary: Setup and upgrade specific plugins for vmconsole-proxy-helper Summary: Setup and upgrade specific plugins for vmconsole-proxy-helper
Requires: %{name}-setup-plugin-ovirt-engine = %{version}-%{release} Requires: %{name}-setup-plugin-ovirt-engine = %{version}-%{release}
Requires: %{name}-setup-plugin-ovirt-engine-common = %{version}-%{release} Requires: %{name}-setup-plugin-ovirt-engine-common = %{version}-%{release}
Requires: openssh Requires: openssh >= 8.2p1
%description setup-plugin-vmconsole-proxy-helper %description setup-plugin-vmconsole-proxy-helper
Setup and upgrade specific plugins for vmconsole-proxy-helper Setup and upgrade specific plugins for vmconsole-proxy-helper
@ -591,7 +622,6 @@ Summary: %{ovirt_product_name_short} health check bundler.
Group: %{ovirt_product_group} Group: %{ovirt_product_group}
Requires: %{name}-setup-base = %{version}-%{release} Requires: %{name}-setup-base = %{version}-%{release}
Requires: makeself >= 2.2 Requires: makeself >= 2.2
Requires: python3-otopi-devtools >= 1.9.0
%description health-check-bundler %description health-check-bundler
A utility for creating a bundle script that runs a health check. A utility for creating a bundle script that runs a health check.
@ -600,7 +630,7 @@ A utility for creating a bundle script that runs a health check.
Summary: Setup and upgrade specific plugins for cinderlib integration database Summary: Setup and upgrade specific plugins for cinderlib integration database
Requires: %{name}-setup-plugin-ovirt-engine = %{version}-%{release} Requires: %{name}-setup-plugin-ovirt-engine = %{version}-%{release}
Requires: %{name}-setup-plugin-ovirt-engine-common = %{version}-%{release} Requires: %{name}-setup-plugin-ovirt-engine-common = %{version}-%{release}
Requires: openssh Requires: openssh >= 8.2p1
%description setup-plugin-cinderlib %description setup-plugin-cinderlib
Setup and upgrade specific plugins for cinderlib integration database Setup and upgrade specific plugins for cinderlib integration database
@ -619,29 +649,52 @@ Setup imageio service.
%setup -c -q %setup -c -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
mvn install:install-file -DgroupId=io.reactive.rxjava2 -DartifactId=rxjava -Dversion=2.2.4 -Dpackaging=jar -Dfile=%{SOURCE1} %patch3 -p1
mvn install:install-file -DgroupId=xalan -DartifactId=xalan -Dversion=2.7.1.jbossorg-2 -Dpackaging=jar -Dfile=%{SOURCE2} %patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
sed -i '87s/@Test/\/\/@Test/g' backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilderTest.java
sed -i '88s/@MockedConfig/\/\/@MockedConfig/g' backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilderTest.java
sed -i '121s/@Test/\/\/@Test/g' backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddClusterCommandTest.java
sed -i '122s/@MockedConfig/\/\/@MockedConfig/g' backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddClusterCommandTest.java
sed -i '209s/@Test/\/\/@Test/g' backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateClusterCommandTest.java
sed -i '99s/@Test/\/\/@Test/g' backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/ClusterValidatorTest.java
sed -i '91s/@Test/\/\/@Test/g' backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/ClusterValidatorTest.java
pushd /usr/lib/jvm
dir=`ls | grep java-11-openjdk-`
export JAVA_HOME="/usr/lib/jvm/${dir}"
popd
mkdir api-model
cp %{SOURCE3} ./api-model
pushd api-model
tar -xvf 4.4.20.tar.gz
mkdir -p ~/.gem/jruby/1.9
cd ovirt-engine-api-model-4.4.20
sed -i '/PPC64,/a\ AARCH64,' src/main/java/types/Architecture.java
cp %{SOURCE4} ./
patch -p1 < 0006-add-arm-biostype-in-front-end-api.patch
mvn clean install -DskipTests
popd
mvn install:install-file -DgroupId=xalan -DartifactId=xalan -Dversion=2.7.1.jbossorg-2 -Dpackaging=jar -Dfile=%{SOURCE1}
mkdir -p ~/.m2/repository/com/github/warmuuh/libsass-maven-plugin/0.2.8-libsass_3.4.4 mkdir -p ~/.m2/repository/com/github/warmuuh/libsass-maven-plugin/0.2.8-libsass_3.4.4
cp %{SOURCE3} ~/.m2/repository/com/github/warmuuh/libsass-maven-plugin/0.2.8-libsass_3.4.4 cp %{SOURCE2} ~/.m2/repository/com/github/warmuuh/libsass-maven-plugin/0.2.8-libsass_3.4.4
sed -i 's/require=\"10240\";/require=\"1024\";/g' Makefile sed -i 's/require=\"10240\";/require=\"1024\";/g' Makefile
sed -i 's/MAVEN_OPTS=\"/MAVEN_OPTS=\"-Xmx16384m -Xms16384m /g' Makefile sed -i 's/MAVEN_OPTS=\"/MAVEN_OPTS=\"-Xmx16384m -Xms16384m /g' Makefile
sed -i 's/$(BUILD_FLAGS) \\/-Dgwt.compiler.localWorkers=2 $(BUILD_FLAGS) \\/g' Makefile sed -i 's/$(BUILD_FLAGS) \\/-Dgwt.compiler.localWorkers=2 $(BUILD_FLAGS) \\/g' Makefile
sed -i '/s validity is {validity_in_days} days./d' packaging/setup/ovirt_engine_setup/engine_common/pki_utils.py sed -i 's/BUILD_ALL_USER_AGENTS=0/BUILD_ALL_USER_AGENTS=1/g' Makefile
sed -i "s/'fedora'/'fedora', 'openeuler'/g" packaging/setup/ovirt_engine_setup/util.py sed -i "s/import platform/import distro/g" packaging/setup/ovirt_engine_setup/engine_common/postgres.py
sed -i "s/platform.linux_distribution/distro.linux_distribution/g" packaging/setup/ovirt_engine_setup/engine_common/postgres.py
cat <<EOT >> 10-wsgi-python3.conf sed -i "s/'centos'/'centos', 'openeuler'/g" packaging/setup/ovirt_engine_setup/engine_common/postgres.py
<IfModule !wsgi_module> sed -i "s/BUILD_LOCALES=0/BUILD_LOCALES=1/g" automation/build-artifacts.sh
LoadModule wsgi_module modules/mod_wsgi_python3.so sed -i "s/BUILD_LOCALES=0/BUILD_LOCALES=1/g" Makefile
</IfModule> sed -i '/slf4j/a\ <module name="com.fasterxml.jackson.core.jackson-databind"/>' backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
EOT
cat <<EOT >> gg-sso.conf
SSO_CALLBACK_PREFIX_CHECK=false
EOT
%build %build
# Set the location of the JDK that will be used for compilation: pushd /usr/lib/jvm
pushd /usr/lib/jvm/
dir=`ls | grep java-11-openjdk-` dir=`ls | grep java-11-openjdk-`
export JAVA_HOME="/usr/lib/jvm/${dir}" export JAVA_HOME="/usr/lib/jvm/${dir}"
popd popd
@ -806,13 +859,10 @@ common/com/woorea/openstack/sdk/main/openstack-client.jar openstack-java-sdk/ope
common/com/woorea/openstack/sdk/main/quantum-client.jar openstack-java-sdk/quantum-client.jar common/com/woorea/openstack/sdk/main/quantum-client.jar openstack-java-sdk/quantum-client.jar
common/com/woorea/openstack/sdk/main/quantum-model.jar openstack-java-sdk/quantum-model.jar common/com/woorea/openstack/sdk/main/quantum-model.jar openstack-java-sdk/quantum-model.jar
common/com/woorea/openstack/sdk/main/resteasy-connector.jar openstack-java-sdk/resteasy-connector.jar common/com/woorea/openstack/sdk/main/resteasy-connector.jar openstack-java-sdk/resteasy-connector.jar
common/net/i2p/crypto/eddsa/main/eddsa.jar
common/org/aopalliance/main/aopalliance.jar common/org/aopalliance/main/aopalliance.jar
common/org/apache/commons/compress/main/commons-compress.jar common/org/apache/commons/compress/main/commons-compress.jar
common/org/apache/commons/configuration/main/commons-configuration.jar common/org/apache/commons/configuration/main/commons-configuration.jar
common/org/apache/commons/jxpath/main/commons-jxpath.jar common/org/apache/commons/jxpath/main/commons-jxpath.jar
common/org/apache/sshd/main/sshd-core.jar apache-sshd/sshd-core.jar
common/org/apache/sshd/main/sshd-common.jar apache-sshd/sshd-common.jar
common/org/apache/ws/commons/main/ws-commons-util.jar common/org/apache/ws/commons/main/ws-commons-util.jar
common/org/apache/xmlrpc/main/xmlrpc-client.jar common/org/apache/xmlrpc/main/xmlrpc-client.jar
common/org/apache/xmlrpc/main/xmlrpc-common.jar common/org/apache/xmlrpc/main/xmlrpc-common.jar
@ -893,13 +943,13 @@ perl -i -pe 's/^SHA1-Digest: [^\n]+\n//g' "%{buildroot}%{engine_ear}/META-INF/MA
%endif %endif
install -dm 755 "%{buildroot}%{_sysconfdir}/httpd/conf.modules.d"
cp 10-wsgi-python3.conf %{buildroot}%{_sysconfdir}/httpd/conf.modules.d
cp gg-sso.conf %{buildroot}%{engine_etc}/engine.conf.d/
install -dm 755 "%{buildroot}%{engine_data}/modules/common/org/apache/sshd/main" install -dm 755 "%{buildroot}%{engine_data}/modules/common/org/apache/sshd/main"
cp backend/target/lib/sshd-core-2.6.0.jar %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main cp backend/target/lib/sshd-core-2.5.0.jar %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main
sed -i '/sshd-core.jar/a\ <resource-root path="sshd-core-2.6.0.jar"/>' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml cp backend/target/lib/sshd-common-2.5.0.jar %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main
rm -rf %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/sshd-core.jar
rm -rf %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/sshd-common.jar
sed -i 's/sshd-common.jar/sshd-common-2.5.0.jar/g' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml
sed -i 's/sshd-core.jar/sshd-core-2.5.0.jar/g' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml
install -dm 755 "%{buildroot}%{_datadir}/java/ebay-cors-filter" install -dm 755 "%{buildroot}%{_datadir}/java/ebay-cors-filter"
cp backend/manager/modules/utils/target/lib/cors-filter-1.0.1.jar %{buildroot}%{_datadir}/java/ebay-cors-filter/cors-filter.jar cp backend/manager/modules/utils/target/lib/cors-filter-1.0.1.jar %{buildroot}%{_datadir}/java/ebay-cors-filter/cors-filter.jar
@ -1087,7 +1137,7 @@ fi
%files setup %files setup
%license LICENSE %license LICENSE
%dir %{engine_rpm_state_dir} %dir %{engine_rpm_state_dir}
%config %{_sysconfdir}/httpd/conf.modules.d/10-wsgi-python3.conf
%files setup-plugin-ovirt-engine %files setup-plugin-ovirt-engine
%license LICENSE %license LICENSE
@ -1194,7 +1244,6 @@ fi
%{engine_data}/ansible-runner-service-project/project/ovirt-host-deploy.yml %{engine_data}/ansible-runner-service-project/project/ovirt-host-deploy.yml
%{engine_data}/ansible-runner-service-project/project/replace-gluster.yml %{engine_data}/ansible-runner-service-project/project/replace-gluster.yml
%{engine_data}/ansible-runner-service-project/project/ovirt-host-enroll-certificate.yml %{engine_data}/ansible-runner-service-project/project/ovirt-host-enroll-certificate.yml
%{engine_data}/ansible-runner-service-project/project/ovirt-host-fix-encrypted-migrations.yml
%{engine_data}/ansible-runner-service-project/project/ovirt-host-remove.yml %{engine_data}/ansible-runner-service-project/project/ovirt-host-remove.yml
%{engine_data}/ansible-runner-service-project/project/ovirt-host-upgrade.yml %{engine_data}/ansible-runner-service-project/project/ovirt-host-upgrade.yml
%{engine_data}/ansible-runner-service-project/project/ovirt-host-check-upgrade.yml %{engine_data}/ansible-runner-service-project/project/ovirt-host-check-upgrade.yml
@ -1202,7 +1251,6 @@ fi
%{engine_data}/ansible-runner-service-project/project/ovirt-host-remove-yum-conf.yml %{engine_data}/ansible-runner-service-project/project/ovirt-host-remove-yum-conf.yml
%{engine_data}/ansible-runner-service-project/project/ovirt-host-yum-conf.yml %{engine_data}/ansible-runner-service-project/project/ovirt-host-yum-conf.yml
%{engine_data}/ansible-runner-service-project/project/ovirt-ova-export.yml %{engine_data}/ansible-runner-service-project/project/ovirt-ova-export.yml
%{engine_data}/ansible-runner-service-project/project/ovirt-ova-external-data.yml
%{engine_data}/ansible-runner-service-project/project/ovirt-ova-import.yml %{engine_data}/ansible-runner-service-project/project/ovirt-ova-import.yml
%{engine_data}/ansible-runner-service-project/project/ovirt-ova-query.yml %{engine_data}/ansible-runner-service-project/project/ovirt-ova-query.yml
%{engine_data}/ansible-runner-service-project/project/ovirt-image-measure.yml %{engine_data}/ansible-runner-service-project/project/ovirt-image-measure.yml
@ -1255,14 +1303,17 @@ fi
%{engine_data}/setup/bin/ovirt-engine-health %{engine_data}/setup/bin/ovirt-engine-health
%changelog %changelog
* Fri May 27 2022 yanghuan <huan.yang@epro.com.cn> - 4.4.7.7-4 * Fri May 27 2022 yanghuan <huan.yang@epro.com.cn> - 4.4.4.1-5
- Fix CVE-2020-10775 - Fix CVE-2020-10775
* Wed Sep 15 2021 Ge Wang <wangge20@huawei.com> - 4.4.7.7-3 * Wed May 18 2022 jiangxinyu <jiangxinyu@kylinos.cn> - 4.4.4.1-4
- Fix aarch64 setup error - Change requires from postgresql-13-contrib postgresql-13-server and ansible-2.9 to postgresql-contrib postgresql-server and ansible
* Tue Sep 14 2021 Ge Wang <wangge20@huawei.com> - 4.4.7.7-2 * Tue Nov 16 2021 Ge Wang <wangge20@huawei.com> - 4.4.4.1-3
- Fix access denied and setup error due to sshd-core version mismatch and distribution nonrecognition - Modify install require version and add confit item for openeuler
* Mon Jul 19 2021 Python_Bot <Python_Bot@openeuler.org> - 4.4.7.7-1 * Wed Oct 13 2021 Ge Wang <wangge20@huawei.com> - 4.4.4.1-2
- Init package - Fix interface report error when emulatedMachine is null
* Thu Sep 23 2021 Python_Bot <Python_Bot@openeuler.org> - 4.4.4.1-1
- Initial package

BIN
rxjava-2.2.4.jar
View File

Binary file not shown.