Filter out unsupported protocols in the client class ServiceFactory

robertlazarski · robertlazarski · commit 7e6675342746 · 2023-08-01T15:40:18.000-04:00
diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java b/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
@@ -106,6 +106,10 @@ public static Service getService(Map environment)
         
         if (context != null) {
             String name = (String)environment.get("jndiName");
+
+	    if(name!=null && (name.toUpperCase().indexOf("LDAP")!=-1 || name.toUpperCase().indexOf("RMI")!=-1 || name.toUpperCase().indexOf("JMS")!=-1 || name.toUpperCase().indexOf("JMX")!=-1) || name.toUpperCase().indexOf("JRMP")!=-1 || name.toUpperCase().indexOf("JAVA")!=-1 || name.toUpperCase().indexOf("DNS")!=-1)  {
+	        return null;
+            }
             if (name == null) {
                 name = "axisServiceName";
             }
@@ -120,6 +124,7 @@ public static Service getService(Map environment)
                     context.bind(name, service);
                 } catch (NamingException e1) {
                     // !!! Couldn't do it, what should we do here?
+	            return null;
                 }
             }
         } else {

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,10 @@ public static Service getService(Map environment)`
`106`	`106`
`107`	`107`	`if (context != null) {`
`108`	`108`	`String name = (String)environment.get("jndiName");`
	`109`	`+`
	`110`	`+ if(name!=null && (name.toUpperCase().indexOf("LDAP")!=-1 \|\| name.toUpperCase().indexOf("RMI")!=-1 \|\| name.toUpperCase().indexOf("JMS")!=-1 \|\| name.toUpperCase().indexOf("JMX")!=-1) \|\| name.toUpperCase().indexOf("JRMP")!=-1 \|\| name.toUpperCase().indexOf("JAVA")!=-1 \|\| name.toUpperCase().indexOf("DNS")!=-1) {`
	`111`	`+ return null;`
	`112`	`+ }`
`109`	`113`	`if (name == null) {`
`110`	`114`	`name = "axisServiceName";`
`111`	`115`	`}`
`@@ -120,6 +124,7 @@ public static Service getService(Map environment)`
`120`	`124`	`context.bind(name, service);`
`121`	`125`	`} catch (NamingException e1) {`
`122`	`126`	`// !!! Couldn't do it, what should we do here?`
	`127`	`+ return null;`
`123`	`128`	`}`
`124`	`129`	`}`
`125`	`130`	`} else {`