Author: markt
Date: Mon Aug 12 14:32:01 2013
New Revision: 1513151
URL: http://svn.apache.org/r1513151
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55404
Log warnings as warnings
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1513148-1513149
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1513151&r1=1513150&r2=1513151&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Mon Aug 12 14:32:01 2013
@@ -1131,7 +1131,7 @@ public class ContextConfig implements Li
for (int j = 0; j < roles.length; j++) {
if (!"*".equals(roles[j]) &&
!context.findSecurityRole(roles[j])) {
- log.info(sm.getString("contextConfig.role.auth",
roles[j]));
+ log.warn(sm.getString("contextConfig.role.auth",
roles[j]));
context.addSecurityRole(roles[j]);
}
}
@@ -1143,14 +1143,14 @@ public class ContextConfig implements Li
Wrapper wrapper = (Wrapper) wrappers[i];
String runAs = wrapper.getRunAs();
if ((runAs != null) && !context.findSecurityRole(runAs)) {
- log.info(sm.getString("contextConfig.role.runas", runAs));
+ log.warn(sm.getString("contextConfig.role.runas", runAs));
context.addSecurityRole(runAs);
}
String names[] = wrapper.findSecurityReferences();
for (int j = 0; j < names.length; j++) {
String link = wrapper.findSecurityReference(names[j]);
if ((link != null) && !context.findSecurityRole(link)) {
- log.info(sm.getString("contextConfig.role.link", link));
+ log.warn(sm.getString("contextConfig.role.link", link));
context.addSecurityRole(link);
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1513151&r1=1513150&r2=1513151&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Mon Aug 12 14:32:01 2013
@@ -55,9 +55,9 @@ contextConfig.jspFile.error=JSP file {0}
contextConfig.jspFile.warning=WARNING: JSP file {0} must start with a ''/'' in
Servlet 2.4
contextConfig.missingRealm=No Realm has been configured to authenticate against
contextConfig.resourceJarFail=Failed to processes JAR found at URL [{0}] for
static resources to be included in context with name [{0}]
-contextConfig.role.auth=WARNING: Security role name {0} used in an
<auth-constraint> without being defined in a <security-role>
-contextConfig.role.link=WARNING: Security role name {0} used in a <role-link>
without being defined in a <security-role>
-contextConfig.role.runas=WARNING: Security role name {0} used in a <run-as>
without being defined in a <security-role>
+contextConfig.role.auth=Security role name {0} used in an <auth-constraint>
without being defined in a <security-role>
+contextConfig.role.link=Security role name {0} used in a <role-link> without
being defined in a <security-role>
+contextConfig.role.runas=Security role name {0} used in a <run-as> without
being defined in a <security-role>
contextConfig.sci.debug=Unable to process ServletContainerInitializer for
[{0}]. This is most likely due to a class defined in the @HandlesTypes
annotation being missing
contextConfig.sci.info=Unable to process ServletContainerInitializer for
[{0}]. This is most likely due to a class defined in the @HandlesTypes
annotation being missing. Enable DEBUG level logging for the full stack trace.
contextConfig.servletContainerInitializerFail=Failed to process JAR found at
URL [{0}] for ServletContainerInitializers for context with name [{1}]
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1513151&r1=1513150&r2=1513151&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
Mon Aug 12 14:32:01 2013
@@ -51,9 +51,9 @@ contextConfig.jspFile.error = El archivo
contextConfig.jspFile.warning = AVISO\: El archivo JSP {0} debe de comenzar
con ''/'' en Servlet 2.4
contextConfig.missingRealm = Alg\u00FAn reino (realm) no ha sido configurado
para realizar la autenticaci\u00F3n
contextConfig.resourceJarFail = Hallado JAR fallido a los procesos en URL
[{0}] para recursos est\u00E1ticos a ser incluidos en contexto con nombre [{0}]
-contextConfig.role.auth = ATENCI\u00D3N\: El nombre de papel de seguridad {0}
es usado en un <auth-constraint> sin haber sido definido en <security-role>
-contextConfig.role.link = ATENCI\u00D3N\: El nombre de papel de seguridad {0}
es usado en un <role-link> sin haber sido definido en <security-role>
-contextConfig.role.runas = ATENCI\u00D3N\: El nombre de papel de seguridad {0}
es usado en un <run-as> sin haber sido definido en <security-role>
+contextConfig.role.auth = El nombre de papel de seguridad {0} es usado en un
<auth-constraint> sin haber sido definido en <security-role>
+contextConfig.role.link = El nombre de papel de seguridad {0} es usado en un
<role-link> sin haber sido definido en <security-role>
+contextConfig.role.runas = El nombre de papel de seguridad {0} es usado en un
<run-as> sin haber sido definido en <security-role>
contextConfig.servletContainerInitializerFail = Hallado JAR fallido a proceso
en URL [{0}] para ServletContainerInitializers para el contexto con nombre [{1}]
contextConfig.start = "ContextConfig"\: Procesando "START"
contextConfig.stop = "ContextConfig"\: Procesando "STOP"
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties?rev=1513151&r1=1513150&r2=1513151&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
Mon Aug 12 14:32:01 2013
@@ -25,9 +25,9 @@ contextConfig.defaultPosition=S''est pro
contextConfig.jspFile.error=Le fichier JSP {0} doit commencer par un ''/''
contextConfig.jspFile.warning=ATTENTION: Le fichier JSP {0} doit commencer par
un ''/'' dans l''API Servlet 2.4
contextConfig.missingRealm=Aucun royaume (realm) n''a \u00e9t\u00e9
configur\u00e9 pour r\u00e9aliser l''authentification
-contextConfig.role.auth=ATTENTION: Le nom de r\u00f4le de s\u00e9curit\u00e9
{0} est utilis\u00e9 dans un <auth-constraint> sans avoir \u00e9t\u00e9
d\u00e9fini dans <security-role>
-contextConfig.role.link=ATTENTION: Le nom de r\u00f4le de s\u00e9curit\u00e9
{0} est utilis\u00e9 dans un <role-link> sans avoir \u00e9t\u00e9 d\u00e9fini
dans <security-role>
-contextConfig.role.runas=ATTENTION: Le nom de r\u00f4le de s\u00e9curit\u00e9
{0} est utilis\u00e9 dans un <run-as> sans avoir \u00e9t\u00e9 d\u00e9fini dans
<security-role>
+contextConfig.role.auth=Le nom de r\u00f4le de s\u00e9curit\u00e9 {0} est
utilis\u00e9 dans un <auth-constraint> sans avoir \u00e9t\u00e9 d\u00e9fini
dans <security-role>
+contextConfig.role.link=Le nom de r\u00f4le de s\u00e9curit\u00e9 {0} est
utilis\u00e9 dans un <role-link> sans avoir \u00e9t\u00e9 d\u00e9fini dans
<security-role>
+contextConfig.role.runas=Le nom de r\u00f4le de s\u00e9curit\u00e9 {0} est
utilis\u00e9 dans un <run-as> sans avoir \u00e9t\u00e9 d\u00e9fini dans
<security-role>
contextConfig.start="ContextConfig": Traitement du "START"
contextConfig.stop="ContextConfig": Traitement du "STOP"
contextConfig.unavailable=Cette application est marqu\u00e9e comme non
disponible suite aux erreurs pr\u00e9c\u00e9dentes
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties?rev=1513151&r1=1513150&r2=1513151&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
Mon Aug 12 14:32:01 2013
@@ -25,9 +25,9 @@ contextConfig.defaultPosition={0}\u884c\
contextConfig.jspFile.error=JSP\u30d5\u30a1\u30a4\u30eb {0}
\u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
contextConfig.jspFile.warning=\u8b66\u544a: Servlet
2.4\u3067\u306fJSP\u30d5\u30a1\u30a4\u30eb {0}
\u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
contextConfig.missingRealm=\u8a8d\u8a3c\u3059\u308b\u305f\u3081\u306b\u30ec\u30eb\u30e0\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-contextConfig.role.auth=\u8b66\u544a:
<security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d
{0}
\u304c<auth-constraint>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f
-contextConfig.role.link=\u8b66\u544a:
<security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d
{0}
\u304c<role-link>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f
-contextConfig.role.runas=\u8b66\u544a:
<security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d
{0} \u304c<run-as>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f
+contextConfig.role.auth=<security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d
{0}
\u304c<auth-constraint>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f
+contextConfig.role.link=<security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d
{0}
\u304c<role-link>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f
+contextConfig.role.runas=<security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d
{0} \u304c<run-as>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f
contextConfig.start=ContextConfig:
\u51e6\u7406\u3092\u958b\u59cb\u3057\u307e\u3059
contextConfig.stop=ContextConfig:
\u51e6\u7406\u3092\u505c\u6b62\u3057\u307e\u3059
contextConfig.unavailable=\u524d\u306e\u30a8\u30e9\u30fc\u306e\u305f\u3081\u306b\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u5229\u7528\u3067\u304d\u306a\u3044\u3088\u3046\u306b\u30de\u30fc\u30af\u3057\u307e\u3059
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1513151&r1=1513150&r2=1513151&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Aug 12 14:32:01 2013
@@ -107,6 +107,10 @@
do not result in a call to a different underlying method on the
ServletContext. (markt)
</fix>
+ <fix>
+ <bug>55404</bug>: Log warnings about using security roles in web.xml
+ without defining them as warnings. (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
