You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2016/01/25 20:30:20 UTC
svn commit: r1726672 -
/tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Author: rjung
Date: Mon Jan 25 19:30:19 2016
New Revision: 1726672
URL: http://svn.apache.org/viewvc?rev=1726672&view=rev
Log:
Remove JASPIC classes from class loader filtering.
They are not part of TC 8 and the filter was
introduced by class loader backports.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1726672&r1=1726671&r2=1726672&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Mon Jan 25 19:30:19 2016
@@ -2761,8 +2761,7 @@ public abstract class WebappClassLoaderB
}
if (name.startsWith("el.", 6) ||
name.startsWith("servlet.", 6) ||
- name.startsWith("websocket.", 6) ||
- name.startsWith("security.auth.message.", 6)) {
+ name.startsWith("websocket.", 6)) {
return true;
}
} else if (!isClassName && ch == '/') {
@@ -2772,8 +2771,7 @@ public abstract class WebappClassLoaderB
}
if (name.startsWith("el/", 6) ||
name.startsWith("servlet/", 6) ||
- name.startsWith("websocket/", 6) ||
- name.startsWith("security/auth/message/", 6)) {
+ name.startsWith("websocket/", 6)) {
return true;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1726672 -
/tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Posted by Rainer Jung <ra...@kippdata.de>.
Thanks Konstantin, just noticed it as well. At least it shows that the
tests are actually testing something.
Fixed in r1726696.
Am 25.01.2016 um 22:35 schrieb Konstantin Kolinko:
> 2016-01-25 22:30 GMT+03:00 <rj...@apache.org>:
>> Author: rjung
>> Date: Mon Jan 25 19:30:19 2016
>> New Revision: 1726672
>>
>> URL: http://svn.apache.org/viewvc?rev=1726672&view=rev
>> Log:
>> Remove JASPIC classes from class loader filtering.
>>
>> They are not part of TC 8 and the filter was
>> introduced by class loader backports.
>>
>> Modified:
>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
>>
>> Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
>> URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1726672&r1=1726671&r2=1726672&view=diff
>> ==============================================================================
>> --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java (original)
>> +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Mon Jan 25 19:30:19 2016
>> @@ -2761,8 +2761,7 @@ public abstract class WebappClassLoaderB
>> }
>> if (name.startsWith("el.", 6) ||
>> name.startsWith("servlet.", 6) ||
>> - name.startsWith("websocket.", 6) ||
>> - name.startsWith("security.auth.message.", 6)) {
>> + name.startsWith("websocket.", 6)) {
>> return true;
>> }
>> } else if (!isClassName && ch == '/') {
>> @@ -2772,8 +2771,7 @@ public abstract class WebappClassLoaderB
>> }
>> if (name.startsWith("el/", 6) ||
>> name.startsWith("servlet/", 6) ||
>> - name.startsWith("websocket/", 6) ||
>> - name.startsWith("security/auth/message/", 6)) {
>> + name.startsWith("websocket/", 6)) {
>> return true;
>> }
>> }
>
>
> Apparently those have to be removed from tests as well. Tests are failing:
>
> https://ci.apache.org/projects/tomcat/tomcat8/logs/logs/1726672/TEST-org.apache.catalina.loader.TestWebappClassLoader.BIO.txt
>
> [[[
> Testsuite: org.apache.catalina.loader.TestWebappClassLoader
> Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.779 sec
> ------------- Standard Error -----------------
> <....>
> ------------- ---------------- ---------------
>
> Testcase: testGetURLs took 0.758 sec
> Testcase: testFilter took 0.004 sec
> FAILED
> Class 'javax.security.auth.message.some.package.Example' failed deny filter
> junit.framework.AssertionFailedError: Class
> 'javax.security.auth.message.some.package.Example' failed deny filter
> at org.apache.catalina.loader.TestWebappClassLoader.testFilter(TestWebappClassLoader.java:137)
> ]]]
>
> Best regards,
> Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1726672 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Posted by Konstantin Kolinko <kn...@gmail.com>.
2016-01-25 22:30 GMT+03:00 <rj...@apache.org>:
> Author: rjung
> Date: Mon Jan 25 19:30:19 2016
> New Revision: 1726672
>
> URL: http://svn.apache.org/viewvc?rev=1726672&view=rev
> Log:
> Remove JASPIC classes from class loader filtering.
>
> They are not part of TC 8 and the filter was
> introduced by class loader backports.
>
> Modified:
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
>
> Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
> URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1726672&r1=1726671&r2=1726672&view=diff
> ==============================================================================
> --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java (original)
> +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Mon Jan 25 19:30:19 2016
> @@ -2761,8 +2761,7 @@ public abstract class WebappClassLoaderB
> }
> if (name.startsWith("el.", 6) ||
> name.startsWith("servlet.", 6) ||
> - name.startsWith("websocket.", 6) ||
> - name.startsWith("security.auth.message.", 6)) {
> + name.startsWith("websocket.", 6)) {
> return true;
> }
> } else if (!isClassName && ch == '/') {
> @@ -2772,8 +2771,7 @@ public abstract class WebappClassLoaderB
> }
> if (name.startsWith("el/", 6) ||
> name.startsWith("servlet/", 6) ||
> - name.startsWith("websocket/", 6) ||
> - name.startsWith("security/auth/message/", 6)) {
> + name.startsWith("websocket/", 6)) {
> return true;
> }
> }
Apparently those have to be removed from tests as well. Tests are failing:
https://ci.apache.org/projects/tomcat/tomcat8/logs/logs/1726672/TEST-org.apache.catalina.loader.TestWebappClassLoader.BIO.txt
[[[
Testsuite: org.apache.catalina.loader.TestWebappClassLoader
Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.779 sec
------------- Standard Error -----------------
<....>
------------- ---------------- ---------------
Testcase: testGetURLs took 0.758 sec
Testcase: testFilter took 0.004 sec
FAILED
Class 'javax.security.auth.message.some.package.Example' failed deny filter
junit.framework.AssertionFailedError: Class
'javax.security.auth.message.some.package.Example' failed deny filter
at org.apache.catalina.loader.TestWebappClassLoader.testFilter(TestWebappClassLoader.java:137)
]]]
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org