Skip to content
This repository was archived by the owner on Feb 26, 2021. It is now read-only.

Commit fe0484a

Browse files
MartinLang1MartinLang1
committed
Removed s3 reportWriter. Infos are now added to findingEntry
1 parent a9b644a commit fe0484a

5 files changed

Lines changed: 10 additions & 149 deletions

File tree

‎scb-persistenceproviders/s3-persistenceprovider/src/main/java/io/securecodebox/persistence/s3/FindingWriter.java‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import io.securecodebox.model.securitytest.SecurityTest;
77
import java.io.File;
88
import java.io.IOException;
9-
import java.util.HashMap;
109
import java.util.Map;
1110
import java.util.UUID;
1211
import org.slf4j.Logger;
@@ -22,18 +21,19 @@ class FindingWriter {
2221
@Autowired
2322
private ObjectMapper mapper;
2423

25-
File writeFindingToFile(Finding finding, SecurityTest test) throws IOException {
24+
File writeFindingToFile(Finding finding, SecurityTest securityTest) throws IOException {
2625
LOG.debug("Write finding " + finding.getId() + " to tempFile");
2726
File tempFile = File.createTempFile(UUID.randomUUID().toString(), ".json");
2827

29-
Map<String, Object> securityTestAsMap = asMap(finding);
30-
addSecurityTestInformation(securityTestAsMap, test);
28+
Map<String, Object> securityTestAsMap = convertToMap(finding);
29+
30+
addSecurityTestInformationToMap(securityTestAsMap, securityTest);
3131

3232
mapper.writeValue(tempFile, securityTestAsMap);
3333
return tempFile;
3434
}
3535

36-
private void addSecurityTestInformation(Map<String, Object> securityTestAsMap, SecurityTest securityTest) {
36+
private void addSecurityTestInformationToMap(Map<String, Object> securityTestAsMap, SecurityTest securityTest) {
3737
securityTestAsMap.put("context", securityTest.getContext());
3838
securityTestAsMap.put("security_test_name", securityTest.getName());
3939
securityTestAsMap.put("security_test_id", securityTest.getId());
@@ -42,13 +42,9 @@ private void addSecurityTestInformation(Map<String, Object> securityTestAsMap, S
4242
securityTestAsMap.put("security_test_metaData", securityTest.getMetaData());
4343
}
4444

45-
private Map<String, Object> asMap(Finding finding) {
46-
try {
47-
String jsonString = mapper.writeValueAsString(finding);
48-
Map<String, Object> result = mapper.readValue(jsonString, new TypeReference<Map<String, Object>>() {});
49-
return result;
50-
} catch (IOException e) {
51-
return new HashMap<>();
52-
}
45+
private Map<String, Object> convertToMap(Finding finding) throws IOException {
46+
String jsonString = mapper.writeValueAsString(finding);
47+
Map<String, Object> result = mapper.readValue(jsonString, new TypeReference<Map<String, Object>>() {});
48+
return result;
5349
}
5450
}

‎scb-persistenceproviders/s3-persistenceprovider/src/main/java/io/securecodebox/persistence/s3/ReportWriter.java‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎scb-persistenceproviders/s3-persistenceprovider/src/main/java/io/securecodebox/persistence/s3/S3PersistenceProvider.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ public class S3PersistenceProvider implements PersistenceProvider {
4747
@Value("${securecodebox.persistence.s3.region}")
4848
private String awsRegion;
4949

50-
@Autowired
51-
ReportWriter reportWriter;
52-
5350
@Autowired
5451
FindingWriter findingWriter;
5552

@@ -63,8 +60,6 @@ public void persist(SecurityTest securityTest) {
6360
AmazonS3 s3Client = AmazonS3ClientBuilder.defaultClient();
6461
String fileName = securityTest.getContext().replace('/', '-') + '/' + securityTest.getId();
6562

66-
// writeReportFileToS3Bucket(securityTest, s3Client, fileName);
67-
6863
for (Finding finding: securityTest.getReport().getFindings()) {
6964
writeFindingFileToS3Bucket(s3Client, fileName, finding, securityTest);
7065
}
@@ -80,16 +75,6 @@ private void writeFindingFileToS3Bucket(AmazonS3 s3Client, String fileName, Find
8075
writeFileToS3Bucket(s3Client, findingFile, fileName + "-finding-" + finding.getId());
8176
}
8277

83-
private void writeReportFileToS3Bucket(SecurityTest securityTest, AmazonS3 s3Client, String fileName) {
84-
File reportFile = null;
85-
try {
86-
reportFile = reportWriter.writeReportToFile(securityTest);
87-
} catch (IOException exception) {
88-
LOG.error("Could not write tempfile for report: ", exception);
89-
}
90-
writeFileToS3Bucket(s3Client, reportFile, fileName);
91-
}
92-
9378
private void writeFileToS3Bucket(AmazonS3 s3Client, File file, String fileName) {
9479
PutObjectRequest request = new PutObjectRequest(bucketName, fileName, file);
9580
ObjectMetadata metadata = new ObjectMetadata();

‎scb-persistenceproviders/s3-persistenceprovider/src/test/java/io/securecodebox/persistence/s3/ReportWriterTest.java‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎scb-sdk/src/main/java/io/securecodebox/model/execution/ScanProcessExecution.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public interface ScanProcessExecution {
4141
UUID getId();
4242

4343
@JsonProperty("context")
44-
void setContext(String id);
44+
void setContext(String context);
4545

4646
@JsonProperty("context")
4747
String getContext();

0 commit comments

Comments
 (0)