Merge pull request #588 from nsacyber/v3_provision-init-setup-newcontext

Context change to enable path control [no ci]
This commit is contained in:
Cyrus 2023-09-15 16:12:34 -04:00 committed by GitHub
commit c67cdb2845
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 15 additions and 15 deletions

View File

@ -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 {
/**

View File

@ -24,7 +24,7 @@ import java.util.UUID;
*/
@Log4j2
@Controller
@RequestMapping("/certificate-details")
@RequestMapping("/HIRS_AttestationCAPortal/portal/certificate-details")
public class CertificateDetailsPageController extends PageController<CertificateDetailsPageParams> {
/**

View File

@ -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<NoPageParams> {
@Autowired(required = false)
private EntityManager entityManager;

View File

@ -43,7 +43,7 @@ import java.util.UUID;
*/
@Log4j2
@Controller
@RequestMapping("/devices")
@RequestMapping("/HIRS_AttestationCAPortal/portal/devices")
public class DevicePageController extends PageController<NoPageParams> {
private final DeviceRepository deviceRepository;

View File

@ -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<NoPageParams> {
@Autowired

View File

@ -14,7 +14,7 @@ import org.springframework.web.servlet.ModelAndView;
*/
@Controller
@Log4j2
@RequestMapping("/index")
@RequestMapping("/HIRS_AttestationCAPortal/portal/index")
public class IndexPageController extends PageController<NoPageParams> {
/**

View File

@ -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");

View File

@ -28,7 +28,7 @@ import java.util.Map;
*/
@Log4j2
@Controller
@RequestMapping("/policy")
@RequestMapping("/HIRS_AttestationCAPortal/portal/policy")
public class PolicyPageController extends PageController<NoPageParams> {
/**

View File

@ -46,7 +46,7 @@ import java.util.UUID;
*/
@Log4j2
@Controller
@RequestMapping("/rim-details")
@RequestMapping("/HIRS_AttestationCAPortal/portal/rim-details")
public class ReferenceManifestDetailsPageController extends PageController<ReferenceManifestDetailsPageParams> {
private final ReferenceManifestRepository referenceManifestRepository;

View File

@ -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<NoPageParams> {
private static final String LOG_FILE_PATTERN = "([^\\s]+(\\.(?i)(rimpcr|rimel|bin|log))$)";

View File

@ -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<NoPageParams> {
@Autowired(required = false)

View File

@ -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<NoPageParams> {
private final SupplyChainValidationSummaryRepository supplyChainValidatorSummaryRepository;

View File

@ -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

View File

@ -13,7 +13,7 @@
<c:set var="icons" value="${images}/icons" scope="session" />
<c:set var="common" value="${baseURL}/common" scope="session" />
<c:set var="lib" value="${baseURL}/lib" scope="session" />
<c:set var="portal" value="${baseURL}/portal" scope="session" />
<c:set var="portal" value="${baseURL}/HIRS_AttestationCAPortal/portal" scope="session" />
<c:set var="pagePath" value="${portal}/${page.prefixPath}${page.viewName}" scope="session" />
<c:set var="certificateRequest" value="${portal}/certificate-request" scope="session" />