This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch jessie in repository tomcat8.
commit d3dd01d8b78d77f32bcbe58db6e9d2010e231621 Author: Emmanuel Bourg <[email protected]> Date: Fri Oct 28 01:16:28 2016 +0200 Moved the generated catalina.policy file to /var/lib/tomcat8/policy --- debian/changelog | 10 +++++++--- .../0009-Use-java.security.policy-file-in-catalina.sh.patch | 6 +++--- debian/tomcat8.init | 4 +++- debian/tomcat8.postrm.in | 1 + 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index b490eec..f5d2171 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ tomcat8 (8.0.14-1+deb8u4) UNRELEASED; urgency=medium - * CVE-2016-1240 follow-up: Fixed a race condition in the init.d script - that could be exploited to make any existing file writable by the tomcat - user. Thanks to Paul Szabo for the report and the fix. + * CVE-2016-1240 follow-up: + - The previous init.d fix was vulnerable to a race condition that could + be exploited to make any existing file writable by the tomcat user. + Thanks to Paul Szabo for the report and the fix. + - The catalina.policy file generated on startup was affected by a similar + vulnerability that could be exploited to overwrite any file on the system. + Thanks to Paul Szabo for the report. -- Emmanuel Bourg <[email protected]> Sat, 12 Nov 2016 00:34:05 +0100 diff --git a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch index 71af131..cc54db4 100644 --- a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch +++ b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch @@ -14,7 +14,7 @@ Forwarded: not-needed -sourcepath "$CATALINA_HOME"/../../java \ -Djava.security.manager \ - -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \ -+ -Djava.security.policy=="$CATALINA_BASE"/work/catalina.policy \ ++ -Djava.security.policy=="$CATALINA_BASE"/policy/catalina.policy \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ @@ -23,7 +23,7 @@ Forwarded: not-needed -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ - -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ -+ -Djava.security.policy=="\"$CATALINA_BASE/work/catalina.policy\"" \ ++ -Djava.security.policy=="\"$CATALINA_BASE/policy/catalina.policy\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ @@ -32,7 +32,7 @@ Forwarded: not-needed -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ - -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ -+ -Djava.security.policy=="\"$CATALINA_BASE/work/catalina.policy\"" \ ++ -Djava.security.policy=="\"$CATALINA_BASE/policy/catalina.policy\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ diff --git a/debian/tomcat8.init b/debian/tomcat8.init index 4daebf5..9558bf7 100644 --- a/debian/tomcat8.init +++ b/debian/tomcat8.init @@ -118,7 +118,7 @@ if [ ! -f "$CATALINA_HOME/bin/bootstrap.jar" ]; then exit 1 fi -POLICY_CACHE="$CATALINA_BASE/work/catalina.policy" +POLICY_CACHE="$CATALINA_BASE/policy/catalina.policy" if [ -z "$CATALINA_TMPDIR" ]; then CATALINA_TMPDIR="$JVM_TMP" @@ -202,6 +202,8 @@ case "$1" in # Regenerate POLICY_CACHE file umask 022 + rm -rf "$CATALINA_BASE/policy" + mkdir "$CATALINA_BASE/policy" echo "// AUTO-GENERATED FILE from /etc/tomcat8/policy.d/" \ > "$POLICY_CACHE" echo "" >> "$POLICY_CACHE" diff --git a/debian/tomcat8.postrm.in b/debian/tomcat8.postrm.in index 9343591..d25ce11 100644 --- a/debian/tomcat8.postrm.in +++ b/debian/tomcat8.postrm.in @@ -8,6 +8,7 @@ LR_CONFFILE=/etc/logrotate.d/tomcat8 # Remove cached files and auto-generated catalina.policy rm -rf /var/cache/tomcat8/* +rm -rf /var/lib/tomcat8/policy case "$1" in remove) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
