Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

consider affected libraries for outer library digest #425

Merged
merged 4 commits into from
Sep 9, 2020
Merged

consider affected libraries for outer library digest #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
828769c
consider affected libraries for outer library digest
serenaponta Sep 2, 2020
2179f29
fix test
serenaponta Sep 2, 2020
64c7c7b
fix json value in test and include historical
serenaponta Sep 2, 2020
b005684
applied google code style
serenaponta Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions ...-backend/src/main/java/org/eclipse/steady/backend/repo/AffectedLibraryRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,18 +260,16 @@ public void computeAffectedLib(VulnerableDependency _vd, Library _lib) {
// (required to mark FP entries for the outer library)
Boolean rebundled = (_vd.getDep().getLib().equals(_lib)) ? false : true;
Boolean avForRebundled = null;
if (rebundled && _vd.getDep().getLib().getLibraryId() != null) {
if (rebundled) {
avForRebundled =
this.affLibRepository.isBugLibIdAffected(
_vd.getBug().getBugId(), _vd.getDep().getLib().getLibraryId());
this.affLibRepository.isBugLibAffected(
_vd.getBug().getBugId(), _vd.getDep().getLib().getDigest());
if (avForRebundled == null && _vd.getDep().getLib().getLibraryId() != null) {
avForRebundled =
this.affLibRepository.isBugLibIdAffected(
_vd.getBug().getBugId(), _vd.getDep().getLib().getLibraryId());
}
}
// TODO: the code below should be used to check whether an affectedLIbrary for the outer libs
// exists using the digest (in case the libid is null)
// it still needs to be tested
// else if (rebundled){
// avForRebundled = this.affLibRepository.isBugLibAffected(_vd.getBug().getBugId(),
// _vd.getDep().getLib().getDigest());
// }

if (avForRebundled != null) {
_vd.setAffectedVersion((avForRebundled) ? 1 : 0);
Expand Down
7 changes: 5 additions & 2 deletions rest-backend/src/main/java/org/eclipse/steady/backend/repo/ApplicationRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,8 +584,11 @@ public TreeSet<VulnerableDependency> findAppVulnerableDependencies(
VulnerableDependency vulndep = new VulnerableDependency(depWithBundledLibId, b);
vulndep.setVulnDepOrigin(VulnDepOrigin.BUNDLEDAFFLIBID);
Boolean rebundlingAffected =
this.affLibRepository.isBugLibIdAffected(
b.getBugId(), depWithBundledLibId.getLib().getLibraryId());
this.affLibRepository.isBugLibAffected(
b.getBugId(), depWithBundledLibId.getLib().getDigest());
if (rebundlingAffected == null)
this.affLibRepository.isBugLibIdAffected(
b.getBugId(), depWithBundledLibId.getLib().getLibraryId());
if (rebundlingAffected != null && !rebundlingAffected) vulndep.setAffectedVersion(0);
else vulndep.setAffectedVersion(1);
vulndep.setAffectedVersionConfirmed(1);
Expand Down
27 changes: 27 additions & 0 deletions rest-backend/src/test/java/org/eclipse/steady/backend/rest/ApplicationControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,7 @@ public void testGetAppVulnerabilitiesForBundledLibs() throws Exception {
.andExpect(status().isOk())
.andExpect(content().contentType(contentTypeJson))
.andExpect(jsonPath("$[0].vulnDepOrigin", is("BUNDLEDCC")))
.andExpect(jsonPath("$[0].affected_version", is(1)))
.andExpect(
jsonPath("$[0].bundledLib.digest", is("3490508379D065FE3FCB80042B62F630F7588606")));

Expand All @@ -959,6 +960,32 @@ public void testGetAppVulnerabilitiesForBundledLibs() throws Exception {
.andExpect(content().contentType(contentTypeJson))
.andExpect(jsonPath("$.constructList", hasSize(2)))
.andExpect(jsonPath("$.constructList[0].inArchive", is(true)));

lib = new Library("3490508379D065FE3FCB80042B62F630F7588606");
AffectedLibrary afflib = new AffectedLibrary(bug, null, false, lib, null, null);
afflib.setSource(AffectedVersionSource.MANUAL);
AffectedLibrary[] afflibs = new AffectedLibrary[1];
afflibs[0] = afflib;
affLibRepository.customSave(bug, afflibs);

mockMvc
.perform(
get("/apps/"
+ APP_GROUP
+ "/"
+ APP_ARTIFACT
+ "/"
+ "0.0."
+ APP_VERSION
+ "/vulndeps?includeHistorical=true")
.header(Constants.HTTP_TENANT_HEADER, TEST_DEFAULT_TENANT)
.header(Constants.HTTP_SPACE_HEADER, TEST_DEFAULT_SPACE))
.andExpect(status().isOk())
.andExpect(content().contentType(contentTypeJson))
.andExpect(jsonPath("$[0].vulnDepOrigin", is("BUNDLEDCC")))
.andExpect(jsonPath("$[0].affected_version", is(0)))
.andExpect(
jsonPath("$[0].bundledLib.digest", is("3490508379D065FE3FCB80042B62F630F7588606")));
}

@Test
Expand Down