Skirda/SkirdaElectronLauncher
4
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Addes sha1 hash validation for all download processes - code is pending a final review/cleanup

Browse Source
This commit is contained in:
Daniel Scalzi 2017-04-28 14:52:24 -04:00
parent cf0afeb957
commit b01f652d8c
2 changed files with 94 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
app/assets/js/assetdownload.js
View File

@ -51,9 +51,11 @@ exports.downloadClient = function(versionData, basePath){
const url = clientData['url']
const size = clientData['size']
const version = versionData['id']
const sha1 = clientData['sha1']
const targetPath = path.join(basePath, 'versions', version)
const targetFile = version + '.jar'
if(!validateLocalIntegrity(path.join(targetPath, targetFile), 'sha1', sha1)){
request.head(url, function(err, res, body){
console.log('Downloading ' + version + ' client..')
mkpath.sync(targetPath)
@ -62,6 +64,7 @@ exports.downloadClient = function(versionData, basePath){
console.log('Finished downloading ' + version + ' client.')
})
})
}
}
exports.downloadLogConfig = function(versionData, basePath){
@ -69,10 +72,12 @@ exports.downloadLogConfig = function(versionData, basePath){
const client = logging['client']
const file = client['file']
const version = versionData['id']
const sha1 = file['sha1']
const targetPath = path.join(basePath, 'assets', 'log_configs')
const name = file['id']
const url = file['url']
if(!validateLocalIntegrity(path.join(targetPath, name), 'sha1', sha1)){
request.head(url, function(err, res, body){
console.log('Downloading ' + version + ' log config..')
mkpath.sync(targetPath)
@ -81,21 +86,22 @@ exports.downloadLogConfig = function(versionData, basePath){
console.log('Finished downloading ' + version + ' log config..')
})
})
}
}
exports.downloadLibraries = function(versionData, basePath){
const libArr = versionData['libraries']
const libPath = path.join(basePath, 'libraries')
console.log(libArr)
async.eachLimit(libArr, 1, function(lib, cb){
if(validateRules(lib['rules'])){
if(lib['natives'] == null){
const dlInfo = lib['downloads']
const artifact = dlInfo['artifact']
const sha1 = artifact['sha1']
const libSize = artifact['size']
const to = path.join(libPath, artifact['path'])
const from = artifact['url']
if(!validateLocalIntegrity(to, 'sha1', sha1)){
mkpath.sync(path.join(to, ".."))
let req = request(from)
let writeStream = fs.createWriteStream(to)
@ -108,6 +114,9 @@ exports.downloadLibraries = function(versionData, basePath){
writeStream.on('close', function(){
cb()
})
} else {
cb()
}
} else {
const natives = lib['natives']
const opSys = mojangFriendlyOS()
@ -119,9 +128,9 @@ exports.downloadLibraries = function(versionData, basePath){
const libSize = artifact['size']
const to = path.join(libPath, artifact['path'])
const from = artifact['url']
const sha1 = artifact['sha1']
console.log(to)
if(!validateLocalIntegrity(to, 'sha1', sha1)){
mkpath.sync(path.join(to, ".."))
let req = request(from)
let writeStream = fs.createWriteStream(to)
@ -134,6 +143,9 @@ exports.downloadLibraries = function(versionData, basePath){
writeStream.on('close', function(){
cb()
})
} else {
cb()
}
}
} else {
cb()
@ -147,43 +159,6 @@ exports.downloadLibraries = function(versionData, basePath){
})
}
validateRules = function(rules){
if(rules == null) return true
let result = true
rules.forEach(function(rule){
const action = rule['action']
const osProp = rule['os']
if(action != null){
if(osProp != null){
const osName = osProp['name']
const osMoj = mojangFriendlyOS()
if(action === 'allow'){
result = osName === osMoj
return
} else if(action === 'disallow'){
result = osName !== osMoj
return
}
}
}
})
return result
}
mojangFriendlyOS = function(){
const opSys = process.platform
if (opSys === 'darwin') {
return 'osx';
} else if (opSys === 'win32'){
return 'windows';
} else if (opSys === 'linux'){
return 'linux';
} else {
return 'unknown_os';
}
}
/**
* Given an index url, this function will asynchonously download the
* assets associated with that version.
@ -264,3 +239,40 @@ validateLocalIntegrity = function(filePath, algo, hash){
}
return false;
}
validateRules = function(rules){
if(rules == null) return true
let result = true
rules.forEach(function(rule){
const action = rule['action']
const osProp = rule['os']
if(action != null){
if(osProp != null){
const osName = osProp['name']
const osMoj = mojangFriendlyOS()
if(action === 'allow'){
result = osName === osMoj
return
} else if(action === 'disallow'){
result = osName !== osMoj
return
}
}
}
})
return result
}
mojangFriendlyOS = function(){
const opSys = process.platform
if (opSys === 'darwin') {
return 'osx';
} else if (opSys === 'win32'){
return 'windows';
} else if (opSys === 'linux'){
return 'linux';
} else {
return 'unknown_os';
}
}

10
index.js
View File

@ -18,16 +18,16 @@ function createWindow() {
win.setMenu(null)
//Code for testing, marked for removal one it's properly implemented.
const assetdl = require('./app/assets/js/assetdownload.js')
/*const assetdl = require('./app/assets/js/assetdownload.js')
const basePath = path.join(__dirname, 'mcfiles')
const dataPromise = assetdl.parseVersionData('1.11.2', basePath)
dataPromise.then(function(data){
assetdl.downloadAssets(data, basePath)
//assetdl.downloadClient(data, basePath)
//assetdl.downloadLogConfig(data, basePath)
//assetdl.downloadLibraries(data, basePath)
assetdl.downloadClient(data, basePath)
assetdl.downloadLogConfig(data, basePath)
assetdl.downloadLibraries(data, basePath)
//require('./app/assets/js/launchprocess.js').launchMinecraft(data, basePath)
})
})*/
win.on('closed', () => {
win = null