utils: add UuidUtils.nameUUIDFromBytes #11136
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #11136 +/- ##
=========================================
Coverage 16.57% 16.57%
+ Complexity 13971 13970 -1
=========================================
Files 5743 5743
Lines 510648 510651 +3
Branches 62105 62105
=========================================
+ Hits 84641 84644 +3
- Misses 416534 416535 +1
+ Partials 9473 9472 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
@blueorangutan package |
|
@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 14039 |
|
@blueorangutan test |
|
@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
|
[SF] Trillian test result (tid-13685)
|
|
@weizhouapache , 👍 but if I read this correctly it doesn’t change anything (yet), does it? I am all for proxying liberaries and even standard packages, but what are the plans for implementation? |
@DaanHoogland We will implement the method with SHA-256 instead. However, we need to make sure that there is no regression, especially for the environment upgraded from older versions, because the method will return a different value. |
sureshanaparti
requested review from
DaanHoogland,
Copilot and
shwstppr
and removed request for
DaanHoogland
There was a problem hiding this comment.
Pull Request Overview
Centralize name-based UUID generation by introducing a utility wrapper and update existing calls.
- Add
UuidUtils.nameUUIDFromBytesto abstract direct calls toUUID.nameUUIDFromBytes. - Replace all inline
UUID.nameUUIDFromBytes(...)invocations across multiple modules withUuidUtils.nameUUIDFromBytes(...). - Update imports and references in utility, hypervisor, storage, agent, and test code.
Reviewed Changes
Copilot reviewed 36 out of 36 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| utils/src/main/java/com/cloud/utils/UuidUtils.java | Add wrapper method nameUUIDFromBytes for MD5‐based UUID creation |
| vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java | Use UuidUtils instead of UUID for secondary datastore UUID |
| utils/src/main/java/com/cloud/utils/UuidUtils.java | Remove unused imports and wrap UUID.nameUUIDFromBytes |
| services/secondary-storage/.../DownloadManagerImpl.java | Replace direct UUID.nameUUIDFromBytes with UuidUtils |
| services/secondary-storage/.../NfsSecondaryStorageResource.java | Replace direct UUID.nameUUIDFromBytes with UuidUtils |
| server/src/main/java/com/cloud/user/AccountManagerImpl.java | Refactor registration token generation to use UuidUtils |
| server/src/test/java/com/cloud/test/DatabaseConfig.java | Use UuidUtils for storage pool UUID generation |
| server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java | Swap direct UUID calls with UuidUtils in cluster GUID logic |
| server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java | Replace direct UUID for zone token with UuidUtils |
| plugins/.../CloudStackPrimaryDataStoreLifeCycleImpl.java | Update primary data store lifecycle to use UuidUtils |
| plugins/hypervisors/xenserver/.../Xenserver625StorageProcessor.java and its test | Refactor SR UUID generation in code and tests to UuidUtils |
| plugins/hypervisors/xenserver/.../CitrixResourceBase.java | Replace multiple UUID.nameUUIDFromBytes calls with UuidUtils |
| plugins/hypervisors/vmware/.../VmwareStorageProcessor.java | Switch to UuidUtils for various NFS and template UUIDs |
| plugins/hypervisors/vmware/.../VmwareResource.java | Use UuidUtils for datastore and template UUID derivation |
| plugins/hypervisors/vmware/.../VmwareServerDiscoverer.java | Replace cluster GUID creation to use UuidUtils |
| plugins/hypervisors/simulator/.../MockStorageManagerImpl.java | Refactor mount path hashing to UuidUtils |
| plugins/hypervisors/ovm3/.../XenTest.java and Ovm3 resources/discoverer/object classes | Update test and resource code to UuidUtils for VM/SR UUIDs |
| plugins/hypervisors/ovm/.../OvmResourceBase.java and OvmDiscoverer.java | Substitute UUID calls with UuidUtils for VM and host GUIDs |
| plugins/hypervisors/kvm/.../KVMStoragePoolManager.java and LibvirtComputingResource.java | Use UuidUtils for storage pool and secret UUID generation |
| plugins/hypervisors/hyperv/.../HypervServerDiscoverer.java | Replace direct UUID calls with UuidUtils for Hyper‐V GUIDs |
| plugins/hypervisors/baremetal/.../BareMetalDiscoverer.java | Switch to UuidUtils for IPMI GUID generation |
| plugins/event-bus/rabbitmq/.../RabbitMQEventBus.java | Use UuidUtils instead of UUID for queue naming |
| engine/storage/integration-test/.../VolumeTestVmware.java, VolumeServiceTest.java, SnapshotTest.java | Refactor tests to reference UuidUtils instead of UUID |
| engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java | Replace inline UUID with UuidUtils for template VO naming |
| core/src/main/java/com/cloud/agent/api/{Modify,Delete}StoragePoolCommand.java | Update storage pool commands to use UuidUtils |
| agent/src/main/java/com/cloud/agent/resource/DummyResource.java | Swap UUID.nameUUIDFromBytes for UuidUtils in dummy resource |
Comments suppressed due to low confidence (3)
utils/src/main/java/com/cloud/utils/UuidUtils.java:27
- Add Javadoc to nameUUIDFromBytes explaining that this method currently uses an MD5-based UUID generation and note any future plans for migrating to a stronger hash.
public class UuidUtils {
utils/src/main/java/com/cloud/utils/UuidUtils.java:27
- Add a private constructor to UuidUtils to prevent instantiation of this utility class.
public class UuidUtils {
utils/src/main/java/com/cloud/utils/UuidUtils.java:27
- Introduce unit tests for UuidUtils.nameUUIDFromBytes to ensure correct fallback behavior and catch future regressions when the implementation changes.
public class UuidUtils {
Description
The method
UUID.nameUUIDFromBytesuses MD5 (Message Digest Algorithm 5) which is considered cryptographically broken and deprecated for most security-related purposes.This PR adds UuidUtils.nameUUIDFromBytes to replace UUID.nameUUIDFromBytes.
In the next releases we could implement the method using SHA-256 or so.
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
How did you try to break this feature and the system with this change?