-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: split OSV batch queries for 1000 purls (#65)
Signed-off-by: Ruben Romero Montes <[email protected]>
- Loading branch information
Showing
7 changed files
with
359 additions
and
117 deletions.
There are no files selected for viewing
42 changes: 42 additions & 0 deletions
42
src/main/java/com/redhat/ecosystemappeng/onguard/model/osv/Partition.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * Copyright 2024 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.redhat.ecosystemappeng.onguard.model.osv; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public record Partition(List<String> items, int size) { | ||
|
|
||
| public Stream<List<String>> stream() { | ||
| List<List<String>> partitions = new ArrayList<>(); | ||
| if(items == null) { | ||
| return Stream.empty(); | ||
| } | ||
| int pos = 0; | ||
| while(pos < items.size()) { | ||
| var to = pos + size; | ||
| if(to > items.size()) { | ||
| to = items.size(); | ||
| } | ||
| partitions.add(items.subList(pos, to)); | ||
| pos = to; | ||
| } | ||
| return partitions.stream(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
src/test/java/com/redhat/ecosystemappeng/onguard/service/VulnerabilityServiceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| * Copyright 2024 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.redhat.ecosystemappeng.onguard.service; | ||
|
|
||
| import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; | ||
| import static com.github.tomakehurst.wiremock.client.WireMock.resetAllRequests; | ||
| import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
| import static org.mockito.ArgumentMatchers.anyList; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.jboss.resteasy.reactive.ClientWebApplicationException; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import com.github.tomakehurst.wiremock.WireMockServer; | ||
| import com.redhat.ecosystemappeng.onguard.model.Vulnerability; | ||
| import com.redhat.ecosystemappeng.onguard.model.VulnerabilityAlias; | ||
| import com.redhat.ecosystemappeng.onguard.repository.VulnerabilityRepository; | ||
| import com.redhat.ecosystemappeng.onguard.test.InjectWireMock; | ||
| import com.redhat.ecosystemappeng.onguard.test.WireMockExtensions; | ||
|
|
||
| import io.quarkus.test.InjectMock; | ||
| import io.quarkus.test.common.QuarkusTestResource; | ||
| import io.quarkus.test.junit.QuarkusTest; | ||
| import io.restassured.RestAssured; | ||
| import jakarta.inject.Inject; | ||
|
|
||
| @QuarkusTest | ||
| @QuarkusTestResource(WireMockExtensions.class) | ||
| public class VulnerabilityServiceTest { | ||
|
|
||
| @InjectWireMock | ||
| WireMockServer server; | ||
|
|
||
| @InjectMock | ||
| VulnerabilityRepository repository; | ||
|
|
||
| static { | ||
| RestAssured.enableLoggingOfRequestAndResponseIfValidationFails(); | ||
| } | ||
|
|
||
| @AfterEach | ||
| public void reset() { | ||
| server.resetRequests(); | ||
| } | ||
|
|
||
| @Inject | ||
| VulnerabilityService vulnerabilityService; | ||
|
|
||
| @Test | ||
| void testFindByPurls_Empty() { | ||
| var result = vulnerabilityService.findByPurls(null, false); | ||
| assertTrue(result.isEmpty()); | ||
|
|
||
| result = vulnerabilityService.findByPurls(Collections.emptyList(), false); | ||
| assertTrue(result.isEmpty()); | ||
|
|
||
| server.verify(0, postRequestedFor(urlEqualTo(WireMockExtensions.OSV_API_PATH))); | ||
| } | ||
|
|
||
| @Test | ||
| void testFindByPurls_NoVulns() { | ||
| var purl = "pkg:maven/org.mvnpm.at.vaadin/[email protected]?type=jar"; | ||
| var purls = List.of(purl); | ||
| var results = vulnerabilityService.findByPurls(purls, false); | ||
|
|
||
| assertFalse(results.isEmpty()); | ||
| assertEquals(purls.size(), results.size()); | ||
| var result = results.get(purl); | ||
| assertNotNull(result); | ||
| assertTrue(result.isEmpty()); | ||
|
|
||
| server.verify(1, postRequestedFor(urlEqualTo(WireMockExtensions.OSV_API_PATH))); | ||
| } | ||
|
|
||
| @Test | ||
| void testFindByPurls_Success() { | ||
| var purls = List.of(WireMockExtensions.PURL_WITH_VULNS); | ||
| var alias = "GHSA-hr8g-6v94-x4m9"; | ||
| var vulnerability = new Vulnerability("cve-001", null, null, null, null, null, null); | ||
| when(repository.listByAliases(anyList())).thenReturn(List.of(new VulnerabilityAlias(alias, vulnerability))); | ||
|
|
||
| var results = vulnerabilityService.findByPurls(purls, false); | ||
|
|
||
| assertFalse(results.isEmpty()); | ||
| assertEquals(purls.size(), results.size()); | ||
| var result = results.get(WireMockExtensions.PURL_WITH_VULNS); | ||
| assertNotNull(result); | ||
| assertEquals(1, result.size()); | ||
| var found = result.get(0); | ||
| assertEquals(vulnerability, found); | ||
|
|
||
| server.verify(1, postRequestedFor(urlEqualTo(WireMockExtensions.OSV_API_PATH))); | ||
| } | ||
|
|
||
| @Test | ||
| void testFindByPurls_Error() { | ||
| var purls = List.of(WireMockExtensions.PURL_WITH_ERROR); | ||
|
|
||
| assertThrows(ClientWebApplicationException.class, () -> vulnerabilityService.findByPurls(purls, false)); | ||
|
|
||
| server.verify(1, postRequestedFor(urlEqualTo(WireMockExtensions.OSV_API_PATH))); | ||
| } | ||
| } |
Oops, something went wrong.