From 7a2d4fba3544361c47c07a65f9c328de3a271896 Mon Sep 17 00:00:00 2001
From: Gcolon021 <34667267+Gcolon021@users.noreply.github.com>
Date: Fri, 13 Oct 2023 14:22:08 -0400
Subject: [PATCH] [ALS-5053] pen test medium stacktrace error (#85)
* [ALS-5000] Update maven compiler plugin
Maven compiler plugin has a dependency on log4j.
* [ALS-5053] Add error pages to web.xml
* [ALS-5053] Add value to server.xml
This value will intercept request processed by tomcat. I have disabled reports and show server information. This information should not be returned to the client.
---
client-api/pom.xml | 10 +-
docker/pic-sure-hpds/server.xml | 1 +
pom.xml | 654 ++++++++++++++--------------
war/pom.xml | 2 +-
war/src/main/webapp/WEB-INF/web.xml | 8 +
5 files changed, 338 insertions(+), 337 deletions(-)
diff --git a/client-api/pom.xml b/client-api/pom.xml
index ef02dcbb..06638ab2 100644
--- a/client-api/pom.xml
+++ b/client-api/pom.xml
@@ -6,21 +6,17 @@
edu.harvard.hms.dbmi.avillach.hpds
1.0-SNAPSHOT
-
edu.harvard.hms.dbmi.avillach.hpds
client-api
1.0-SNAPSHOT
-
client-api
http://www.example.com
-
UTF-8
1.7
1.7
-
junit
@@ -29,9 +25,9 @@
test
-
-
+
+
@@ -45,7 +41,7 @@
maven-compiler-plugin
- 3.8.0
+ 3.11.0
maven-surefire-plugin
diff --git a/docker/pic-sure-hpds/server.xml b/docker/pic-sure-hpds/server.xml
index ebf2760b..8b835346 100644
--- a/docker/pic-sure-hpds/server.xml
+++ b/docker/pic-sure-hpds/server.xml
@@ -27,6 +27,7 @@
+
diff --git a/pom.xml b/pom.xml
index ab958be4..879eeaf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,333 +1,329 @@
-
- 4.0.0
- edu.harvard.hms.dbmi.avillach.hpds
- pic-sure-hpds
- 1.0-SNAPSHOT
- pom
- pic-sure-hpds
-
- common
- service
- etl
- data
- docker
- processing
- war
- client-api
-
-
- 1.8.6
- UTF-8
- 1.4.10
-
-
-
- github
- GitHub HMS-DBMI Apache Maven Packages
- https://maven.pkg.github.com/hms-dbmi/pic-sure
-
- true
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 2.8
-
-
- copy-installed
- install
-
- copy
-
-
-
-
- ${project.groupId}
- ${project.artifactId}
- ${project.version}
- ${project.packaging}
-
-
- pic-sure-hpds
-
-
-
-
-
-
- org.apache.tomcat.maven
- tomcat7-maven-plugin
- 2.0
-
-
- default-cli
-
- run
-
-
- 13000
- /jaxrs-service
- true
- true
-
- -Xms256m -Xmx512m
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-eclipse-plugin
-
- [artifactId]-[version]
- true
- true
- 2.0
-
-
-
-
-
- maven-clean-plugin
- 3.1.0
-
-
-
- maven-resources-plugin
- 3.0.2
-
-
- maven-compiler-plugin
- 3.8.0
-
- 11
+
+ 4.0.0
+ edu.harvard.hms.dbmi.avillach.hpds
+ pic-sure-hpds
+ 1.0-SNAPSHOT
+ pom
+ pic-sure-hpds
+
+ common
+ service
+ etl
+ data
+ docker
+ processing
+ war
+ client-api
+
+
+ 1.8.6
+ UTF-8
+ 1.4.10
+
+
+
+ github
+ GitHub HMS-DBMI Apache Maven Packages
+ https://maven.pkg.github.com/hms-dbmi/pic-sure
+
+ true
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.8
+
+
+ copy-installed
+ install
+
+ copy
+
+
+
+
+ ${project.groupId}
+ ${project.artifactId}
+ ${project.version}
+ ${project.packaging}
+
+
+ pic-sure-hpds
+
+
+
+
+
+ org.apache.tomcat.maven
+ tomcat7-maven-plugin
+ 2.0
+
+
+ default-cli
+
+ run
+
+
+ 13000
+ /jaxrs-service
+ true
+ true
+
+ -Xms256m -Xmx512m
+
+
+
+
+
-
-
- maven-surefire-plugin
- 2.22.1
-
-
- maven-jar-plugin
- 3.0.2
-
-
- maven-install-plugin
- 2.5.2
-
-
- maven-deploy-plugin
- 2.8.2
-
-
-
- maven-site-plugin
- 3.7.1
-
-
- maven-project-info-reports-plugin
- 3.0.0
-
-
-
-
-
-
- junit
- junit
- test
-
-
- ch.qos.logback
- logback-core
-
-
- ch.qos.logback
- logback-classic
-
-
- org.slf4j
- slf4j-api
-
-
-
-
-
- edu.harvard.hms.dbmi.avillach.hpds
- common
- ${project.version}
-
-
- edu.harvard.hms.dbmi.avillach.hpds
- client-api
- ${project.version}
-
-
- edu.harvard.hms.dbmi.avillach.hpds
- service
- ${project.version}
-
-
- edu.harvard.hms.dbmi.avillach.hpds
- processing
- ${project.version}
-
-
- edu.harvard.hms.dbmi.avillach.hpds
- etl
- ${project.version}
-
-
- edu.harvard.hms.dbmi.avillach.hpds
- data
- ${project.version}
-
-
- edu.harvard.hms.dbmi.avillach
- pic-sure-resource-api
- 2.1.0-SNAPSHOT
-
-
- ch.qos.logback
- logback-core
- 1.2.9
-
-
- ch.qos.logback
- logback-classic
- 1.2.9
-
-
- org.slf4j
- slf4j-api
- 1.7.25
-
-
- com.google.guava
- guava
- 30.0-jre
-
-
- org.apache.commons
- commons-math3
- 3.6.1
-
-
- de.siegmar
- fastcsv
- 1.0.2
-
-
- org.apache.commons
- commons-csv
- 1.5
-
-
- commons-io
- commons-io
- 2.7
-
-
- org.apache.cxf
- cxf-rt-frontend-jaxrs
- 3.2.5
-
-
- org.apache.cxf
- cxf-rt-rs-client
- 3.2.5
-
-
- org.codehaus.jackson
- jackson-core-asl
- ${jackson.version}
-
-
- org.codehaus.jackson
- jackson-mapper-asl
- ${jackson.version}
-
-
- javax.xml.bind
- jaxb-api
- 2.3.0
-
-
- com.sun.xml.bind
- jaxb-core
- 2.3.0
-
-
- com.sun.xml.bind
- jaxb-impl
- 2.3.0
-
-
- javax.activation
- activation
- 1.1.1
-
-
- org.codehaus.jackson
- jackson-jaxrs
- ${jackson.version}
-
-
- org.springframework
- spring-web
- 4.3.20.RELEASE
-
-
- junit
- junit
- 4.13.1
- test
-
-
- org.mockito
- mockito-core
- 3.8.0
- test
-
-
- com.oracle.database.jdbc
- ojdbc10
- 19.17.0.0
-
-
- org.springframework
- spring-jdbc
- 5.1.1.RELEASE
-
-
- com.github.ben-manes.caffeine
- caffeine
- 3.1.1
-
-
- org.springframework
- spring-test
- 4.3.30.RELEASE
-
+
+
+ org.apache.maven.plugins
+ maven-eclipse-plugin
+
+ [artifactId]-[version]
+ true
+ true
+ 2.0
+
+
+
+
+ maven-clean-plugin
+ 3.1.0
+
+
+
+ maven-resources-plugin
+ 3.0.2
+
+
+ maven-compiler-plugin
+ 3.11.0
+
+ 11
+
+
+
+ maven-surefire-plugin
+ 2.22.1
+
+
+ maven-jar-plugin
+ 3.0.2
+
+
+ maven-install-plugin
+ 2.5.2
+
+
+ maven-deploy-plugin
+ 2.8.2
+
+
+
+ maven-site-plugin
+ 3.7.1
+
+
+ maven-project-info-reports-plugin
+ 3.0.0
+
+
+
+
+
+
+ junit
+ junit
+ test
+
+
+ ch.qos.logback
+ logback-core
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ org.slf4j
+ slf4j-api
+
+
+
+
+
+ edu.harvard.hms.dbmi.avillach.hpds
+ common
+ ${project.version}
+
+
+ edu.harvard.hms.dbmi.avillach.hpds
+ client-api
+ ${project.version}
+
+
+ edu.harvard.hms.dbmi.avillach.hpds
+ service
+ ${project.version}
+
+
+ edu.harvard.hms.dbmi.avillach.hpds
+ processing
+ ${project.version}
+
+
+ edu.harvard.hms.dbmi.avillach.hpds
+ etl
+ ${project.version}
+
+
+ edu.harvard.hms.dbmi.avillach.hpds
+ data
+ ${project.version}
+
+
+ edu.harvard.hms.dbmi.avillach
+ pic-sure-resource-api
+ 2.1.0-SNAPSHOT
+
+
+ ch.qos.logback
+ logback-core
+ 1.2.9
+
+
+ ch.qos.logback
+ logback-classic
+ 1.2.9
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.25
+
+
+ com.google.guava
+ guava
+ 30.0-jre
+
+
+ org.apache.commons
+ commons-math3
+ 3.6.1
+
+
+ de.siegmar
+ fastcsv
+ 1.0.2
+
+
+ org.apache.commons
+ commons-csv
+ 1.5
+
+
+ commons-io
+ commons-io
+ 2.7
+
+
+ org.apache.cxf
+ cxf-rt-frontend-jaxrs
+ 3.2.5
+
+
+ org.apache.cxf
+ cxf-rt-rs-client
+ 3.2.5
+
+
+ org.codehaus.jackson
+ jackson-core-asl
+ ${jackson.version}
+
+
+ org.codehaus.jackson
+ jackson-mapper-asl
+ ${jackson.version}
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.0
+
+
+ com.sun.xml.bind
+ jaxb-core
+ 2.3.0
+
+
+ com.sun.xml.bind
+ jaxb-impl
+ 2.3.0
+
+
+ javax.activation
+ activation
+ 1.1.1
+
+
+ org.codehaus.jackson
+ jackson-jaxrs
+ ${jackson.version}
+
+
+ org.springframework
+ spring-web
+ 4.3.20.RELEASE
+
+
+ junit
+ junit
+ 4.13.1
+ test
+
+
+ org.mockito
+ mockito-core
+ 3.8.0
+ test
+
+
+ com.oracle.database.jdbc
+ ojdbc10
+ 19.17.0.0
+
+
+ org.springframework
+ spring-jdbc
+ 5.1.1.RELEASE
+
+
+ com.github.ben-manes.caffeine
+ caffeine
+ 3.1.1
+
+
+ org.springframework
+ spring-test
+ 4.3.30.RELEASE
+
-
-
-
-
- github
- GitHub HMS-DBMI Apache Maven Packages
- https://maven.pkg.github.com/hms-dbmi/pic-sure-hpds
-
-
+
+
+
+
+ github
+ GitHub HMS-DBMI Apache Maven Packages
+ https://maven.pkg.github.com/hms-dbmi/pic-sure-hpds
+
+
\ No newline at end of file
diff --git a/war/pom.xml b/war/pom.xml
index 93c90038..42999b00 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -26,7 +26,7 @@
9
- 3.8.0
+ 3.11.0
org.apache.maven.plugins
diff --git a/war/src/main/webapp/WEB-INF/web.xml b/war/src/main/webapp/WEB-INF/web.xml
index 04fbef21..dfa1d2ee 100644
--- a/war/src/main/webapp/WEB-INF/web.xml
+++ b/war/src/main/webapp/WEB-INF/web.xml
@@ -31,4 +31,12 @@
true
+
+ 404
+ /error-404.html
+
+
+ 500
+ /error-500.html
+