Skip to content

Merging Private Branch contents from Kevin's Repo. #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Jun 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
31e221a
Fix javadoc botch forgetting to end italics. :(
kwwall Jun 10, 2025
21105d9
Added new static method 'isMethodExplicityEnabled' abd other minor Ja…
kwwall Jun 12, 2025
d7d6f1c
Added default exception message if one wasn't specified or was empty.
kwwall Jun 12, 2025
bab8f2c
Changed to use a more politically correct property name. But I still
kwwall Jun 12, 2025
c12a3e9
Add code to ensure that DefaultEncoder.encodeForSQL is explicity enab…
kwwall Jun 12, 2025
ece2dd3
Updating ESAPI util for ExplictMethod verify
jeremiahjstacey Jun 16, 2025
717d9f1
ESAPI methodEnabled Tests
jeremiahjstacey Jun 16, 2025
2474d44
Test Coverage
jeremiahjstacey Jun 17, 2025
05605c4
Merge pull request #1 from kwwall/disabledByDefault
kwwall Jun 20, 2025
8a1a297
Added deprecations, deprecation warnings, and other Javadoc refinements.
kwwall Jun 21, 2025
6b46be3
Reference specific CVE ID for logged message.
kwwall Jun 21, 2025
5f4ee1e
Change from EVENT_FAILURE to SECURITY_FAILURE, because it potentially…
kwwall Jun 22, 2025
aa1c9d9
Draft #2. Needs reviewd and completed. Track changes disabled.
kwwall Jun 22, 2025
d99aeb7
Apparently {@inheritDoc} doesn't inherit @Deprecated from interfaces.
kwwall Jun 22, 2025
e29159a
Draft 3 - completed several more sections.
kwwall Jun 22, 2025
2a35f3e
Minor corrections to ESAPI Security Bulletin #13.
kwwall Jun 23, 2025
cfbd981
Update to FileUploads 1.6.0 to address CVE-2025-48976, which likely d…
kwwall Jun 23, 2025
4074217
Implement java.util.function.Supplier since we are using Java 8 for a…
kwwall Jun 24, 2025
996ab1c
Incorporate Jeremiah Stacey's feedback.
kwwall Jun 25, 2025
bde9ba8
Incorporate Erika von Kampen's feedback.
kwwall Jun 25, 2025
c0284a3
Final draft of Security Bulletin #13 until CVE published. (Need to in…
kwwall Jun 25, 2025
ffe92f5
Fix minor typos.
kwwall Jun 26, 2025
96df2f5
Update versions of spotbugs-maven-plugin and maven-pmd-plugin.
kwwall Jun 26, 2025
cb39e42
Update previous release date.
kwwall Jun 26, 2025
4457c85
release info for 2.7.0.0
kwwall Jun 26, 2025
32a8fac
ESAPI 2.7.0.0 release notes.
kwwall Jun 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added documentation/ESAPI-security-bulletin13.odt
Binary file not shown.
Binary file added documentation/ESAPI-security-bulletin13.pdf
Binary file not shown.
194 changes: 194 additions & 0 deletions documentation/esapi4java-core-2.7.0.0-release-notes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
Release notes for ESAPI 2.7.0.0
Release date: 2025-06-27
Project leaders:
-Kevin W. Wall <kevin.w.wall@gmail.com>
-Matt Seil <matt.seil@owasp.org>

Previous release: ESAPI 2.6.2.0, 2025-06-02


Executive Summary: Important Things to Note for this Release
------------------------------------------------------------
This is a major patch release with the primary intent of addressing CVE-2025-5878. See https://nvd.nist.gov/vuln/detail/CVE-2025-5078 and especially Security Bulletin #13 (https://github.com/ESAPI/esapi-java-legacy/blob/develop/documentation/ESAPI-security-bulletin13.pdf) for details. It also updates Apache Commons FileUploads to 1.6.0 to address CVE-2025-48976. That CVE likely does not affect the HTTP.getFileUloads interfaces (which is the only methods that use that library), but we have not had time to analyze it fully given the CVE cited against ESAPI. Apache Commons BeanUtils was also updated to 1.11.0 to address CVE-2025-48734 which potentially could anyone using ESAPI's AccessController and has placed their access control policy in a place where an attacker may be overwrite it. That is highly unlikely, but better safe than sorry.

This 2.7.0.0 release also has significant Javadoc clarifications. Security Bulletin #13 explains why.

If you fail to read Security Bulletin #13 and you are affected by CVE-2025-5878, your application using ESAPI 2.7.0.0 will not work, so it is VERY IMPORTANT that you read that.

Notes if you are NOT updating from the immediate previous release. release 2.6.2.0:
* You need to read through the series of release notes FIRST, going in order.
* For example, if you were updating from an older ESAPI release (say, 2.3.0.0), you should go back and FIRST read all the subsequent release notes in turn. For instance, if you are currently on release 2.3.0.0 and upgrading to (say) release 2.x.y.z, you should MINIMALLY read the sections "Changes Requiring Special Attention" in each of the subsequent release notes. So, going from release 2.3.0.0 to 2.x.y.z, you should in turn, read:

esapi4java-core-2.4.0.0-release-notes.txt
esapi4java-core-2.5.0.0-release-notes.txt
esapi4java-core-2.5.1.0-release-notes.txt
esapi4java-core-2.5.2.0-release-notes.txt
...etc., up through the current set of release notes...
esapi4java-core-2.x.y.z-release-notes.txt

in that order. YOU HAVE BEEN WARNED!!! (These release notes are too large to put all this in a given document; very few read them thoroughly as it is.)

If your SCA tool is reporting any CVE from a direct or transitive dependency in ESAPI, before reporting it as an GitHub issue, please make sure that you review the vulnerability analysis written up in https://github.com/ESAPI/esapi-java-legacy/blob/develop/Vulnerability-Summary.md. Please email us or contact us in our GitHub Discussions page if you have questions about this. See also the SECURITY.md file to report any security issues with ESAPI.

You are encouraged to review the vulnerability analysis written up in https://github.com/ESAPI/esapi-java-legacy/blob/develop/Vulnerability-Summary.md and email us or contact us in our GitHub Discussions page if you have questions.


=================================================================================================================

Basic ESAPI facts
-----------------

ESAPI 2.6.2.0 release:
207 Java source files
4312 JUnit tests in 133 Java source files

ESAPI 2.7.0.0 release:
208 Java source files
4312 JUnit tests in 134 Java source files

1 GitHub Issues closed in this release, including those we've decided not to fix (marked 'wontfix' and 'falsepositive').
(Reference: https://github.com/ESAPI/esapi-java-legacy/issues?q=is%3Aissue+state%3Aclosed+updated%3A%3E%3D2025-06-02)

Issue # GitHub Issue Title
----------------------------------------------------------------------------------------------
883 Update Apache Commons BeanUtils from 1.9.4 to 1.11.0 to address CVE-2025-48734

-----------------------------------------------------------------------------

Changes Requiring Special Attention

-----------------------------------------------------------------------------

IMPORTANT: Read Security Bulletin #13 (https://github.com/ESAPI/esapi-java-legacy/blob/develop/documentation/ESAPI-security-bulletin13.pdf)

Important JDK Support Announcement
* ESAPI 2.3.0.0 was the last Java release to support Java 7. ESAPI 2.4.0 requires using Java 8 or later. See the ESAPI 2.4.0.0 release notes (https://github.com/ESAPI/esapi-java-legacy/blob/develop/documentation/esapi4java-core-2.4.0.0-release-notes.txt) for details as to the reason.
- This means if your project requires Java 7, you must use ESAPI 2.3.0.0 or earlier.

Important ESAPI Logging Changes

* Since ESAPI 2.5.0.0, support for logging directly via Log4J 1 has been removed. (This was two years after it having first been deprecated.) Thus, you only choice of ESAPI logging are
- java.util.logging (JUL), which as been the default since ESAPI 2.2.1.0.
* Set ESAPI.Logger=org.owasp.esapi.logging.java.JavaLogFactory in your ESAPI.properties file.
- SLF4J (which your choice of supported SLF4J logging implementation)
* Set ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory in your ESAPI.properties file.
* Logger configuration notes - If you are migrating from prior to ESAPI 2.2.1.1, you will need to update your ESAPI.properties file as logging-related configuration as per the ESAPI 2.2.1.1 release notes, which may be found at:
https://github.com/ESAPI/esapi-java-legacy/blob/develop/documentation/esapi4java-core-2.2.1.1-release-notes.txt#L39-L78

If you use ESAPI 2.5.0.0 or later, you will get an ClassNotFoundException as the root cause if you still have your ESAPI.Logger property set to use Log4J because the org.owasp.esapi.logger.log4j.Log4JFactory class has been completely removed from the ESAPI jar. If you are dead set on continuing to use Log4J 1, you ought to be able to do so via SLF4J. The set up for Log4J 1 (which has not be tested), should be similar to configure ESAPI to use SLF4J with Log4J 2 as described here:
https://github.com/ESAPI/esapi-java-legacy/wiki/Using-ESAPI-with-SLF4J#slf4j-using-log4j-2x

-----------------------------------------------------------------------------

Remaining Known Issues / Problems

-----------------------------------------------------------------------------
None known, other than the remaining open issues on GitHub.

-----------------------------------------------------------------------------

Other changes in this release, some of which not tracked via GitHub issues

-----------------------------------------------------------------------------

* Changes since last release 2.6.2.0 and 2.7.0.0, i.e., changes between 2025-06-02 and 2025-06-27).

Note: I am no longer going to provide the 'Developer Activity Report' that I used to this manually create in tabular form. This is in part because I use to use 'mvn site' to assist with its creation, but neither the 'Developer Activity' nor 'File Activity' sections of the 'mvn site' output is currently working.

That said, I don't care as this was always a major PITA and I think it had dubious value to start with.

Therefore, I am replacing it to a stock GitHub tag comparison of the current and previous release, which I can automate.

Please see,

https://github.com/ESAPI/esapi-java-legacy/compare/esapi-...esapi-2.7.0.0

for details. It contains all the information that the previous 'Developer Activity Reports' did and then some.

-----------------------------------------------------------------------------

CHANGELOG: Create your own. May I suggest:

git log --stat --since=2025-06-02 --reverse --pretty=medium

which will show all the commits since just after the previous (2.6.2.0) release.

Alternately, you can download the most recent ESAPI source and run

mvn site

which will create a CHANGELOG file named 'target/site/changelog.html'


-----------------------------------------------------------------------------

Direct and Transitive Runtime and Test Dependencies:

$ mvn -B dependency:tree
...
[INFO] --- maven-dependency-plugin:3.8.1:tree (default-cli) @ esapi ---
[INFO] org.owasp.esapi:esapi:jar:2.7.0.0-SNAPSHOT
[INFO] +- javax.servlet:javax.servlet-api:jar:3.1.0:provided
[INFO] +- javax.servlet.jsp:javax.servlet.jsp-api:jar:2.3.3:provided
[INFO] +- xom:xom:jar:1.3.9:compile
[INFO] +- commons-beanutils:commons-beanutils:jar:1.11.0:compile
[INFO] | +- commons-logging:commons-logging:jar:1.3.5:compile
[INFO] | \- commons-collections:commons-collections:jar:3.2.2:compile
[INFO] +- commons-configuration:commons-configuration:jar:1.10:compile
[INFO] +- commons-lang:commons-lang:jar:2.6:compile
[INFO] +- commons-fileupload:commons-fileupload:jar:1.6.0:compile
[INFO] +- org.apache.commons:commons-collections4:jar:4.5.0-M2:compile
[INFO] +- org.apache-extras.beanshell:bsh:jar:2.0b6:compile
[INFO] +- org.owasp.antisamy:antisamy:jar:1.7.8:compile
[INFO] | +- commons-io:commons-io:jar:2.19.0:compile
[INFO] | +- org.apache.httpcomponents.client5:httpclient5:jar:5.4.4:compile
[INFO] | | \- org.apache.httpcomponents.core5:httpcore5-h2:jar:5.3.4:compile
[INFO] | +- org.apache.httpcomponents.core5:httpcore5:jar:5.3.4:compile
[INFO] | +- org.apache.xmlgraphics:batik-css:jar:1.19:compile
[INFO] | | +- org.apache.xmlgraphics:batik-shared-resources:jar:1.19:compile
[INFO] | | +- org.apache.xmlgraphics:batik-util:jar:1.19:compile
[INFO] | | | +- org.apache.xmlgraphics:batik-constants:jar:1.19:compile
[INFO] | | | \- org.apache.xmlgraphics:batik-i18n:jar:1.19:compile
[INFO] | | \- org.apache.xmlgraphics:xmlgraphics-commons:jar:2.11:compile
[INFO] | +- org.htmlunit:neko-htmlunit:jar:4.11.0:compile
[INFO] | +- xerces:xercesImpl:jar:2.12.2:compile
[INFO] | \- xml-apis:xml-apis-ext:jar:1.3.04:compile
[INFO] +- org.slf4j:slf4j-api:jar:2.0.16:compile
[INFO] +- xml-apis:xml-apis:jar:1.4.01:compile
[INFO] +- com.github.spotbugs:spotbugs-annotations:jar:4.9.3:compile (optional)
[INFO] | \- com.google.code.findbugs:jsr305:jar:3.0.2:compile (optional)
[INFO] +- commons-codec:commons-codec:jar:1.17.1:test
[INFO] +- junit:junit:jar:4.13.2:test
[INFO] +- org.bouncycastle:bcprov-jdk18on:jar:1.78.1:test
[INFO] +- org.hamcrest:hamcrest-core:jar:2.2:test
[INFO] | \- org.hamcrest:hamcrest:jar:2.2:test
[INFO] +- org.powermock:powermock-api-mockito2:jar:2.0.9:test
[INFO] | \- org.powermock:powermock-api-support:jar:2.0.9:test
[INFO] +- org.mockito:mockito-core:jar:3.12.4:test
[INFO] | +- net.bytebuddy:byte-buddy:jar:1.11.13:test
[INFO] | +- net.bytebuddy:byte-buddy-agent:jar:1.11.13:test
[INFO] | \- org.objenesis:objenesis:jar:3.2:test
[INFO] +- org.powermock:powermock-core:jar:2.0.9:test
[INFO] | \- org.javassist:javassist:jar:3.27.0-GA:test
[INFO] +- org.powermock:powermock-module-junit4:jar:2.0.9:test
[INFO] | \- org.powermock:powermock-module-junit4-common:jar:2.0.9:test
[INFO] +- org.powermock:powermock-reflect:jar:2.0.9:test
[INFO] \- org.openjdk.jmh:jmh-core:jar:1.37:test
[INFO] +- net.sf.jopt-simple:jopt-simple:jar:5.0.4:test
[INFO] \- org.apache.commons:commons-math3:jar:3.6.1:test
[INFO] ------------------------------------------------------------------------

-----------------------------------------------------------------------------

Acknowledgments:
A whole bunch of folks to thank this time:
- Longlong Gong (uglory-gll) - The security researcher who discovered the vulnerability that became CVE-2025-5878.
Most people curse those who find CVEs in their software, but because of Longlong's work, we feel ESAPI is a better library and has a more secure future. (See the "Lessons Learned" section of Security Bulletin #13 for an explanation.)
- The VulDB CNA team.
- In no particular order, Jeff Williams, Matt Seil, Jeremiah Stacey, Erika von Kampen, Bill Sempf, and Ken Pyle, all who provided me with excellent feedback on the documentation and code changes and help me keep my sanity for the past 3 weeks.
- My wife for tolerating my long evenings for the past 3 weeks. I know I've been cranky and it's been stressful for us both, but thanks for being so understanding and supportive.
- And finally, thanks to all the ESAPI users who make this worthwhile. This is for you.

A special thanks to the ESAPI community from the ESAPI project co-leaders:
Kevin W. Wall (kwwall) <== The irresponsible party for these release notes!
Matt Seil (xeno6696)
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@
<version.fluido>2.0.0-M11</version.fluido> <!-- Version 2.1.0 is available, but fails with this min Maven. -->
<version.powermock>2.0.9</version.powermock>
<version.spotbugs>4.9.3</version.spotbugs>
<version.spotbugs.maven>4.9.3.0</version.spotbugs.maven>
<version.spotbugs.maven>4.9.3.1</version.spotbugs.maven>
<version.surefire>3.5.3</version.surefire>
<project.java.target>1.8</project.java.target>
<!-- TODO: Be sure to update. Should be date of previous official release -->
<!-- Exact date in the form 'yyyy-dd-yy 00:00:00' should be used. You can find the previous release date -->
<!-- in the previous release notes file under the 'documentation/' directory. -->
<date.prev_release>2025-05-19 00:00:00</date.prev_release>
<date.prev_release>2025-06-02 00:00:00</date.prev_release>
</properties>

<dependencies>
Expand Down Expand Up @@ -221,7 +221,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.5</version>
<version>1.6.0</version>
<exclusions>
<!-- excluded because we directly import newer version below. -->
<exclusion>
Expand Down Expand Up @@ -664,7 +664,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.26.0</version>
<version>3.27.0</version>
</plugin>

<plugin>
Expand Down
14 changes: 14 additions & 0 deletions scripts/vars.2.7.0.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Do NOT edit this file directly. It will be created by the new createVarsFile.sh script,
# which should be run prior to the newReleaseNotes.sh script.

# ESAPI (new / current) version
VERSION=2.7.0.0

# Previous ESAPI version
PREV_VERSION=2.6.2.0

# Release date of current version in yyyy-mm-dd format
YYYY_MM_DD_RELEASE_DATE=2025-06-27

# Previous ESAPI release date in same format
PREV_RELEASE_DATE=2025-06-02
Loading