Download CEF from opensource.spotify.com

Author: qaisjp

utils/buildactions/install_cef.lua

@@ -4,10 +4,11 @@ premake.modules.install_cef = {}
 
 -- Config variables
 local CEF_PATH = "vendor/cef3/"
-local CEF_URL_PREFIX = "https://mirror.mtasa.com/bdata/cef/"
+local CEF_URL_PREFIX = "http://opensource.spotify.com/cefbuilds/cef_binary_"
 local CEF_URL_SUFFIX = "_windows32_minimal.tar.bz2"
 
-local CEF_VERSION = "80.0.4+g74f7b0c+chromium-80.0.3987.122" -- Change here to update CEF version
+-- Change here to update CEF version
+local CEF_VERSION = "80.0.4+g74f7b0c+chromium-80.0.3987.122"
 
 function make_cef_download_url()
 	return CEF_URL_PREFIX..http.escapeUrlParam(CEF_VERSION)..CEF_URL_SUFFIX
@@ -22,20 +23,15 @@ newaction {
 		if os.host() ~= "windows" then return end
 
 		-- Download md5
-		local correct_checksum, result_string = http.get(make_cef_download_url()..".md5")
+		local correct_checksum, result_string = http.get(make_cef_download_url()..".sha1")
 		if result_string ~= "OK" and result_string then
 			print("Could not check CEF checksum: "..result_string)
 			return -- Do nothing and rely on earlier installed files (to allow working offline)
-
-			-- TODO(jusonex): It might make sense to fallback to spotify cef mirror
 		end
 
-		-- Trim whitespace
-		correct_checksum = correct_checksum:gsub("[%s%c]", "")
-
 		-- Check md5
 		local archive_path = CEF_PATH.."temp.tar.bz2"
-		if os.isfile(archive_path) and os.md5_file(archive_path) == correct_checksum then
+		if os.isfile(archive_path) and os.sha1_file(archive_path):lower() == correct_checksum then
 			print("CEF consistency checks succeeded")
 			return
 		end
@@ -56,10 +52,10 @@ newaction {
 		-- Extract first bz2 and then tar
 		os.extract_archive(archive_path, CEF_PATH, true) -- Extract .tar.bz2 to .tar
 		os.extract_archive(CEF_PATH.."temp.tar", CEF_PATH, true) -- Extract .tar
-		
+
 		-- Move all files from cef_binary*/* to ./
 		os.expanddir_wildcard(CEF_PATH.."cef_binary*", CEF_PATH)
-		
+
 		-- Delete .tar archive, but keep .tar.bz2 for checksumming
 		os.remove(CEF_PATH.."temp.tar")
 	end

utils/buildactions/utils.lua

@@ -77,18 +77,18 @@ end
 function os.expanddir_wildcard(from, to)
 	local dir = os.matchdirs(from)[1]
 	if not dir then return end
-	
+
 	-- TODO: Optimize this
 	os.copydir(dir, to)
 	os.rmdir(dir)
 end
 
-function os.md5_file(path)
+function os.sha1_file(path)
 	if os.host() == "windows" then
-		local s, errc = os.outputof(string.format("CertUtil -hashfile \"%s\" MD5", path))
-		return (s:match("\n(.*)\n(.*)") or ""):gsub(" ", "")
+		local s, errc = os.outputof(string.format("powershell -Command (Get-FileHash \"%s\" -Algorithm SHA1).Hash", path))
+		return (errc == 0) and s or ""
 	else
-		return os.outputof(string.format("md5sum \"%s\" | awk '{ print $1 }'", path))
+		return os.outputof(string.format("sha1sum \"%s\" | awk '{ print $1 }'", path))
 	end
 end