Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-10-01 14:58:03 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8830 from jwangyangls/tag-detail-scan-show-result

Browse Source 
Show the result about vulnerabilities number and vunerability list when click scan button
This commit is contained in:
jwangyangls 2019-08-27 10:23:55 +08:00 committed by GitHub
commit 86ae7d65e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 69 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/lib/src/channel/channel.service.ts
View File

@ -13,6 +13,7 @@
// limitations under the License.
import { Injectable } from '@angular/core';
import { Observable, Subject} from "rxjs";
import { Tag } from '../service';
@Injectable()
export class ChannelService {
@ -24,4 +25,5 @@ export class ChannelService {
publishScanEvent(tagId: string): void {
this.scanCommandSource.next(tagId);
}
tagDetail$ = new Subject<Tag>();
}

104
src/portal/lib/src/tag/tag-detail.component.ts
View File

@ -6,6 +6,7 @@ import { Label } from "../service/interface";
import { forkJoin } from "rxjs";
import { UserPermissionService } from "../service/permission.service";
import { USERSTATICPERMISSION } from "../service/permission-static";
import { ChannelService } from "../channel/channel.service";
const TabLinkContentMap: { [index: string]: string } = {
"tag-history": "history",
@ -41,7 +42,7 @@ export class TagDetailComponent implements OnInit {
created: new Date(),
architecture: "--",
os: "--",
'os.version': "--",
"os.version": "--",
docker_version: "--",
digest: "--",
labels: []
@ -56,45 +57,53 @@ export class TagDetailComponent implements OnInit {
@Input() projectId: number;
constructor(
private tagService: TagService,
public channel: ChannelService,
private errorHandler: ErrorHandler,
private userPermissionService: UserPermissionService,
) { }
private userPermissionService: UserPermissionService
) {}
ngOnInit(): void {
if (this.repositoryId && this.tagId) {
this.tagService.getTag(this.repositoryId, this.tagId)
.subscribe(response => {
this.tagDetails = response;
if (
this.tagDetails &&
this.tagDetails.scan_overview &&
this.tagDetails.scan_overview.components &&
this.tagDetails.scan_overview.components.summary
) {
this.tagDetails.scan_overview.components.summary.forEach(item => {
switch (item.severity) {
case VulnerabilitySeverity.UNKNOWN:
this._unknownCount += item.count;
break;
case VulnerabilitySeverity.LOW:
this._lowCount += item.count;
break;
case VulnerabilitySeverity.MEDIUM:
this._mediumCount += item.count;
break;
case VulnerabilitySeverity.HIGH:
this._highCount += item.count;
break;
default:
break;
}
});
}
}, error => this.errorHandler.error(error));
this.tagService.getTag(this.repositoryId, this.tagId).subscribe(
response => {
this.getTagDetails(response);
},
error => this.errorHandler.error(error)
);
}
this.getTagPermissions(this.projectId);
this.channel.tagDetail$.subscribe(tag => {
this.getTagDetails(tag);
});
}
getTagDetails(tagDetails): void {
this.tagDetails = tagDetails;
if (
this.tagDetails &&
this.tagDetails.scan_overview &&
this.tagDetails.scan_overview.components &&
this.tagDetails.scan_overview.components.summary
) {
this.tagDetails.scan_overview.components.summary.forEach(item => {
switch (item.severity) {
case VulnerabilitySeverity.UNKNOWN:
this._unknownCount += item.count;
break;
case VulnerabilitySeverity.LOW:
this._lowCount += item.count;
break;
case VulnerabilitySeverity.MEDIUM:
this._mediumCount += item.count;
break;
case VulnerabilitySeverity.HIGH:
this._highCount += item.count;
break;
default:
break;
}
});
}
}
onBack(): void {
this.backEvt.emit(this.repositoryId);
}
@ -178,14 +187,25 @@ export class TagDetailComponent implements OnInit {
}
getTagPermissions(projectId: number): void {
const hasVulnerabilitiesListPermission = this.userPermissionService.getPermission(projectId,
USERSTATICPERMISSION.REPOSITORY_TAG_VULNERABILITY.KEY, USERSTATICPERMISSION.REPOSITORY_TAG_VULNERABILITY.VALUE.LIST);
const hasBuildHistoryPermission = this.userPermissionService.getPermission(projectId,
USERSTATICPERMISSION.REPOSITORY_TAG_MANIFEST.KEY, USERSTATICPERMISSION.REPOSITORY_TAG_MANIFEST.VALUE.READ);
forkJoin(hasVulnerabilitiesListPermission, hasBuildHistoryPermission).subscribe(permissions => {
this.hasVulnerabilitiesListPermission = permissions[0] as boolean;
this.hasBuildHistoryPermission = permissions[1] as boolean;
}, error => this.errorHandler.error(error));
const hasVulnerabilitiesListPermission = this.userPermissionService.getPermission(
projectId,
USERSTATICPERMISSION.REPOSITORY_TAG_VULNERABILITY.KEY,
USERSTATICPERMISSION.REPOSITORY_TAG_VULNERABILITY.VALUE.LIST
);
const hasBuildHistoryPermission = this.userPermissionService.getPermission(
projectId,
USERSTATICPERMISSION.REPOSITORY_TAG_MANIFEST.KEY,
USERSTATICPERMISSION.REPOSITORY_TAG_MANIFEST.VALUE.READ
);
forkJoin(
hasVulnerabilitiesListPermission,
hasBuildHistoryPermission
).subscribe(
permissions => {
this.hasVulnerabilitiesListPermission = permissions[0] as boolean;
this.hasBuildHistoryPermission = permissions[1] as boolean;
},
error => this.errorHandler.error(error)
);
}
}

1
src/portal/lib/src/vulnerability-scanning/result-bar-chart.component.ts
View File

@ -166,6 +166,7 @@ export class ResultBarChartComponent implements OnInit, OnDestroy {
this.stateCheckTimer = null;
}
}
this.channel.tagDetail$.next(t);
}, error => {
this.errorHandler.error(error);
this.retryCounter++;

4
src/portal/lib/src/vulnerability-scanning/result-grid.component.ts
View File

@ -33,6 +33,10 @@ export class ResultGridComponent implements OnInit {
ngOnInit(): void {
this.loadResults(this.repositoryId, this.tagId);
this.getScanPermissions(this.projectId);
this.channel.tagDetail$.subscribe(tag => {
this.loadResults(this.repositoryId, this.tagId);
});
}
loadResults(repositoryId: string, tagId: string): void {