only show integrity check for things that have specified an sha

Author: akshita31

src/observers/CsharpLoggerObserver.ts

@@ -75,7 +75,7 @@ export class CsharpLoggerObserver extends BaseLoggerObserver {
     }
 
     private handleIntegrityCheckSuccess(event: Event.IntegrityCheckSuccess) {
-        this.logger.appendLine("Integrity Check succeeded.")
+        this.logger.appendLine("Integrity Check succeeded.");
     }
 
     private handleIntegrityCheckFailure(event: Event.IntegrityCheckFailure) {

src/omnisharp/loggingEvents.ts

@@ -170,10 +170,6 @@ export class IntegrityCheckSuccess {
     constructor() { }
 }
 
-export class DownloadValidation {
-    constructor(public packageDescription: string){ }
-}
-
 export class RazorPluginPathSpecified implements BaseEvent {
     constructor(public path: string) {}
 }
@@ -213,4 +209,5 @@ export class OmnisharpServerOnStop implements BaseEvent { }
 export class OmnisharpServerOnStart implements BaseEvent { }
 export class LatestBuildDownloadStart implements BaseEvent { }
 export class OmnisharpRestart implements BaseEvent { }
-export class DotNetTestDebugComplete implements BaseEvent { }
+export class DotNetTestDebugComplete implements BaseEvent { }
+export class DownloadValidation implements BaseEvent { }

src/packageManager/downloadAndInstallPackages.ts

@@ -11,7 +11,7 @@ import { EventStream } from '../EventStream';
 import { NetworkSettingsProvider } from "../NetworkSettings";
 import { AbsolutePathPackage } from "./AbsolutePathPackage";
 import { touchInstallFile, InstallFileType, deleteInstallFile, installFileExists } from "../common";
-import { InstallationFailure, IntegrityCheckFailure, DownloadValidation, IntegrityCheckSuccess } from "../omnisharp/loggingEvents";
+import { InstallationFailure, IntegrityCheckFailure } from "../omnisharp/loggingEvents";
 import { mkdirpSync } from "fs-extra";
 import { PackageInstallStart } from "../omnisharp/loggingEvents";
 import { isValidDownload } from './isValidDownload';
@@ -28,9 +28,7 @@ export async function downloadAndInstallPackages(packages: AbsolutePathPackage[]
                 while (count < 2) {
                     count++;
                     let buffer = await DownloadFile(pkg.description, eventStream, provider, pkg.url, pkg.fallbackUrl);
-                    eventStream.post(new DownloadValidation(pkg.description));
-                    if (isValidDownload(buffer, pkg.integrity)) {
-                        eventStream.post(new IntegrityCheckSuccess());
+                    if (isValidDownload(buffer, pkg.integrity, eventStream)) {
                         await InstallZip(buffer, pkg.description, pkg.installPath, pkg.binaries, eventStream);
                         installationStage = 'touchLockFile';
                         await touchInstallFile(pkg.installPath, InstallFileType.Lock);

src/packageManager/isValidDownload.ts

@@ -4,13 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as crypto from "crypto";
+import { EventStream } from "../EventStream";
+import { IntegrityCheckSuccess, DownloadValidation } from "../omnisharp/loggingEvents";
 
-export function isValidDownload(buffer: Buffer, integrity: string): boolean {
+export function isValidDownload(buffer: Buffer, integrity: string, eventStream: EventStream): boolean {
     let hash = crypto.createHash('sha256');
     if (integrity && integrity.length > 0) {
+        eventStream.post(new DownloadValidation());
         hash.update(buffer);
         let value = hash.digest('hex');
         if (value.toUpperCase() == integrity.toUpperCase()) {
+            eventStream.post(new IntegrityCheckSuccess());
             return true;
         }
         else {

test/unitTests/OmnisharpDownloader.test.ts

@@ -14,7 +14,7 @@ import MockHttpsServer from "./testAssets/MockHttpsServer";
 import {expect} from 'chai';
 import TestZip from "./testAssets/TestZip";
 import { createTestFile } from "./testAssets/TestFile";
-import { PackageInstallation, LogPlatformInfo, DownloadStart, DownloadSizeObtained, DownloadProgress, DownloadSuccess, InstallationStart, InstallationSuccess, PackageInstallStart, DownloadValidation, IntegrityCheckSuccess } from "../../src/omnisharp/loggingEvents";
+import { PackageInstallation, LogPlatformInfo, DownloadStart, DownloadSizeObtained, DownloadProgress, DownloadSuccess, InstallationStart, InstallationSuccess, PackageInstallStart } from "../../src/omnisharp/loggingEvents";
 import TestEventBus from "./testAssets/TestEventBus";
 import { testPackageJSON } from "./testAssets/testAssets";
 
@@ -67,11 +67,9 @@ suite('OmnisharpDownloader', () => {
             new DownloadSizeObtained(testZip.size),
             new DownloadProgress(100, 'OmniSharp for Windows (.NET 4.6 / x86), Version = 1.2.3'),
             new DownloadSuccess(' Done!'),
-            new DownloadValidation('OmniSharp for Windows (.NET 4.6 / x86), Version = 1.2.3'),
-            new IntegrityCheckSuccess(),
             new InstallationStart('OmniSharp for Windows (.NET 4.6 / x86), Version = 1.2.3'), 
             new InstallationSuccess() 
-        ]; 
+        ];
 
         expect(eventBus.getEvents()).to.be.empty; 
         await downloader.DownloadAndInstallOmnisharp(version, server.baseUrl, installPath); 

test/unitTests/Packages/downloadAndInstallPackages.test.ts

@@ -12,7 +12,7 @@ import TestZip from '../testAssets/TestZip';
 import { downloadAndInstallPackages } from '../../../src/packageManager/downloadAndInstallPackages';
 import NetworkSettings from '../../../src/NetworkSettings';
 import { EventStream } from '../../../src/EventStream';
-import { DownloadStart, DownloadSizeObtained, DownloadProgress, DownloadSuccess, InstallationStart, PackageInstallStart, DownloadValidation, IntegrityCheckSuccess } from '../../../src/omnisharp/loggingEvents';
+import { DownloadStart, DownloadSizeObtained, DownloadProgress, DownloadSuccess, InstallationStart, PackageInstallStart } from '../../../src/omnisharp/loggingEvents';
 import MockHttpsServer from '../testAssets/MockHttpsServer';
 import { createTestFile } from '../testAssets/TestFile';
 import TestEventBus from '../testAssets/TestEventBus';
@@ -91,8 +91,6 @@ suite(`${downloadAndInstallPackages.name}`, () => {
                 new DownloadSizeObtained(testZip.size),
                 new DownloadProgress(100, packageDescription),
                 new DownloadSuccess(' Done!'),
-                new DownloadValidation(packageDescription),
-                new IntegrityCheckSuccess(),
                 new InstallationStart(packageDescription)
             ];
 

test/unitTests/Packages/isValidDownload.test.ts

@@ -5,6 +5,7 @@
 
 import { isValidDownload } from "../../../src/packageManager/isValidDownload";
 import * as chai from "chai";
+import { EventStream } from "../../../src/EventStream";
 
 chai.should();
 const expect = chai.expect;
@@ -14,12 +15,12 @@ suite(`${isValidDownload.name}`, () => {
     const validIntegrity = "eb7201b5d986919e0ac67c820886358869d8f7059193d33c902ad7fe1688e1e9";
 
     test('Returns false for non-matching integrity', async () => {
-        let result = await isValidDownload(sampleBuffer, "inValidIntegrity");
+        let result = await isValidDownload(sampleBuffer, "inValidIntegrity", new EventStream());
         expect(result).to.be.false;
     });
 
     test('Returns true for matching integrity', async () => {
-        let result = await isValidDownload(sampleBuffer, validIntegrity);
+        let result = await isValidDownload(sampleBuffer, validIntegrity, new EventStream());
         expect(result).to.be.true;
     });
 });