Implemented: sha256sum checksum checksum checking while downloading a new beta/stable

Author: gizmocuz

History.txt

@@ -45,6 +45,7 @@ Version 2.0.xxxx (October xxth 2014)
 - Updated: WindowsLibraries on server
 - Changed: OpenZWave Fibaro RGBW configuration file (had problems with the powerlevel class)
 - Changed: OpenZWave code change to fix (ApplicationCommandHandler - Unhandled Command Class 0x2b)
+- Implemented: sha256sum checksum checksum checking while downloading a new beta/stable
 
 Version 2.0.2025 (September 28th 2014)
 - Implemented: Fibaro Link data pusher

main/mainworker.cpp

@@ -927,7 +927,12 @@ void MainWorker::Do_Work()
 		if (m_bDoDownloadDomoticzUpdate)
 		{
 			m_bDoDownloadDomoticzUpdate=false;
-			std::string outfile = szStartupFolder+"update.tgz";
+			//First download the checksum file
+			std::string outfile = szStartupFolder + "update.tgz.sha256sum";
+			std::string checksumfile = m_szDomoticzUpdateURL + ".sha256sum";
+			HTTPClient::GETBinaryToFile(checksumfile.c_str(), outfile.c_str());
+			//Next download the actual update
+			outfile = szStartupFolder+"update.tgz";
 			m_bHaveDownloadedDomoticzUpdateSuccessFull=HTTPClient::GETBinaryToFile(m_szDomoticzUpdateURL.c_str(),outfile.c_str());
 			m_bHaveDownloadedDomoticzUpdate=true;
 		}

makebeta

@@ -35,7 +35,7 @@ echo "Working copy at revision $LOCAL_REVISION"
 if [ "$SERVER_REVISION" -eq "$LOCAL_REVISION" ]
 then
     echo "Server is up to date. Nothing to do."
-    exit 1
+#    exit 1
 fi
 
 echo "Updating to server revision..."
@@ -69,17 +69,29 @@ if [ -f ${archive_file} ];
 then
   rm ${archive_file}
 fi
+if [ -f ${archive_file}.sha256sum ];
+then
+  rm ${archive_file}.sha256sum
+fi
 
-tar -zcf ${archive_file} domoticz History.txt License.txt svnversion.h domoticz.sh www/ scripts/ Config/
+tar -zcf ${archive_file} domoticz History.txt License.txt svnversion.h domoticz.sh --exclude .svn www/ scripts/ Config/
 if [ $? -ne 0 ]
 then
         echo "Error creating archive!";
         exit 1
 fi
+echo "Creating checksum file...";
+hash="$(sha256sum ${archive_file} | sed -e 's/\s.*$//') update.tgz";
+echo $hash > ${archive_file}.sha256sum
+if [ ! -f ${archive_file}.sha256sum ];
+then
+        echo "Error creating archive checksum file!";
+        exit 1
+fi
 
 #################################
 echo "Uploading to SourceForge...";
-sshpass -p ${SVN_UPLOAD_PASSWORD} scp ${archive_file} ${version_file} ${history_file} ${SVN_UPLOAD_USER}@web.sourceforge.net:/home/project-web/domoticz/htdocs/beta
+sshpass -p ${SVN_UPLOAD_PASSWORD} scp ${archive_file} ${archive_file}.sha256sum ${version_file} ${history_file} ${SVN_UPLOAD_USER}@web.sourceforge.net:/home/project-web/domoticz/htdocs/beta
 if [ $? -ne 0 ]
 then
         echo "Error uploading to SourceForge!";

makerelease

@@ -35,7 +35,7 @@ echo "Working copy at revision $LOCAL_REVISION"
 if [ "$SERVER_REVISION" -eq "$LOCAL_REVISION" ]
 then
     echo "Server is up to date. Nothing to do."
-    exit 1
+#    exit 1
 fi
 
 echo "Updating to server revision..."
@@ -51,13 +51,13 @@ then
 	echo "CMake failed!";
 	exit 1
 fi
-make -j 2
+make -j 1
 if [ $? -ne 0 ]
 then
 	echo "Compilation failed!";
 	exit 1
 fi 
-echo "Success, making release...";
+echo "Success, making beta...";
 
 cp -f svnversion.h ${version_file}
 cp -f History.txt ${history_file}
@@ -69,17 +69,28 @@ if [ -f ${archive_file} ];
 then
   rm ${archive_file}
 fi
+if [ -f ${archive_file}.sha256sum ];
+then
+  rm ${archive_file}.sha256sum
+fi
 
-tar -zcf ${archive_file} domoticz History.txt License.txt svnversion.h domoticz.sh www/ scripts/ Config/
+tar -zcf ${archive_file} domoticz History.txt License.txt svnversion.h domoticz.sh --exclude .svn www/ scripts/ Config/
 if [ $? -ne 0 ]
 then
         echo "Error creating archive!";
         exit 1
 fi
+echo "Creating checksum file...";
+sha256sum ${archive_file} > ${archive_file}.sha256sum
+if [ $? -ne 0 ]
+then
+        echo "Error creating archive checksum file!";
+        exit 1
+fi
 
 #################################
 echo "Uploading to SourceForge...";
-sshpass -p ${SVN_UPLOAD_PASSWORD} scp ${archive_file} ${version_file} ${history_file} ${SVN_UPLOAD_USER}@web.sourceforge.net:/home/project-web/domoticz/htdocs
+sshpass -p ${SVN_UPLOAD_PASSWORD} scp ${archive_file} ${archive_file}.sha256sum ${version_file} ${history_file} ${SVN_UPLOAD_USER}@web.sourceforge.net:/home/project-web/domoticz/htdocs
 if [ $? -ne 0 ]
 then
         echo "Error uploading to SourceForge!";

scripts/update_domoticz

@@ -1,7 +1,19 @@
 #!/bin/sh
 cd $1
+if [ -f update.tgz.sha256sum ];
+then
+  #Check archive against checksum!
+  valid=$(sha256sum -c update.tgz.sha256sum | grep update.tgz | cut -d':' -f2 | tr -d ' ')
+  if [ $valid != "OK" ]
+  then
+	echo "Archive checksum mismatch !";
+	exit 1;
+  fi
+fi 
+
 tar xfz update.tgz
 rm update.tgz
+rm update.tgz.sha256sum
 
 lowercase(){
     echo "$1" | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/"