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

Revert "fix:[NEXT-455] Vulnerability for multiple asset types for a plugin" #2358

Merged
merged 1 commit into from
Feb 5, 2025
Merged

Revert "fix:[NEXT-455] Vulnerability for multiple asset types for a plugin" #2358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion jobs/pacman-data-shipper/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>1.12.263</version>
<version>1.12.261</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
Expand Down
73 changes: 27 additions & 46 deletions .../main/java/com/tmobile/cso/pacman/datashipper/entity/VulnerabilityAssociationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.amazonaws.services.s3.model.*;
import com.amazonaws.services.s3.model.GetObjectRequest;
import com.amazonaws.services.s3.model.S3Object;
import com.amazonaws.util.StringUtils;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand All @@ -30,8 +31,6 @@ public class VulnerabilityAssociationManager {
private static final String BUCKET_NAME = System.getProperty("s3");
private static final String DATA_PATH = System.getProperty("s3.data");
private static final String DATE_FORMAT_SEC = "yyyy-MM-dd HH:mm:00Z";
private static final String VUL_FILE_SUFFIX = "-vulnerabilities.data";
private static final String DETECTION_FILE_SUFFIX = "-detections.data";
private static final Map<String, String> sourceFileToIndexMapping = new HashMap<>(2);

static {
Expand All @@ -51,33 +50,31 @@ public List<Map<String, String>> uploadVulnerabilityInfo(String dataSource) {
String indexName = String.format(entry.getValue(), dataSource);
String filePrefix = String.format(entry.getKey(), dataSource);
List<Map<String, Object>> entities;
ListObjectsV2Request listReq = new ListObjectsV2Request().
withBucketName(BUCKET_NAME)
.withPrefix(DATA_PATH); // List only files inside this folder
ListObjectsV2Result result = s3Client.listObjectsV2(listReq);
if(result != null && result.getKeyCount() > 0) {
String loadDate = new SimpleDateFormat(DATE_FORMAT_SEC).format(new java.util.Date());
for (S3ObjectSummary object : result.getObjectSummaries()) {
String fileName = object.getKey();
S3Object entitiesData = s3Client.getObject(BUCKET_NAME, fileName);
if (fileName.endsWith(VUL_FILE_SUFFIX) && entry.getKey().contains("vulnerabilities") ||
fileName.endsWith(DETECTION_FILE_SUFFIX) && entry.getKey().contains("-detections")) {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(entitiesData.getObjectContent()))) {
entities = objectMapper.readValue(reader.lines().collect(Collectors.joining("\n")), new TypeReference<List<Map<String, Object>>>() {
});
if (Objects.isNull(entities)) {
LOGGER.info("{} object is empty for dataSource - {}", filePrefix, dataSource);
continue;
}
uploadEntity(entities, indexName, loadDate);
} catch (Exception e) {
LOGGER.info("{} data is empty", filePrefix);
}
}
}

}

S3Object entitiesData = s3Client.getObject(new GetObjectRequest(BUCKET_NAME, DATA_PATH + "/" + filePrefix + ".data"));
try (BufferedReader reader = new BufferedReader(new InputStreamReader(entitiesData.getObjectContent()))) {
entities = objectMapper.readValue(reader.lines().collect(Collectors.joining("\n")), new TypeReference<List<Map<String, Object>>>() {
});
} catch (Exception e) {
LOGGER.info("{} data is empty", filePrefix);
continue;
}
Comment on lines +53 to +60
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Refine exception handling for clarity and troubleshooting.
Currently, all exceptions are logged as “data is empty”, which could mask parsing errors or S3 access issues. Consider logging the actual exception message or handling specific exceptions (e.g., file not found vs. parsing failure) to improve debuggability.

Proposed change:

 try (BufferedReader reader = new BufferedReader(new InputStreamReader(entitiesData.getObjectContent()))) {
     entities = objectMapper.readValue(reader.lines().collect(Collectors.joining("\n")),
         new TypeReference<List<Map<String, Object>>>() {});
-} catch (Exception e) {
-    LOGGER.info("{} data is empty", filePrefix);
+} catch (IOException e) {
+    LOGGER.error("Error reading/parsing data for file prefix {}: {}", filePrefix, e.getMessage());
     continue;
 }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
S3Object entitiesData = s3Client.getObject(new GetObjectRequest(BUCKET_NAME, DATA_PATH + "/" + filePrefix + ".data"));
try (BufferedReader reader = new BufferedReader(new InputStreamReader(entitiesData.getObjectContent()))) {
entities = objectMapper.readValue(reader.lines().collect(Collectors.joining("\n")), new TypeReference<List<Map<String, Object>>>() {
});
} catch (Exception e) {
LOGGER.info("{} data is empty", filePrefix);
continue;
}
S3Object entitiesData = s3Client.getObject(new GetObjectRequest(BUCKET_NAME, DATA_PATH + "/" + filePrefix + ".data"));
try (BufferedReader reader = new BufferedReader(new InputStreamReader(entitiesData.getObjectContent()))) {
entities = objectMapper.readValue(reader.lines().collect(Collectors.joining("\n")), new TypeReference<List<Map<String, Object>>>() {
});
} catch (IOException e) {
LOGGER.error("Error reading/parsing data for file prefix {}: {}", filePrefix, e.getMessage());
continue;
}

if (Objects.isNull(entities)) {
LOGGER.info("{} object is empty for dataSource - {}", filePrefix, dataSource);
continue;
}
String url = ESUtils.getEsUrl();
if (!ESUtils.isValidIndex(url, indexName)) {
ESUtils.createIndex(url, indexName);
}
String loaddate = new SimpleDateFormat(DATE_FORMAT_SEC).format(new java.util.Date());
entities.parallelStream().filter(obj -> obj.get("closedDate") == null || StringUtils.isNullOrEmpty(obj.get("closedDate").toString()))
.forEach((obj) -> {
obj.remove("closedDate");
obj.put("_loaddate", loaddate);
});
LOGGER.info("Collected vulnerabilities: {}", entities.size());
ESManager.uploadVulnerabilityData(indexName, entities);
ESManager.deleteOldDocuments(indexName, null, "_loaddate.keyword", loaddate);
} catch (Exception e) {
LOGGER.error("Error in shipping vulnerability data for dataSource - {}", dataSource);
Map<String, String> errorMap = new HashMap<>();
Expand All @@ -90,20 +87,4 @@ public List<Map<String, String>> uploadVulnerabilityInfo(String dataSource) {
LOGGER.info("Completed Vulnerability collection for {}", dataSource);
return errorList;
}


public static void uploadEntity(List<Map<String, Object>> entities, String indexName, String loadDate) throws Exception{
String url = ESUtils.getEsUrl();
if (!ESUtils.isValidIndex(url, indexName)) {
ESUtils.createIndex(url, indexName);
}
entities.parallelStream().filter(obj -> obj.get("closedDate") == null || StringUtils.isNullOrEmpty(obj.get("closedDate").toString()))
.forEach((obj) -> {
obj.remove("closedDate");
obj.put("_loaddate", loadDate);
});
LOGGER.info("Collected vulnerabilities: {}", entities.size());
ESManager.uploadVulnerabilityData(indexName, entities);
ESManager.deleteOldDocuments(indexName, null, "_loaddate.keyword", loadDate);
}
}
Loading