From a56fd3a8fa16c0ff20f5881b71e46019a742342b Mon Sep 17 00:00:00 2001 From: iadgovuser29 <33426478+iadgovuser29@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:34:15 -0400 Subject: [PATCH] Context change to enable path control [no ci] --- .../persist/RestfulAttestationCertificateAuthority.java | 2 +- .../page/controllers/CertificateDetailsPageController.java | 2 +- .../portal/page/controllers/CertificatePageController.java | 2 +- .../portal/page/controllers/DevicePageController.java | 2 +- .../portal/page/controllers/HelpPageController.java | 2 +- .../portal/page/controllers/IndexPageController.java | 2 +- .../portal/page/controllers/LombokLoggingController.java | 2 +- .../portal/page/controllers/PolicyPageController.java | 2 +- .../controllers/ReferenceManifestDetailsPageController.java | 2 +- .../page/controllers/ReferenceManifestPageController.java | 2 +- .../portal/page/controllers/RimDatabasePageController.java | 2 +- .../page/controllers/ValidationReportsPageController.java | 2 +- .../src/main/resources/application.properties | 4 ++-- .../src/main/webapp/WEB-INF/tags/page.tag | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/RestfulAttestationCertificateAuthority.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/RestfulAttestationCertificateAuthority.java index 7e850645..ced6614d 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/RestfulAttestationCertificateAuthority.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/RestfulAttestationCertificateAuthority.java @@ -31,7 +31,7 @@ import java.security.cert.X509Certificate; @PropertySource(value = "file:/etc/hirs/aca/application.properties", ignoreResourceNotFound = true) @RestController -@RequestMapping("/client") +@RequestMapping("/HIRS_AttestationCA") public class RestfulAttestationCertificateAuthority extends AttestationCertificateAuthority implements RestfulInterface { /** diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateDetailsPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateDetailsPageController.java index e9a76940..cde878d4 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateDetailsPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateDetailsPageController.java @@ -24,7 +24,7 @@ import java.util.UUID; */ @Log4j2 @Controller -@RequestMapping("/certificate-details") +@RequestMapping("/HIRS_AttestationCAPortal/portal/certificate-details") public class CertificateDetailsPageController extends PageController { /** diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java index 674d6c7f..fd4ac806 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java @@ -68,7 +68,7 @@ import java.util.zip.ZipOutputStream; */ @Log4j2 @Controller -@RequestMapping("/certificate-request") +@RequestMapping("/HIRS_AttestationCAPortal/portal/certificate-request") public class CertificatePageController extends PageController { @Autowired(required = false) private EntityManager entityManager; diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/DevicePageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/DevicePageController.java index b596e788..a7a479da 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/DevicePageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/DevicePageController.java @@ -43,7 +43,7 @@ import java.util.UUID; */ @Log4j2 @Controller -@RequestMapping("/devices") +@RequestMapping("/HIRS_AttestationCAPortal/portal/devices") public class DevicePageController extends PageController { private final DeviceRepository deviceRepository; diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/HelpPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/HelpPageController.java index c9b97938..0f874f93 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/HelpPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/HelpPageController.java @@ -20,7 +20,7 @@ import static hirs.attestationca.portal.page.Page.HELP; */ @Log4j2 @Controller -@RequestMapping("/help") +@RequestMapping("/HIRS_AttestationCAPortal/portal/help") public class HelpPageController extends PageController { @Autowired diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/IndexPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/IndexPageController.java index 509a7231..d1430342 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/IndexPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/IndexPageController.java @@ -14,7 +14,7 @@ import org.springframework.web.servlet.ModelAndView; */ @Controller @Log4j2 -@RequestMapping("/index") +@RequestMapping("/HIRS_AttestationCAPortal/portal/index") public class IndexPageController extends PageController { /** diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/LombokLoggingController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/LombokLoggingController.java index 197ecc42..f1e9bbe8 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/LombokLoggingController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/LombokLoggingController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController; @Log4j2 public class LombokLoggingController { - @RequestMapping("/lombok") + @RequestMapping("/HIRS_AttestationCAPortal/portal/lombok") public String index() { log.trace("A TRACE Message"); log.debug("A DEBUG Message"); diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PolicyPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PolicyPageController.java index 4e2f4a68..69bccb23 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PolicyPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PolicyPageController.java @@ -28,7 +28,7 @@ import java.util.Map; */ @Log4j2 @Controller -@RequestMapping("/policy") +@RequestMapping("/HIRS_AttestationCAPortal/portal/policy") public class PolicyPageController extends PageController { /** diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java index a2ee5373..c2947c68 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java @@ -46,7 +46,7 @@ import java.util.UUID; */ @Log4j2 @Controller -@RequestMapping("/rim-details") +@RequestMapping("/HIRS_AttestationCAPortal/portal/rim-details") public class ReferenceManifestDetailsPageController extends PageController { private final ReferenceManifestRepository referenceManifestRepository; diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java index d757e251..e8c75606 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java @@ -66,7 +66,7 @@ import java.util.zip.ZipOutputStream; */ @Log4j2 @Controller -@RequestMapping("/reference-manifests") +@RequestMapping("/HIRS_AttestationCAPortal/portal/reference-manifests") public class ReferenceManifestPageController extends PageController { private static final String LOG_FILE_PATTERN = "([^\\s]+(\\.(?i)(rimpcr|rimel|bin|log))$)"; diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java index b7aef697..0a2e76ed 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java @@ -39,7 +39,7 @@ import java.lang.ref.Reference; */ @Log4j2 @Controller -@RequestMapping("/rim-database") +@RequestMapping("/HIRS_AttestationCAPortal/portal/rim-database") public class RimDatabasePageController extends PageController { @Autowired(required = false) diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ValidationReportsPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ValidationReportsPageController.java index 9106180f..590a5030 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ValidationReportsPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ValidationReportsPageController.java @@ -61,7 +61,7 @@ import java.util.regex.Pattern; */ @Log4j2 @Controller -@RequestMapping("/validation-reports") +@RequestMapping("/HIRS_AttestationCAPortal/portal/validation-reports") public class ValidationReportsPageController extends PageController { private final SupplyChainValidationSummaryRepository supplyChainValidatorSummaryRepository; diff --git a/HIRS_AttestationCAPortal/src/main/resources/application.properties b/HIRS_AttestationCAPortal/src/main/resources/application.properties index 0d840bfc..17515454 100644 --- a/HIRS_AttestationCAPortal/src/main/resources/application.properties +++ b/HIRS_AttestationCAPortal/src/main/resources/application.properties @@ -20,8 +20,8 @@ aca.certificates.validity = 3652 server.tomcat.additional-tld-skip-patterns=jakarta.persistence-api*.jar, jakarta.xml.bind-api*.jar, txw2*.jar, *commons*.jar, *annotations*.jar, *checker*.jar, *lombok*.jar, *jsr*.jar, *guava*.jar, *access*.jar, *activation*.jar, *bcprov*.jar, *bcmail*.jar, *bcutil*.jar, *bcpkix*.jar, *json*.jar server.tomcat.basedir=/opt/embeddedtomcat server.servlet.register-default-servlet=true -server.servlet.context-path=/HIRS_AttestationCAPortal -spring.mvc.servlet.path=/portal +server.servlet.context-path=/ +spring.mvc.servlet.path=/ server.tomcat.accesslog.enabled=true server.tomcat.accesslog.directory=/var/log/hirs diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag index bacdde8e..d4807d91 100644 --- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag +++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag @@ -13,7 +13,7 @@ - +