Author: markt
Date: Mon Feb 13 14:39:35 2017
New Revision: 1782782
URL: http://svn.apache.org/viewvc?rev=1782782&view=rev
Log:
Refactor default JASPIC AuthConfigFactory implementation and implement
notifications.
Added:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
- copied unchanged from r1782775,
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 13 14:39:35 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,1768651,1768762,1768922,1769191,176
9263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,
1778348,1778404,1778424,1778426,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,1768651,1768762,1768922,1769191,176
9263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,
1778348,1778404,1778424,1778426,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java?rev=1782782&r1=1782781&r2=1782782&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
Mon Feb 13 14:39:35 2017
@@ -22,7 +22,6 @@ import java.lang.reflect.InvocationTarge
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -52,7 +51,18 @@ public class AuthConfigFactoryImpl exten
private static final String[] EMPTY_STRING_ARRAY = new String[0];
- private final Map<String,RegistrationContextImpl> registrations = new
ConcurrentHashMap<>();
+ private static String DEFAULT_REGISTRATION_ID = getRegistrationID(null,
null);
+
+ private final Map<String,RegistrationContextImpl>
layerAppContextRegistrations =
+ new ConcurrentHashMap<>();
+ private final Map<String,RegistrationContextImpl> appContextRegistrations =
+ new ConcurrentHashMap<>();
+ private final Map<String,RegistrationContextImpl> layerRegistrations =
+ new ConcurrentHashMap<>();
+ // Note: Although there will only ever be a maximum of one entry in this
+ // Map, use a ConcurrentHashMap for consistency
+ private volatile Map<String,RegistrationContextImpl> defaultRegistration =
+ new ConcurrentHashMap<>(1);
public AuthConfigFactoryImpl() {
@@ -63,10 +73,12 @@ public class AuthConfigFactoryImpl exten
@Override
public AuthConfigProvider getConfigProvider(String layer, String
appContext,
RegistrationListener listener) {
- String registrationID = getRegistrationID(layer, appContext);
- RegistrationContextImpl registrationContext =
registrations.get(registrationID);
+ RegistrationContextImpl registrationContext =
+ findRegistrationContextImpl(layer, appContext);
if (registrationContext != null) {
- registrationContext.addListener(null);
+ RegistrationListenerWrapper wrapper = new
RegistrationListenerWrapper(
+ layer, appContext, listener);
+ registrationContext.addListener(wrapper);
return registrationContext.getProvider();
}
return null;
@@ -109,8 +121,9 @@ public class AuthConfigFactoryImpl exten
}
String registrationID = getRegistrationID(layer, appContext);
- registrations.put(registrationID,
- new RegistrationContextImpl(layer, appContext, description,
true, provider, properties));
+ RegistrationContextImpl registrationContextImpl = new
RegistrationContextImpl(
+ layer, appContext, description, true, provider, properties);
+ addRegistrationContextImpl(layer, appContext, registrationID,
registrationContextImpl);
return registrationID;
}
@@ -123,22 +136,115 @@ public class AuthConfigFactoryImpl exten
provider.getClass().getName(), layer, appContext));
}
String registrationID = getRegistrationID(layer, appContext);
- registrations.put(registrationID,
- new RegistrationContextImpl(layer, appContext, description,
false, provider, null));
+ RegistrationContextImpl registrationContextImpl = new
RegistrationContextImpl(
+ layer, appContext, description, false, provider, null);
+ addRegistrationContextImpl(layer, appContext, registrationID,
registrationContextImpl);
return registrationID;
}
+ private void addRegistrationContextImpl(String layer, String appContext,
+ String registrationID, RegistrationContextImpl
registrationContextImpl) {
+ RegistrationContextImpl previous = null;
+
+ // Add the registration, noting any registration it replaces
+ if (layer != null && appContext != null) {
+ previous = layerAppContextRegistrations.put(registrationID,
registrationContextImpl);
+ } else if (layer == null && appContext != null) {
+ previous = appContextRegistrations.put(registrationID,
registrationContextImpl);
+ } else if (layer != null && appContext == null) {
+ previous = layerRegistrations.put(registrationID,
registrationContextImpl);
+ } else {
+ previous = defaultRegistration.put(registrationID,
registrationContextImpl);
+ }
+
+ if (previous == null) {
+ // No match with previous registration so need to check listeners
+ // for all less specific registrations to see if they need to be
+ // notified of this new registration. That there is no exact match
+ // with a previous registration allows a few short-cuts to be taken
+ if (layer != null && appContext != null) {
+ // Need to check existing appContext registrations
+ // (and layer and default)
+ // appContext must match
+ RegistrationContextImpl registration =
+ appContextRegistrations.get(getRegistrationID(null,
appContext));
+ if (registration != null) {
+ for (RegistrationListenerWrapper wrapper :
registration.listeners) {
+ if (layer.equals(wrapper.getMessageLayer()) &&
+ appContext.equals(wrapper.getAppContext())) {
+ registration.listeners.remove(wrapper);
+ wrapper.listener.notify(wrapper.messageLayer,
wrapper.appContext);
+ }
+ }
+ }
+ }
+ if (appContext != null) {
+ // Need to check existing layer registrations
+ // (and default)
+ // Need to check registrations for all layers
+ for (RegistrationContextImpl registration :
layerRegistrations.values()) {
+ for (RegistrationListenerWrapper wrapper :
registration.listeners) {
+ if (appContext.equals(wrapper.getAppContext())) {
+ registration.listeners.remove(wrapper);
+ wrapper.listener.notify(wrapper.messageLayer,
wrapper.appContext);
+ }
+ }
+ }
+ }
+ if (layer != null || appContext != null) {
+ // Need to check default
+ for (RegistrationContextImpl registration :
defaultRegistration.values()) {
+ for (RegistrationListenerWrapper wrapper :
registration.listeners) {
+ if (appContext != null &&
appContext.equals(wrapper.getAppContext()) ||
+ layer != null &&
layer.equals(wrapper.getMessageLayer())) {
+ registration.listeners.remove(wrapper);
+ wrapper.listener.notify(wrapper.messageLayer,
wrapper.appContext);
+ }
+ }
+ }
+ }
+ } else {
+ // Replaced an existing registration so need to notify those
listeners
+ for (RegistrationListenerWrapper wrapper : previous.listeners) {
+ previous.listeners.remove(wrapper);
+ wrapper.listener.notify(wrapper.messageLayer,
wrapper.appContext);
+ }
+ }
+ }
+
+
@Override
public boolean removeRegistration(String registrationID) {
- return registrations.remove(registrationID) != null;
+ RegistrationContextImpl registration = null;
+ if (DEFAULT_REGISTRATION_ID.equals(registrationID)) {
+ registration = defaultRegistration.remove(registrationID);
+ }
+ if (registration == null) {
+ registration = layerAppContextRegistrations.remove(registrationID);
+ }
+ if (registration == null) {
+ registration = appContextRegistrations.remove(registrationID);
+ }
+ if (registration == null) {
+ registration = layerRegistrations.remove(registrationID);
+ }
+
+ if (registration == null) {
+ return false;
+ } else {
+ for (RegistrationListenerWrapper wrapper : registration.listeners)
{
+ wrapper.getListener().notify(wrapper.getMessageLayer(),
wrapper.getAppContext());
+ }
+ return true;
+ }
}
@Override
public String[] detachListener(RegistrationListener listener, String
layer, String appContext) {
String registrationID = getRegistrationID(layer, appContext);
- RegistrationContextImpl registrationContext =
registrations.get(registrationID);
+ RegistrationContextImpl registrationContext =
findRegistrationContextImpl(layer, appContext);
if (registrationContext.removeListener(listener)) {
return new String[] { registrationID };
}
@@ -148,23 +254,47 @@ public class AuthConfigFactoryImpl exten
@Override
public String[] getRegistrationIDs(AuthConfigProvider provider) {
+ List<String> result = new ArrayList<>();
if (provider == null) {
- return registrations.keySet().toArray(EMPTY_STRING_ARRAY);
+ result.addAll(layerAppContextRegistrations.keySet());
+ result.addAll(appContextRegistrations.keySet());
+ result.addAll(layerRegistrations.keySet());
+ if (defaultRegistration != null) {
+ result.add(DEFAULT_REGISTRATION_ID);
+ }
} else {
- List<String> results = new ArrayList<>();
- for (Entry<String,RegistrationContextImpl> entry :
registrations.entrySet()) {
- if (provider.equals(entry.getValue().getProvider())) {
- results.add(entry.getKey());
- }
+ findProvider(provider, layerAppContextRegistrations, result);
+ findProvider(provider, appContextRegistrations, result);
+ findProvider(provider, layerRegistrations, result);
+ findProvider(provider, defaultRegistration, result);
+ }
+ return result.toArray(EMPTY_STRING_ARRAY);
+ }
+
+
+ private void findProvider(AuthConfigProvider provider,
+ Map<String,RegistrationContextImpl> registrations, List<String>
result) {
+ for (Entry<String,RegistrationContextImpl> entry :
registrations.entrySet()) {
+ if (provider.equals(entry.getValue().getProvider())) {
+ result.add(entry.getKey());
}
- return results.toArray(EMPTY_STRING_ARRAY);
}
}
@Override
public RegistrationContext getRegistrationContext(String registrationID) {
- return registrations.get(registrationID);
+ RegistrationContext result = defaultRegistration.get(registrationID);
+ if (result == null) {
+ result = layerAppContextRegistrations.get(registrationID);
+ }
+ if (result == null) {
+ result = appContextRegistrations.get(registrationID);
+ }
+ if (result == null) {
+ result = layerRegistrations.get(registrationID);
+ }
+ return result;
}
@@ -174,8 +304,16 @@ public class AuthConfigFactoryImpl exten
}
- private String getRegistrationID(String layer, String appContext) {
- return layer + ":" + appContext;
+ private static String getRegistrationID(String layer, String appContext) {
+ if (layer != null && layer.length() == 0) {
+ throw new IllegalArgumentException(
+
sm.getString("authConfigFactoryImpl.zeroLengthMessageLayer"));
+ }
+ if (appContext != null && appContext.length() == 0) {
+ throw new IllegalArgumentException(
+
sm.getString("authConfigFactoryImpl.zeroLengthAppContext"));
+ }
+ return (layer == null ? "" : layer) + ":" + (appContext == null ? "" :
appContext);
}
@@ -200,24 +338,55 @@ public class AuthConfigFactoryImpl exten
private void savePersistentRegistrations() {
synchronized (CONFIG_FILE_LOCK) {
Providers providers = new Providers();
- for (Entry<String,RegistrationContextImpl> entry :
registrations.entrySet()) {
- if (entry.getValue().isPersistent()) {
- Provider provider = new Provider();
- provider.setAppContext(entry.getValue().getAppContext());
-
provider.setClassName(entry.getValue().getProvider().getClass().getName());
- provider.setDescription(entry.getValue().getDescription());
- provider.setLayer(entry.getValue().getMessageLayer());
- for (Entry<String,String> property :
entry.getValue().getProperties().entrySet()) {
- provider.addProperty(property.getKey(),
property.getValue());
- }
- providers.addProvider(provider);
- }
- }
+ savePersistentProviders(providers, layerAppContextRegistrations);
+ savePersistentProviders(providers, appContextRegistrations);
+ savePersistentProviders(providers, layerRegistrations);
+ savePersistentProviders(providers, defaultRegistration);
PersistentProviderRegistrations.writeProviders(providers,
CONFIG_FILE);
}
}
+ private void savePersistentProviders(Providers providers,
+ Map<String,RegistrationContextImpl> registrations) {
+ for (Entry<String,RegistrationContextImpl> entry :
registrations.entrySet()) {
+ savePersistentProvider(providers, entry.getValue());
+ }
+ }
+
+
+ private void savePersistentProvider(Providers providers,
+ RegistrationContextImpl registrationContextImpl) {
+ if (registrationContextImpl != null &&
registrationContextImpl.isPersistent()) {
+ Provider provider = new Provider();
+ provider.setAppContext(registrationContextImpl.getAppContext());
+
provider.setClassName(registrationContextImpl.getProvider().getClass().getName());
+ provider.setDescription(registrationContextImpl.getDescription());
+ provider.setLayer(registrationContextImpl.getMessageLayer());
+ for (Entry<String,String> property :
registrationContextImpl.getProperties().entrySet()) {
+ provider.addProperty(property.getKey(), property.getValue());
+ }
+ providers.addProvider(provider);
+ }
+ }
+
+
+ private RegistrationContextImpl findRegistrationContextImpl(String layer,
String appContext) {
+ RegistrationContextImpl result;
+ result = layerAppContextRegistrations.get(getRegistrationID(layer,
appContext));
+ if (result == null) {
+ result = appContextRegistrations.get(getRegistrationID(null,
appContext));
+ }
+ if (result == null) {
+ result = layerRegistrations.get(getRegistrationID(layer, null));
+ }
+ if (result == null) {
+ result = defaultRegistration.get(DEFAULT_REGISTRATION_ID);
+ }
+ return result;
+ }
+
+
private static class RegistrationContextImpl implements
RegistrationContext {
private RegistrationContextImpl(String messageLayer, String
appContext, String description,
@@ -240,7 +409,7 @@ public class AuthConfigFactoryImpl exten
private final boolean persistent;
private final AuthConfigProvider provider;
private final Map<String,String> properties;
- private final List<RegistrationListener> listeners = new
CopyOnWriteArrayList<>();
+ private final List<RegistrationListenerWrapper> listeners = new
CopyOnWriteArrayList<>();
@Override
public String getMessageLayer() {
@@ -270,7 +439,7 @@ public class AuthConfigFactoryImpl exten
}
- private void addListener(RegistrationListener listener) {
+ private void addListener(RegistrationListenerWrapper listener) {
if (listener != null) {
listeners.add(listener);
}
@@ -284,13 +453,43 @@ public class AuthConfigFactoryImpl exten
private boolean removeListener(RegistrationListener listener) {
boolean result = false;
- Iterator<RegistrationListener> iter = listeners.iterator();
- while (iter.hasNext()) {
- if (iter.next().equals(listener)) {
- iter.remove();
+ for (RegistrationListenerWrapper wrapper : listeners) {
+ if (wrapper.getListener().equals(listener)) {
+ listeners.remove(wrapper);
}
}
return result;
}
}
+
+
+ private static class RegistrationListenerWrapper {
+
+ private final String messageLayer;
+ private final String appContext;
+ private final RegistrationListener listener;
+
+
+ public RegistrationListenerWrapper(String messageLayer, String
appContext,
+ RegistrationListener listener) {
+ this.messageLayer = messageLayer;
+ this.appContext = appContext;
+ this.listener = listener;
+ }
+
+
+ public String getMessageLayer() {
+ return messageLayer;
+ }
+
+
+ public String getAppContext() {
+ return appContext;
+ }
+
+
+ public RegistrationListener getListener() {
+ return listener;
+ }
+ }
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties?rev=1782782&r1=1782781&r2=1782782&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
Mon Feb 13 14:39:35 2017
@@ -14,6 +14,8 @@
# limitations under the License.
authConfigFactoryImpl.load=Loading persistent provider registrations from [{0}]
+authConfigFactoryImpl.zeroLengthAppContext=A zero length application context
name is not valid
+authConfigFactoryImpl.zeroLengthMessageLayer=A zero length message layer name
is not valid
authConfigFactoryImpl.registerClass=Registering class [{0}] for layer [{1}]
and application context [{2}]
authConfigFactoryImpl.registerInstance=Registering instance of type[{0}] for
layer [{1}] and application context [{2}]
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1782782&r1=1782781&r2=1782782&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Feb 13 14:39:35 2017
@@ -75,6 +75,11 @@
AUTH_HEADER_NAME in SpnegoAuthenticator. Patch provided by Michael
Osipov. (violetagg)
</fix>
+ <fix>
+ The default JASPIC <code>AuthConfigFactory</code> now correctly
notifies
+ registered <code>RegistrationListener</code>s when a new
+ <code>AuthConfigProvider</code> is registered. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
