ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-17 10:20:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated a couple of files to resolve aca load issues

Browse Source
This commit is contained in:
Cyrus 2023-09-06 11:10:57 -04:00
parent b7357fac9b
commit 6b063d44e0
4 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/PersistenceConfiguration.java
View File

@ -1,6 +1,10 @@
package hirs.attestationca.persist; package hirs.attestationca.persist;
import hirs.structs.converters.SimpleStructConverter;
import hirs.structs.converters.StructConverter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
/** /**
* Persistence Configuration for Spring enabled applications. Constructs a Hibernate SessionFactory * Persistence Configuration for Spring enabled applications. Constructs a Hibernate SessionFactory
@ -12,6 +16,18 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
public class PersistenceConfiguration { public class PersistenceConfiguration {
/**
* Prototyped {@link StructConverter}. In other words, all instances
* returned by this method will be configured identically, but subsequent
* invocations will return a new instance.
*
* @return ready to use {@link StructConverter}.
*/
@Bean
@Scope("prototype")
public static StructConverter structConverter() {
return new SimpleStructConverter();
}
// @Bean // @Bean
// public FilesStorageService filesStorageService() { // public FilesStorageService filesStorageService() {
// FilesStorageServiceImpl filesStorageService = new FilesStorageServiceImpl(new StorageProperties()); // FilesStorageServiceImpl filesStorageService = new FilesStorageServiceImpl(new StorageProperties());

12
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/ReferenceManifest.java
View File

@ -21,6 +21,7 @@ import org.hibernate.annotations.JdbcTypeCode;
import javax.xml.XMLConstants; import javax.xml.XMLConstants;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Base64;
import java.util.UUID; import java.util.UUID;
/** /**
@ -104,6 +105,9 @@ public class ReferenceManifest extends ArchivableEntity {
private String hexDecHash = ""; private String hexDecHash = "";
@Column @Column
private String eventLogHash = ""; private String eventLogHash = "";
@Column
@JsonIgnore
private String base64Hash = "";
/** /**
* Default constructor necessary for Hibernate. * Default constructor necessary for Hibernate.
@ -141,6 +145,14 @@ public class ReferenceManifest extends ArchivableEntity {
} catch (NoSuchAlgorithmException noSaEx) { } catch (NoSuchAlgorithmException noSaEx) {
log.error(noSaEx); log.error(noSaEx);
} }
this.base64Hash = "";
try {
digest = MessageDigest.getInstance("SHA-256");
this.base64Hash = Base64.getEncoder().encodeToString(
digest.digest(rimBytes));
} catch (NoSuchAlgorithmException noSaEx) {
log.error(noSaEx);
}
} }
/** /**

17
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/BaseReferenceManifest.java
View File

@ -1,6 +1,5 @@
package hirs.attestationca.persist.entity.userdefined.rim; package hirs.attestationca.persist.entity.userdefined.rim;
import com.fasterxml.jackson.annotation.JsonIgnore;
import hirs.attestationca.persist.entity.userdefined.ReferenceManifest; import hirs.attestationca.persist.entity.userdefined.ReferenceManifest;
import hirs.utils.SwidResource; import hirs.utils.SwidResource;
import hirs.utils.swid.SwidTagConstants; import hirs.utils.swid.SwidTagConstants;
@ -32,10 +31,7 @@ import javax.xml.validation.SchemaFactory;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Base64;
import java.util.List; import java.util.List;
/** /**
@ -54,9 +50,6 @@ public class BaseReferenceManifest extends ReferenceManifest {
private static JAXBContext jaxbContext; private static JAXBContext jaxbContext;
@Column
@JsonIgnore
private String base64Hash = "";
@Column @Column
private String swidName = null; private String swidName = null;
@Column @Column
@ -120,16 +113,6 @@ public class BaseReferenceManifest extends ReferenceManifest {
Element entity; Element entity;
Element link; Element link;
MessageDigest digest = null;
this.base64Hash = "";
try {
digest = MessageDigest.getInstance("SHA-256");
this.base64Hash = Base64.getEncoder().encodeToString(
digest.digest(rimBytes));
} catch (NoSuchAlgorithmException noSaEx) {
log.error(noSaEx);
}
// begin parsing valid swid tag // begin parsing valid swid tag
if (document != null) { if (document != null) {
softwareIdentity = (Element) document.getElementsByTagName(SwidTagConstants.SOFTWARE_IDENTITY).item(0); softwareIdentity = (Element) document.getElementsByTagName(SwidTagConstants.SOFTWARE_IDENTITY).item(0);

8
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java
View File

@ -1,7 +1,5 @@
package hirs.attestationca.portal; package hirs.attestationca.portal;
import hirs.attestationca.persist.service.SupplyChainValidationService;
import hirs.attestationca.persist.service.SupplyChainValidationServiceImpl;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jce.provider.BouncyCastleProvider;
@ -28,7 +26,6 @@ import org.springframework.web.servlet.config.annotation.DefaultServletHandlerCo
import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
//import javax.sql.DataSource;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -90,11 +87,6 @@ public class PersistenceJPAConfig implements WebMvcConfigurer {
return entityManagerBean; return entityManagerBean;
} }
// @Bean
// public SupplyChainValidationService supplyChainValidationService() {
// return new SupplyChainValidationServiceImpl();
// }
@Bean @Bean
public DataSource dataSource() { public DataSource dataSource() {
final DriverManagerDataSource dataSource = new DriverManagerDataSource(); final DriverManagerDataSource dataSource = new DriverManagerDataSource();