Skip to content

Commit 0d4d479

Browse files
weizhouapacheweizhouapache
committed
Update md5sum to sha512sum
1 parent be22bfe commit 0d4d479

File tree

14 files changed

+58
-41
lines changed

14 files changed

+58
-41
lines changed

‎debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ override_dh_auto_install:
8585
cp client/target/lib/*jar $(DESTDIR)/usr/share/$(PACKAGE)-management/lib/
8686
cp -r engine/schema/dist/systemvm-templates/* $(DESTDIR)/usr/share/$(PACKAGE)-management/templates/systemvm/
8787
cp -r plugins/integrations/kubernetes-service/src/main/resources/conf/* $(DESTDIR)/usr/share/$(PACKAGE)-management/cks/conf/
88-
rm -rf $(DESTDIR)/usr/share/$(PACKAGE)-management/templates/systemvm/md5sum.txt
88+
rm -rf $(DESTDIR)/usr/share/$(PACKAGE)-management/templates/systemvm/sha512sum.txt
8989

9090
# Bundle cmk in cloudstack-management
9191
wget https://github.com/apache/cloudstack-cloudmonkey/releases/download/$(CMK_REL)/cmk.linux.x86-64 -O $(DESTDIR)/usr/bin/cmk

‎engine/schema/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
templateList.add("systemvmtemplate-${csVersion}.${patch}-x86_64-xen")
107107
templateList.add("systemvmtemplate-${csVersion}.${patch}-x86_64-ovm")
108108
templateList.add("systemvmtemplate-${csVersion}.${patch}-x86_64-hyperv")
109-
File file = new File("./engine/schema/dist/systemvm-templates/md5sum.txt")
109+
File file = new File("./engine/schema/dist/systemvm-templates/sha512sum.txt")
110110
def lines = file.readLines()
111111
for (template in templateList) {
112112
def data = lines.findAll { it.contains(template) }
@@ -135,7 +135,7 @@
135135
<goal>wget</goal>
136136
</goals>
137137
<configuration>
138-
<url>${project.systemvm.template.location}/${cs.version}/md5sum.txt</url>
138+
<url>${project.systemvm.template.location}/${cs.version}/sha512sum.txt</url>
139139
<outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory>
140140
<skipCache>true</skipCache>
141141
<overwrite>true</overwrite>
@@ -205,7 +205,7 @@
205205
<checkSignature>true</checkSignature>
206206
<url>${project.systemvm.template.location}/${cs.version}/systemvmtemplate-${cs.version}.${patch.version}-x86_64-kvm.qcow2.bz2</url>
207207
<outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory>
208-
<md5>${kvm.checksum}</md5>
208+
<sha512>${kvm.checksum}</sha512>
209209
</configuration>
210210
</execution>
211211
</executions>
@@ -241,7 +241,7 @@
241241
<checkSignature>true</checkSignature>
242242
<url>${project.systemvm.template.location}/${cs.version}/systemvmtemplate-${cs.version}.${patch.version}-x86_64-vmware.ova</url>
243243
<outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory>
244-
<md5>${vmware.checksum}</md5>
244+
<sha512>${vmware.checksum}</sha512>
245245
</configuration>
246246
</execution>
247247
</executions>
@@ -277,7 +277,7 @@
277277
<checkSignature>true</checkSignature>
278278
<url>${project.systemvm.template.location}/${cs.version}/systemvmtemplate-${cs.version}.${patch.version}-x86_64-xen.vhd.bz2</url>
279279
<outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory>
280-
<md5>${xen.checksum}</md5>
280+
<sha512>${xen.checksum}</sha512>
281281
</configuration>
282282
</execution>
283283
</executions>
@@ -313,7 +313,7 @@
313313
<checkSignature>true</checkSignature>
314314
<url>${project.systemvm.template.location}/${cs.version}/systemvmtemplate-${cs.version}.${patch.version}-x86_64-ovm.raw.bz2</url>
315315
<outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory>
316-
<md5>${ovm.checksum}</md5>
316+
<sha512>${ovm.checksum}</sha512>
317317
</configuration>
318318
</execution>
319319
</executions>
@@ -349,7 +349,7 @@
349349
<checkSignature>true</checkSignature>
350350
<url>${project.systemvm.template.location}/${cs.version}/systemvmtemplate-${cs.version}.${patch.version}-x86_64-hyperv.vhd.zip</url>
351351
<outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory>
352-
<md5>${hyperv.checksum}</md5>
352+
<sha512>${hyperv.checksum}</sha512>
353353
</configuration>
354354
</execution>
355355
</executions>

‎engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,3 +203,6 @@ SET `sort_key` = CASE
203203
ELSE `sort_key`
204204
END;
205205
-- End: Changes for Guest OS category cleanup
206+
207+
-- Increase length of scripts_version column to 128 due to md5sum to sha512sum change
208+
CALL `cloud`.`IDEMPOTENT_CHANGE_COLUMN`('cloud.domain_router', 'scripts_version', 'scripts_version', 'VARCHAR(128)');

‎engine/schema/templateConfig.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ PARENTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )/dist/systemvm-
8484
mkdir -p $PARENTPATH
8585
METADATAFILE=${PARENTPATH}"metadata.ini"
8686
echo > $METADATAFILE
87-
SOURCEFILE=${PARENTPATH}'md5sum.txt'
87+
SOURCEFILE=${PARENTPATH}'sha512sum.txt'
8888
createMetadataFile

‎packaging/el8/cloud.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ install -D plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-n
317317
# SystemVM template
318318
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/templates/systemvm
319319
cp -r engine/schema/dist/systemvm-templates/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/templates/systemvm
320-
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/templates/systemvm/md5sum.txt
320+
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/templates/systemvm/sha512sum.txt
321321

322322
# UI
323323
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ui

‎server/src/main/java/com/cloud/storage/StorageManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4046,7 +4046,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
40464046
}
40474047
}
40484048
} catch (Exception e) {
4049-
logger.error("Failed to register systemVM template(s)");
4049+
logger.error("Failed to register systemVM template(s) due to: ", e);
40504050
} finally {
40514051
SystemVmTemplateRegistration.unmountStore(filePath);
40524052
txn.close();

‎systemvm/debian/opt/cloud/bin/setup/bootstrap.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ bootstrap() {
118118
/opt/cloud/bin/setup/default.sh
119119
fi
120120

121+
if [ -f /var/cache/cloud/cloud-scripts.tgz ];then
122+
sha512sum /var/cache/cloud/cloud-scripts.tgz | awk '{print $1}' > /var/cache/cloud/cloud-scripts-signature
123+
fi
124+
121125
log_it "Finished setting up systemvm"
122126
exit 0
123127
}

‎systemvm/debian/opt/cloud/bin/setup/cloud-early-config

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ log_it() {
3232
}
3333

3434
validate_checksums() {
35-
local oldmd5=
36-
[ -f ${1} ] && oldmd5=$(cat ${1})
37-
local newmd5=
38-
[ -f ${2} ] && newmd5=$(md5sum ${2} | awk '{print $1}')
39-
log_it "Scripts checksum detected: oldmd5=$oldmd5 newmd5=$newmd5" >> /dev/null 2>&1
40-
echo "oldmd5='${oldmd5}'; newmd5='${newmd5}'"
35+
local oldchecksum=
36+
[ -f ${1} ] && oldchecksum=$(cat ${1})
37+
local newchecksum=
38+
[ -f ${2} ] && newchecksum=$(sha512sum ${2} | awk '{print $1}')
39+
log_it "Scripts checksum detected: oldchecksum=$oldchecksum newchecksum=$newchecksum" >> /dev/null 2>&1
40+
echo "oldchecksum='${oldchecksum}'; newchecksum='${newchecksum}'"
4141
}
4242

4343
patch() {
@@ -46,15 +46,15 @@ patch() {
4646
local oldpatchfile=/usr/share/cloud/$PATCH_SCRIPTS
4747
local patchfile=$PATCH_MOUNT/$PATCH_SCRIPTS
4848
local privkey=$PATCH_MOUNT/authorized_keys
49-
local md5file=/var/cache/cloud/cloud-scripts-signature
49+
local checksumfile=/var/cache/cloud/cloud-scripts-signature
5050
mkdir -p $PATCH_MOUNT
5151

5252
if [ -f /var/cache/cloud/authorized_keys ]; then
5353
privkey=/var/cache/cloud/authorized_keys
5454
fi
5555

56-
eval $(validate_checksums $md5file $oldpatchfile)
57-
if [ "$oldmd5" == "$newmd5" ] && [ -d /usr/local/cloud/systemvm ] && [ "$(ls -A /usr/local/cloud/systemvm)" ]; then
56+
eval $(validate_checksums $checksumfile $oldpatchfile)
57+
if [ "$oldchecksum" == "$newchecksum" ] && [ -d /usr/local/cloud/systemvm ] && [ "$(ls -A /usr/local/cloud/systemvm)" ]; then
5858
log_it "Checksum matches, no need to patch"
5959
return 0
6060
fi
@@ -67,11 +67,11 @@ patch() {
6767
while [ $retry -gt 0 ]
6868
do
6969
if tar tf $patchfile &> /dev/null; then
70-
eval $(validate_checksums $md5file $patchfile)
71-
if [ "$oldmd5" != "$newmd5" ] && [ -f ${patchfile} ] && [ "$newmd5" != "" ]
70+
eval $(validate_checksums $checksumfile $patchfile)
71+
if [ "$oldchecksum" != "$newchecksum" ] && [ -f ${patchfile} ] && [ "$newchecksum" != "" ]
7272
then
7373
tar xzf $patchfile -C /
74-
echo ${newmd5} > ${md5file}
74+
echo ${newchecksum} > ${checksumfile}
7575
log_it "Patched scripts using $patchfile"
7676
touch /var/cache/cloud/patch.required
7777
fi

‎systemvm/debian/opt/cloud/bin/setup/router.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ setup_router() {
4040
# To save router public interface and gw ip information
4141
touch /var/cache/cloud/ifaceGwIp
4242

43-
oldmd5=
44-
[ -f "/etc/udev/rules.d/70-persistent-net.rules" ] && oldmd5=$(md5sum "/etc/udev/rules.d/70-persistent-net.rules" | awk '{print $1}')
43+
oldchecksum=
44+
[ -f "/etc/udev/rules.d/70-persistent-net.rules" ] && oldchecksum=$(sha512sum "/etc/udev/rules.d/70-persistent-net.rules" | awk '{print $1}')
4545

4646
log_it "Checking udev NIC assignment order changes"
4747
if [ "$NIC_MACS" != "" ]
4848
then
4949
init_interfaces_orderby_macs "$NIC_MACS" "/tmp/interfaces" "/tmp/udev-rules"
50-
newmd5=$(md5sum "/tmp/udev-rules" | awk '{print $1}')
50+
newchecksum=$(sha512sum "/tmp/udev-rules" | awk '{print $1}')
5151
rm /tmp/interfaces
5252
rm /tmp/udev-rules
5353

54-
if [ "$oldmd5" != "$newmd5" ]
54+
if [ "$oldchecksum" != "$newchecksum" ]
5555
then
5656
log_it "Reloading udev for new udev NIC assignment"
5757
udevadm control --reload-rules && udevadm trigger

‎systemvm/patch-sysvms.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ backupfolder=/var/cache/cloud/bkpup_live_patch
2121
logfile="/var/log/livepatchsystemvm.log"
2222
newpath="/var/cache/cloud/"
2323
CMDLINE=/var/cache/cloud/cmdline
24-
md5file=/var/cache/cloud/cloud-scripts-signature
24+
checksumfile=/var/cache/cloud/cloud-scripts-signature
2525
svcfile=/var/cache/cloud/enabled_svcs
2626
TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
2727
patchfailed=0
@@ -40,7 +40,7 @@ backup_old_package() {
4040
zip -r $backupfolder/agent.zip * >> $logfile 2>&1 2>&1
4141
cd -
4242
fi
43-
cp $md5file $backupfolder
43+
cp $checksumfile $backupfolder
4444
echo "Backing up cloud-scripts file" >> $logfile 2>&1
4545
tar -zcvf $backupfolder/cloud-scripts.tgz /etc/ /var/ /opt/ /root/ >> $logfile 2>&1
4646
}
@@ -57,13 +57,13 @@ restore_backup() {
5757
fi
5858
backuprestored=1
5959
restart_services
60-
cp $backupfolder/cloud-scripts-signature $md5file
60+
cp $backupfolder/cloud-scripts-signature $checksumfile
6161
}
6262

6363
update_checksum() {
64-
newmd5=$(md5sum $1 | awk '{print $1}')
65-
echo "checksum: " ${newmd5} >> $logfile 2>&1
66-
echo ${newmd5} > ${md5file}
64+
newchecksum=$(sha512sum $1 | awk '{print $1}')
65+
echo "checksum: " ${newchecksum} >> $logfile 2>&1
66+
echo ${newchecksum} > ${checksumfile}
6767
}
6868

6969
restart_services() {
@@ -144,7 +144,7 @@ patch_systemvm
144144
cleanup_systemVM
145145

146146
if [ $patchfailed == 0 ]; then
147-
echo "version:$(cat ${md5file}) "
147+
echo "version:$(cat ${checksumfile}) "
148148
fi
149149

150150
exit $patchfailed

0 commit comments

Comments
 (0)