[Bug 65226] The StandardJarScanner extract wrong jar name and cause duplicate jar scan
https://bz.apache.org/bugzilla/show_bug.cgi?id=65226 --- Comment #1 from Remy Maucherat --- I think you are right, since the 8.5 code is now: https://github.com/apache/tomcat/blob/8.5.x/java/org/apache/tomcat/util/scan/StandardJarScanner.java#L478 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Harmonize StandardJarScanner extraction of JAR name
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new fc761db Harmonize StandardJarScanner extraction of JAR name
fc761db is described below
commit fc761dbf2f56b538ed42febda0b3a518469adf01
Author: remm
AuthorDate: Fri Apr 9 10:24:19 2021 +0200
Harmonize StandardJarScanner extraction of JAR name
From 8.5 code.
---
java/org/apache/tomcat/util/scan/StandardJarScanner.java | 2 +-
webapps/docs/changelog.xml | 8
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
index b27f40b..965b69d 100644
--- a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
@@ -359,7 +359,7 @@ public class StandardJarScanner implements JarScanner {
String name = null;
String path = url.getPath();
-int end = path.indexOf(Constants.JAR_EXT);
+int end = path.lastIndexOf(Constants.JAR_EXT);
if (end != -1) {
int start = path.lastIndexOf('/', end);
name = path.substring(start + 1, end + 4);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 875a339..54255ef 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,14 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+65226: Fix extraction of JAR name in some cases in
+StandardJarScanner. Submitted by Lynx. (remm)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65226] The StandardJarScanner extract wrong jar name and cause duplicate jar scan
https://bz.apache.org/bugzilla/show_bug.cgi?id=65226 Remy Maucherat changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Remy Maucherat --- Switched to lastIndexOf like for 8.5, the fix will be in 7.0.109. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1861 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] fc761dbf2f56b538ed42febda0b3a518469adf01 Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (b36454d -> 70027ed)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from b36454d Remove unnecessary code add 70027ed Code clean-up. No functional change. No new revisions were added by this update. Summary of changes: java/org/apache/catalina/realm/JNDIRealm.java | 670 +++--- 1 file changed, 287 insertions(+), 383 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Code clean-up. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new ec29686 Code clean-up. No functional change.
ec29686 is described below
commit ec29686465037c31a318fc9803856c2f6ac8fd8c
Author: Mark Thomas
AuthorDate: Fri Apr 9 16:56:25 2021 +0100
Code clean-up. No functional change.
---
java/org/apache/catalina/realm/JNDIRealm.java | 670 +++---
1 file changed, 287 insertions(+), 383 deletions(-)
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index 7e09d5c..cda0603 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -181,7 +181,6 @@ import org.ietf.jgss.GSSName;
*/
public class JNDIRealm extends RealmBase {
-
// - Instance Variables
/**
@@ -194,19 +193,16 @@ public class JNDIRealm extends RealmBase {
*/
protected String connectionName = null;
-
/**
* The connection password for the server we will contact.
*/
protected String connectionPassword = null;
-
/**
* The connection URL for the server we will contact.
*/
protected String connectionURL = null;
-
/**
* The JNDI context factory used to acquire our InitialContext. By
* default, assumes use of an LDAP server using the standard JNDI LDAP
@@ -214,7 +210,6 @@ public class JNDIRealm extends RealmBase {
*/
protected String contextFactory = "com.sun.jndi.ldap.LdapCtxFactory";
-
/**
* How aliases should be dereferenced during search operations.
*/
@@ -226,14 +221,12 @@ public class JNDIRealm extends RealmBase {
*/
public static final String DEREF_ALIASES = "java.naming.ldap.derefAliases";
-
/**
* The protocol that will be used in the communication with the
* directory server.
*/
protected String protocol = null;
-
/**
* Should we ignore PartialResultExceptions when iterating over
NamingEnumerations?
* Microsoft Active Directory often returns referrals, which lead
@@ -243,7 +236,6 @@ public class JNDIRealm extends RealmBase {
*/
protected boolean adCompat = false;
-
/**
* How should we handle referrals? Microsoft Active Directory often
returns
* referrals. If you need to follow them set referrals to "follow".
@@ -252,20 +244,17 @@ public class JNDIRealm extends RealmBase {
*/
protected String referrals = null;
-
/**
* The base element for user searches.
*/
protected String userBase = "";
-
/**
* The message format used to search for a user, with "{0}" marking
* the spot where the username goes.
*/
protected String userSearch = null;
-
/**
* When searching for users, should the search be performed as the user
* currently being authenticated? If false, {@link #connectionName} and
@@ -274,13 +263,11 @@ public class JNDIRealm extends RealmBase {
*/
private boolean userSearchAsUser = false;
-
/**
* Should we search the entire subtree for matching users?
*/
protected boolean userSubtree = false;
-
/**
* The attribute name used to retrieve the user password.
*/
@@ -294,7 +281,6 @@ public class JNDIRealm extends RealmBase {
*/
protected String userRoleAttribute = null;
-
/**
* A string of LDAP user patterns or paths, ":"-separated
* These will be used to form the distinguished name of a
@@ -305,7 +291,6 @@ public class JNDIRealm extends RealmBase {
*/
protected String[] userPatternArray = null;
-
/**
* The message format used to form the distinguished name of a
* user, with "{0}" marking the spot where the specified username
@@ -313,26 +298,22 @@ public class JNDIRealm extends RealmBase {
*/
protected String userPattern = null;
-
/**
* The base element for role searches.
*/
protected String roleBase = "";
-
/**
* The name of an attribute in the user's entry containing
* roles for that user
*/
protected String userRoleName = null;
-
/**
* The name of the attribute containing roles held elsewhere
*/
protected String roleName = null;
-
/**
* The message format used to select roles for a user, with "{0}" marking
* the spot where the distinguished name of the user goes. The "{1}"
@@ -340,7 +321,6 @@ public class JNDIRealm extends RealmBase {
*/
protected String roleSearch = null;
-
/**
* Should we search the entire subtree for matching memberships?
*/
@@ -375,7 +355,6 @@ public class JNDIRealm extends RealmBase {
*/
protected String com
[tomcat] branch 8.5.x updated: Code clean-up. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 5862cb9 Code clean-up. No functional change.
5862cb9 is described below
commit 5862cb95edbeb75782c923619453affe4d47c614
Author: Mark Thomas
AuthorDate: Fri Apr 9 16:56:25 2021 +0100
Code clean-up. No functional change.
---
java/org/apache/catalina/realm/JNDIRealm.java | 676 +++---
1 file changed, 290 insertions(+), 386 deletions(-)
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index 1eedab6..e4ba051 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -181,7 +181,6 @@ import org.ietf.jgss.GSSName;
*/
public class JNDIRealm extends RealmBase {
-
// - Instance Variables
/**
@@ -194,19 +193,16 @@ public class JNDIRealm extends RealmBase {
*/
protected String connectionName = null;
-
/**
* The connection password for the server we will contact.
*/
protected String connectionPassword = null;
-
/**
* The connection URL for the server we will contact.
*/
protected String connectionURL = null;
-
/**
* The JNDI context factory used to acquire our InitialContext. By
* default, assumes use of an LDAP server using the standard JNDI LDAP
@@ -214,7 +210,6 @@ public class JNDIRealm extends RealmBase {
*/
protected String contextFactory = "com.sun.jndi.ldap.LdapCtxFactory";
-
/**
* How aliases should be dereferenced during search operations.
*/
@@ -226,7 +221,6 @@ public class JNDIRealm extends RealmBase {
*/
public static final String DEREF_ALIASES = "java.naming.ldap.derefAliases";
-
/**
* Descriptive information about this Realm implementation.
* @deprecated This will be removed in Tomcat 9 onwards.
@@ -241,7 +235,6 @@ public class JNDIRealm extends RealmBase {
*/
protected String protocol = null;
-
/**
* Should we ignore PartialResultExceptions when iterating over
NamingEnumerations?
* Microsoft Active Directory often returns referrals, which lead
@@ -251,7 +244,6 @@ public class JNDIRealm extends RealmBase {
*/
protected boolean adCompat = false;
-
/**
* How should we handle referrals? Microsoft Active Directory often
returns
* referrals. If you need to follow them set referrals to "follow".
@@ -260,20 +252,17 @@ public class JNDIRealm extends RealmBase {
*/
protected String referrals = null;
-
/**
* The base element for user searches.
*/
protected String userBase = "";
-
/**
* The message format used to search for a user, with "{0}" marking
* the spot where the username goes.
*/
protected String userSearch = null;
-
/**
* When searching for users, should the search be performed as the user
* currently being authenticated? If false, {@link #connectionName} and
@@ -282,13 +271,11 @@ public class JNDIRealm extends RealmBase {
*/
private boolean userSearchAsUser = false;
-
/**
* Should we search the entire subtree for matching users?
*/
protected boolean userSubtree = false;
-
/**
* The attribute name used to retrieve the user password.
*/
@@ -302,7 +289,6 @@ public class JNDIRealm extends RealmBase {
*/
protected String userRoleAttribute = null;
-
/**
* A string of LDAP user patterns or paths, ":"-separated
* These will be used to form the distinguished name of a
@@ -313,7 +299,6 @@ public class JNDIRealm extends RealmBase {
*/
protected String[] userPatternArray = null;
-
/**
* The message format used to form the distinguished name of a
* user, with "{0}" marking the spot where the specified username
@@ -321,26 +306,22 @@ public class JNDIRealm extends RealmBase {
*/
protected String userPattern = null;
-
/**
* The base element for role searches.
*/
protected String roleBase = "";
-
/**
* The name of an attribute in the user's entry containing
* roles for that user
*/
protected String userRoleName = null;
-
/**
* The name of the attribute containing roles held elsewhere
*/
protected String roleName = null;
-
/**
* The message format used to select roles for a user, with "{0}" marking
* the spot where the distinguished name of the user goes. The "{1}"
@@ -348,7 +329,6 @@ public class JNDIRealm extends RealmBase {
*/
protected String roleSearch = null;
-
/**
* Should we search the entire subtree for matching memberships?
*/
@@ -38
[Bug 65226] The StandardJarScanner extract wrong jar name and cause duplicate jar scan
https://bz.apache.org/bugzilla/show_bug.cgi?id=65226 --- Comment #3 from Lynx --- Thanks! Can you estimate the schedule for 109? I'm expecting the new release in my environment. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
