Revision: 16342
Author: [email protected]
Date: Wed Jan 12 06:05:49 2011
Log: Fixes Issue 2269
http://code.google.com/p/mobicents/source/detail?r=16342

Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java Tue Dec 28 18:56:39 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java Wed Jan 12 06:05:49 2011
@@ -61,6 +61,7 @@
 import javax.sip.ClientTransaction;
 import javax.sip.Dialog;
 import javax.sip.DialogState;
+import javax.sip.ListeningPoint;
 import javax.sip.ServerTransaction;
 import javax.sip.SipException;
 import javax.sip.SipProvider;
@@ -1180,11 +1181,16 @@

                                                }
// http://code.google.com/p/mobicents/issues/detail?id=1150 only set transport if not udp
-                                               
if(!"udp".equalsIgnoreCase(transport)) {
+                                               
if(!ListeningPoint.UDP.equalsIgnoreCase(transport)) {
                                                        
sipUri.setTransportParam(transport);
-                                               }
-                                               
if("tls".equalsIgnoreCase(transport)) {
-                                                       sipUri.setSecure(true);
+                                               }
+                                               
if(ListeningPoint.TLS.equalsIgnoreCase(transport)) {
+                                                       final 
javax.sip.address.URI requestURI = request.getRequestURI();
+ // make the contact uri secure only if the request uri is secure to cope with issue http://code.google.com/p/mobicents/issues/detail?id=2269 + // Wrong Contact header scheme URI in case TLS call with 'sip:' scheme + if(requestURI.isSipURI() && ((javax.sip.address.SipURI)requestURI).isSecure()) {
+                                                               
sipUri.setSecure(true);
+                                                       }
                                                }
                                        }
                                }
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java Mon Jan 3 05:51:04 2011 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java Wed Jan 12 06:05:49 2011
@@ -305,6 +305,9 @@
                                sipApplicationSession.encodeURI(requestURI);
                                sipApplicationSession.setAttribute(ENCODE_URI, 
"true");
                        }
+                       
if(ce.getServletContext().getInitParameter("tlsRURI")!=null) {
+                               requestURI.setTransportParam("tls");
+                       }
                        sipServletRequest.setRequestURI(requestURI);
                }
String testErrorResponse = ce.getServletContext().getInitParameter(TEST_ERROR_RESPONSE);
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java Mon Jan 3 05:51:04 2011 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java Wed Jan 12 06:05:49 2011
@@ -490,6 +490,35 @@
                assertTrue(viaString.toLowerCase().contains("tls"));
                assertTrue(viaString.toLowerCase().contains("5072"));
        }
+
+       /**
+ * non regression test for Issue 2269 http://code.google.com/p/mobicents/issues/detail?id=2269
+        * Wrong Contact header scheme URI in case TLS call with 'sip:' scheme
+        */
+ public void testShootistContactNonSecureURITlsTransport() throws Exception {
+               receiverProtocolObjects =new ProtocolObjects(
+                               "tls_receiver", "gov.nist", "TLS", AUTODIALOG, 
null, null, null);
+
+ receiver = new TestSipListener(5080, 5070, receiverProtocolObjects, false);
+               SipProvider senderProvider = receiver.createProvider();
+
+               senderProvider.addSipListener(receiver);
+
+               receiverProtocolObjects.start();
+ sipConnector = tomcat.addSipConnector(serverName, sipIpAddress, 5071, ListeningPoint.TCP); + sipConnector = tomcat.addSipConnector(serverName, sipIpAddress, 5072, ListeningPoint.TLS);
+               tomcat.startTomcat();
+               deployApplication("tlsRURI", "true");
+               Thread.sleep(TIMEOUT);
+               assertTrue(receiver.getByeReceived());
+ ContactHeader contactHeader = (ContactHeader) receiver.getInviteRequest().getHeader(ContactHeader.NAME); + assertTrue(((SipURI)contactHeader.getAddress().getURI()).toString().contains("sip:")); + assertTrue(((SipURI)contactHeader.getAddress().getURI()).toString().contains("5072")); + assertTrue(((SipURI)contactHeader.getAddress().getURI()).toString().toLowerCase().contains("transport=tls")); + String viaString = receiver.getInviteRequest().getHeader(ViaHeader.NAME).toString();
+               assertTrue(viaString.toLowerCase().contains("tls"));
+               assertTrue(viaString.toLowerCase().contains("5072"));
+       }

        /**
* non regression test for Issue 1150 http://code.google.com/p/mobicents/issues/detail?id=1150

Reply via email to