Author: markt
Date: Fri May 15 10:39:45 2015
New Revision: 1679536
URL: http://svn.apache.org/r1679536
Log:
Fix a problem with SPNEGO auth and Java 8 update 40 onwards.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 15 10:39:45 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678701
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678701,1679534
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1679536&r1=1679535&r2=1679536&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
Fri May 15 10:39:45 2015
@@ -22,6 +22,7 @@ import java.security.Principal;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.util.LinkedHashMap;
import java.util.regex.Pattern;
import javax.security.auth.Subject;
@@ -91,6 +92,14 @@ public class SpnegoAuthenticator extends
}
}
+ private boolean applyJava8u40Fix = true;
+ public boolean getApplyJava8u40Fix() {
+ return applyJava8u40Fix;
+ }
+ public void setApplyJava8u40Fix(boolean applyJava8u40Fix) {
+ this.applyJava8u40Fix = applyJava8u40Fix;
+ }
+
@Override
protected String getAuthMethod() {
@@ -164,6 +173,10 @@ public class SpnegoAuthenticator extends
authorizationBC.getOffset(),
authorizationBC.getLength());
+ if (getApplyJava8u40Fix()) {
+ SpnegoTokenFixer.fix(decoded);
+ }
+
if (decoded.length == 0) {
if (log.isDebugEnabled()) {
log.debug(sm.getString(
@@ -331,4 +344,153 @@ public class SpnegoAuthenticator extends
return realm.authenticate(gssContext, storeDelegatedCredential);
}
}
+
+
+ /**
+ * This class implements a hack around an incompatibility between the
+ * SPNEGO implementation in Windows and the SPNEGO implementation in Java 8
+ * update 40 onwards. It was introduced by the change to fix this bug:
+ * https://bugs.openjdk.java.net/browse/JDK-8048194
+ * (note: the change applied is not the one suggested in the bug report)
+ * <p>
+ * It is not clear to me if Windows, Java or Tomcat is at fault here. I
+ * think it is Java but I could be wrong.
+ * <p>
+ * This hack works by re-ordering the list of mechTypes in the NegTokenInit
+ * token.
+ */
+ private static class SpnegoTokenFixer {
+
+ public static void fix(byte[] token) {
+ SpnegoTokenFixer fixer = new SpnegoTokenFixer(token);
+ fixer.fix();
+ }
+
+
+ private final byte[] token;
+ private int pos = 0;
+
+
+ private SpnegoTokenFixer(byte[] token) {
+ this.token = token;
+ }
+
+
+ // Fixes the token in-place
+ private void fix() {
+ /*
+ * Useful references:
+ * http://tools.ietf.org/html/rfc4121#page-5
+ * http://tools.ietf.org/html/rfc2743#page-81
+ * https://msdn.microsoft.com/en-us/library/ms995330.aspx
+ */
+
+ // Scan until we find the mech types list. If we find anything
+ // unexpected, abort the fix process.
+ if (!tag(0x60)) return;
+ if (!length()) return;
+ if (!oid("1.3.6.1.5.5.2")) return;
+ if (!tag(0xa0)) return;
+ if (!length()) return;
+ if (!tag(0x30)) return;
+ if (!length()) return;
+ if (!tag(0xa0)) return;
+ lengthAsInt();
+ if (!tag(0x30)) return;
+ // Now at the start of the mechType list.
+ // Read the mechTypes into an ordered set
+ int mechTypesLen = lengthAsInt();
+ int mechTypesStart = pos;
+ LinkedHashMap<String, int[]> mechTypeEntries = new
LinkedHashMap<>();
+ while (pos < mechTypesStart + mechTypesLen) {
+ int[] value = new int[2];
+ value[0] = pos;
+ String key = oidAsString();
+ value[1] = pos - value[0];
+ mechTypeEntries.put(key, value);
+ }
+ // Now construct the re-ordered mechType list
+ byte[] replacement = new byte[mechTypesLen];
+ int replacementPos = 0;
+
+ int[] first = mechTypeEntries.remove("1.2.840.113554.1.2.2");
+ if (first != null) {
+ System.arraycopy(token, first[0], replacement, replacementPos,
first[1]);
+ replacementPos += first[1];
+ }
+ for (int[] markers : mechTypeEntries.values()) {
+ System.arraycopy(token, markers[0], replacement,
replacementPos, markers[1]);
+ replacementPos += markers[1];
+ }
+
+ // Finally, replace the original mechType list with the re-ordered
+ // one.
+ System.arraycopy(replacement, 0, token, mechTypesStart,
mechTypesLen);
+ }
+
+
+ private boolean tag(int expected) {
+ return (token[pos++] & 0xFF) == expected;
+ }
+
+
+ private boolean length() {
+ // No need to retain the length - just need to consume it and make
+ // sure it is valid.
+ int len = lengthAsInt();
+ return pos + len == token.length;
+ }
+
+
+ private int lengthAsInt() {
+ int len = token[pos++] & 0xFF;
+ if (len > 127) {
+ int bytes = len - 128;
+ len = 0;
+ for (int i = 0; i < bytes; i++) {
+ len = len << 8;
+ len = len + (token[pos++] & 0xff);
+ }
+ }
+ return len;
+ }
+
+
+ private boolean oid(String expected) {
+ return expected.equals(oidAsString());
+ }
+
+
+ private String oidAsString() {
+ if (!tag(0x06)) return null;
+ StringBuilder result = new StringBuilder();
+ int len = lengthAsInt();
+ // First byte is special case
+ int v = token[pos++] & 0xFF;
+ int c2 = v % 40;
+ int c1 = (v - c2) / 40;
+ result.append(c1);
+ result.append('.');
+ result.append(c2);
+ int c = 0;
+ boolean write = false;
+ for (int i = 1; i < len; i++) {
+ int b = token[pos++] & 0xFF;
+ if (b > 127) {
+ b -= 128;
+ } else {
+ write = true;
+ }
+ c = c << 7;
+ c += b;
+ if (write) {
+ result.append('.');
+ result.append(c);
+ c = 0;
+ write = false;
+ }
+ }
+ return result.toString();
+ }
+ }
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1679536&r1=1679535&r2=1679536&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Fri May 15 10:39:45 2015
@@ -56,6 +56,13 @@
of a LegacyCookieProcessor to false only prevents HTTP separators from
being used without quotes. (markt)
</fix>
+ <fix>
+ Add a workaround for issues with SPNEGO authentication when running on
+ Java 8 update 40 and later. The workaround should be safe for earlier
+ Java versions but it can be disabled with the
+ <code>applyJava8u40Fix</code> attribute of the SPNEGO authenticator if
+ necessary. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml?rev=1679536&r1=1679535&r2=1679536&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml Fri May 15 10:39:45 2015
@@ -1438,6 +1438,17 @@
<attributes>
+ <attribute name="applyJava8u40Fix" required="false">
+ <p>A fix introduced in Java 8 update 40 (
+ <a
href="https://bugs.openjdk.java.net/browse/JDK-8048194";>JDK-8048194</a>)
+ onwards broke SPNEGO authentication for IE with Tomcat running on
+ Windows 2008 R2 servers. This option enables a work-around that allows
+ SPNEGO authentication to continue working. The work-around should not
+ impact other configurations so it is enabled by default. If necessary,
+ the workaround can be disabled by setting this attribute to
+ <code>false</code>.</p>
+ </attribute>
+
<attribute name="alwaysUseSession" required="false">
<p>Should a session always be used once a user is authenticated? This
may offer some performance benefits since the session can then be used
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
