moved hash check and token download to main thread

This commit is contained in:
Shane Harris
2020-08-17 13:31:48 +01:00
committed by Your Name
parent ef163b2335
commit 7aab6ec072
6 changed files with 621 additions and 245 deletions
+47 -44
View File
@@ -2,6 +2,8 @@ import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { AppService } from './app.service';
import { environment } from './../environments/environment';
import { ElectronService } from './electron.service';
import { AdbClientService } from './adb-client.service';
interface CheckSubmissionResponse {
found: boolean;
@@ -11,51 +13,52 @@ interface CheckSubmissionResponse {
providedIn: 'root',
})
export class SafeSideService {
constructor(private appService: AppService, private http: HttpClient) {}
constructor(private appService: AppService, private adbService: AdbClientService) {} // private http: HttpClient
async checkAPK(updateStatus: (string) => void, filePath: string): Promise<boolean> {
const hash = await this.computeFileHash(updateStatus, filePath);
const url = `${environment.safeSideApiUrl}/check-app-hash/${hash}`;
updateStatus('Checking APK against blacklist...');
const response = await this.http.get<CheckSubmissionResponse>(url).toPromise();
return response.found;
}
async computeFileHash(updateStatus: (string) => void, filePath: string): Promise<string> {
const fileSize = await this.computeFileSize(filePath);
return new Promise((resolve, reject) => {
let bytesRead: number = 0;
const fd = this.appService.fs.createReadStream(filePath);
const hash = this.appService.crypto.createHash('md5');
hash.setEncoding('hex');
fd.on('data', chunk => {
bytesRead += chunk.length;
const percentage = this.formattedPercentageComplete(bytesRead, fileSize);
updateStatus(`Computing APK hash (${percentage})...`);
});
fd.on('end', () => {
updateStatus(`Computing APK hash (100%)...`);
hash.end();
resolve(hash.read());
});
fd.on('error', error => {
reject(error);
});
fd.pipe(hash);
});
}
async computeFileSize(filePath: string): Promise<number> {
return new Promise((resolve, reject) => {
this.appService.fs.stat(filePath, (err, stats) => {
if (err) {
reject(err);
} else {
resolve(stats.size);
}
});
});
}
formattedPercentageComplete(amount: number, total: number): string {
const percentage = Math.round(Math.min(amount / total, 1) * 100);
return `${percentage}%`;
return this.adbService.adbCommand('hashCheck', { path: filePath }, updateStatus);
// const hash = await this.computeFileHash(updateStatus, filePath);
// const url = `${environment.safeSideApiUrl}/check-app-hash/${hash}`;
// updateStatus('Checking APK against blacklist...');
// const response = await this.http.get<CheckSubmissionResponse>(url).toPromise();
// return response.found;
}
// async computeFileHash(updateStatus: (string) => void, filePath: string): Promise<string> {
// const fileSize = await this.computeFileSize(filePath);
// return new Promise((resolve, reject) => {
// let bytesRead: number = 0;
// const fd = this.appService.fs.createReadStream(filePath);
// const hash = this.appService.crypto.createHash('md5');
// hash.setEncoding('hex');
// fd.on('data', chunk => {
// bytesRead += chunk.length;
// const percentage = this.formattedPercentageComplete(bytesRead, fileSize);
// updateStatus(`Computing APK hash (${percentage})...`);
// });
// fd.on('end', () => {
// updateStatus(`Computing APK hash (100%)...`);
// hash.end();
// resolve(hash.read());
// });
// fd.on('error', error => {
// reject(error);
// });
// fd.pipe(hash);
// });
// }
// async computeFileSize(filePath: string): Promise<number> {
// return new Promise((resolve, reject) => {
// this.appService.fs.stat(filePath, (err, stats) => {
// if (err) {
// reject(err);
// } else {
// resolve(stats.size);
// }
// });
// });
// }
// formattedPercentageComplete(amount: number, total: number): string {
// const percentage = Math.round(Math.min(amount / total, 1) * 100);
// return `${percentage}%`;
// }
}