Revision: 15894
Author: vladimir.ralev
Date: Mon Dec 20 08:59:45 2010
Log: Update Issue 2226
Fix + testcase
http://code.google.com/p/mobicents/source/detail?r=15894

Added:
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/testkeys
Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java /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

=======================================
--- /dev/null
+++ /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/testkeys Mon Dec 20 08:59:45 2010
@@ -0,0 +1,40 @@
+þíþí      localhostýé
+´R¼0‚¸0
++*‚¤Úy~s²¥U×oó
+Hc†u"ê):B
+8m × ã¼ÖüüAbÌ3m¸§µNÿ•ÍÆî}µ„)]7ЪoT+聖ÀGXè| ½=ZÓÐt‹Dò+À’å;·µ.æµ-AéÙ†m,ådA; ÖÖLä‹gFébæ-òðè÷j‘~â1œ(¹R®ÐRš0Ço©iýS›Ï{ÎШrnUbDB•"õï§µG¶T šM×] ŒÎ §T
+Âiý;Z<––\‹
+OìÍç}z±ôè6¦Û”lh‚.,¬Sëzâ¾' œF*èi¸—Ô†wà2N ¢±œ‰1¾tõ„Jÿ‚ T­H®¯ôäæ¾Å֝íûWÃñjî"’¦¦µ
+»ýÔÁ~p}Õ'1æ: JÂ|>¦D€v$· gùíû¤Ål´ÇZ
+$J$:X4$ÞöâᯚðG6òvi=eÃ;_š´‹+á/ׁ=b‘°¡Œy‰l´â¢t—û ŠNÛ ¹1Æ
+YÇýæ
+¯WŠŠƒ˜8ÛÞêwڝU“È!>pP•äÌ->a²„•åx{²5«øáûáð `Ú
+èÈ
+SÞÊÆê½ÓÚSvv-,VÂ×±"e3$ý¶XÌxëxÂ$È
+4Í
+ä>7÷T€i+¸u˜       éªC^Ó×á¶
+cú°<¢ßšs ¸”Œ¸Ï‘»uõ}ˆF³–kŠ]p|^ÐÍc6”å      à)
++µ^(uB^W[ɬ7,¿"aºù(7Öþ”®ž#Û*Ð$a!¶
+7ÆhÞ±èBx¬púÁ)€Õ}øÐ
+„1PD3i(áé«\uÝ7Íïä/z[
+çØDÛÇåcߖGþo;0ÏjZÌÃß/”ý͊á...@x.509ˆ0‚„0‚íadf0
+      *†H†÷
+0ˆ10    UUS10    UCA10U     Sunnyvale1!0U
+Ficticious Widgets, Inc.1!0U Widget Development Group10U localhost0
+
+040722224838Z
+110522224838Z0ˆ10    UUS10    UCA10U     
Sunnyvale1!0U
+Ficticious Widgets, Inc.1!0U Widget Development Group10U localhost0Ÿ0
+      *†H†÷
+0‰Ë¯ÓPîG%P
+8O=°Öílµ¶ô·Au;1'—µ#éϟ
+>øF˜Õr1¨ó
+Œöå
+yv
+>ö¿Þyl$ʆ’¢™•øYõüÛIóeÙZÆÃ·8ãäÒx¢©(e÷¤RGó ¸4øC©0kãŠw½üÄ/âsïŒ6;h˜Ö[Œu0
+      *†H†÷
+»ƒ%‘ó µÃ½äþ±«èÍo\Ćé«>—ܬ¿ÖZ8B9pÍVø‚{·×Ÿ,@R+27^°íP]ÔòZ€ÆýúŽ+NNÛØ–u̾·iI"슱Xæ~©Ÿ OwN˜¹.àM&Å.k}dJɉŦÙÏ
+«'ÓÉÎL
+
+^·¸±c>BÒ
++?’AVâõU&¿kvp`
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java Thu Dec 9 08:01:47 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java Mon Dec 20 08:59:45 2010
@@ -609,7 +609,36 @@
                                URI uri = route.getAddress().getURI();
                                if(uri instanceof SipURI) {
                                        SipURI sipURI = (SipURI) uri;
-                                       String transportParam = 
sipURI.getTransportParam();
+                                       if(sipURI.isSecure()) {
+                                               transport = ListeningPoint.TLS;
+                                       } else {
+                                               String transportParam = 
sipURI.getTransportParam();
+
+                                               if (transportParam != null
+                                                               && 
transportParam.equalsIgnoreCase(ListeningPoint.TLS)) {
+                                                       transport = 
ListeningPoint.TLS;
+                                               }
+                                               //Fix by Filip Olsson for Issue 
112
+                                               else if ((transportParam != null
+                                                               && 
transportParam.equalsIgnoreCase(ListeningPoint.TCP)) ||
+                                                               
request.getContentLength().getContentLength() > 4096) {
+                                                       transport = 
ListeningPoint.TCP;
+                                               }
+                                       }
+                               }
+                       }
+               }
+
+               if(transport == null && message instanceof Request) {
+                       transport = ListeningPoint.UDP;
+                       Request request = (Request)message;
+                       URI ruri = request.getRequestURI();
+                       if(ruri instanceof SipURI) {
+                               SipURI sruri = ((javax.sip.address.SipURI) 
ruri);
+                               if(sruri.isSecure()) {
+                                       transport = ListeningPoint.TLS;
+                               } else {
+                                       String transportParam = 
sruri.getTransportParam();

                                        if (transportParam != null
                                                        && 
transportParam.equalsIgnoreCase(ListeningPoint.TLS)) {
@@ -624,27 +653,6 @@
                                }
                        }
                }
-
-               if(transport == null && message instanceof Request) {
-                       transport = ListeningPoint.UDP;
-                       Request request = (Request)message;
-
-                       if(request.getRequestURI() instanceof SipURI) {
-                               String transportParam = 
((javax.sip.address.SipURI) request
-                                       .getRequestURI()).getTransportParam();
-
-                               if (transportParam != null
-                                               && 
transportParam.equalsIgnoreCase(ListeningPoint.TLS)) {
-                                       transport = ListeningPoint.TLS;
-                               }
-                               //Fix by Filip Olsson for Issue 112
-                               else if ((transportParam != null
-                                       && 
transportParam.equalsIgnoreCase(ListeningPoint.TCP)) ||
-                                       
request.getContentLength().getContentLength() > 4096) {
-                                       transport = ListeningPoint.TCP;
-                               }
-                       }
-               }
// storing the transport is present in the message application data for maximizing perf
                // in speeding up the retrieval later on
                ((SIPMessage)message).setApplicationData(transport);
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java Mon Dec 20 06:05:51 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java Mon Dec 20 08:59:45 2010
@@ -1145,6 +1145,9 @@
                        }
                        if (super.getTransaction() == null) {

+ final SipProvider sipProvider = sipNetworkInterfaceManager.findMatchingListeningPoint(
+                                               transport, 
false).getSipProvider();
+
ContactHeader contactHeader = (ContactHeader)request.getHeader(ContactHeader.NAME); if(contactHeader == null && !Request.REGISTER.equalsIgnoreCase(requestMethod) && JainSipUtils.CONTACT_HEADER_METHODS.contains(requestMethod) && proxy == null) { final FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME);
@@ -1158,23 +1161,29 @@
JainSipUtils.createContactHeader(sipNetworkInterfaceManager, request, fromName, session.getOutboundInterface());
                                        request.addHeader(contactHeader);
                                }
-                               if(sipConnector != null && 
sipConnector.isUseStaticAddress()) {
-                                       if(proxy == null && contactHeader != 
null) {
-                                               boolean sipURI = 
contactHeader.getAddress().getURI().isSipURI();
-                                               if(sipURI) {
- javax.sip.address.SipURI sipUri = (javax.sip.address.SipURI) contactHeader.getAddress().getURI();
+
+                               if(proxy == null && contactHeader != null) {
+                                       boolean sipURI = 
contactHeader.getAddress().getURI().isSipURI();
+                                       if(sipURI) {
+ javax.sip.address.SipURI sipUri = (javax.sip.address.SipURI) contactHeader.getAddress().getURI();
+                                               if(sipConnector != null && 
sipConnector.isUseStaticAddress()) {
                                                        
sipUri.setHost(sipConnector.getStaticServerAddress());
                                                        
sipUri.setPort(sipConnector.getStaticServerPort());
-                                               }
-                                       }
-                               }
+                                               } else {
+                                                       
sipUri.setHost(sipConnector.getIpAddress());
+                                                       
sipUri.setPort(sipConnector.getPort());
+
+                                               }
+                                               
sipUri.setTransportParam(transport);
+                                               
if(transport.equalsIgnoreCase("tls")) {
+                                                       sipUri.setSecure(true);
+                                               }
+                                       }
+                               }

                                if(logger.isDebugEnabled()) {
                                        logger.debug("Getting new Client Tx for 
request " + request);
                                }
- final SipProvider sipProvider = sipNetworkInterfaceManager.findMatchingListeningPoint(
-                                               transport, 
false).getSipProvider();
-
                                /*
* If we the next hop is in this container we optimize the traffic by directing it here instead of going through load balancers. * This is must be done before creating the transaction, otherwise it will go to the host/port specified prior to the changes here.
@@ -1183,7 +1192,7 @@
                                                
sipConnector.isUseStaticAddress()) {
optimizeRouteHeaderAddressForInternalRoutingrequest(sipConnector, request, session, sipFactoryImpl, transport);
                                }
-
+
final ClientTransaction ctx = sipProvider.getNewClientTransaction(request); ctx.setRetransmitTimer(sipFactoryImpl.getSipApplicationDispatcher().getBaseTimerInterval()); ((TransactionExt)ctx).setTimerT2(sipFactoryImpl.getSipApplicationDispatcher().getT2Interval());
@@ -1330,7 +1339,6 @@
                                }
                        }

-                       updateContactHeaderTransport(transport);

                        if(sipConnector != null && 
sipConnector.isUseStaticAddress()) {
                                javax.sip.address.URI uri = 
request.getRequestURI();
@@ -1391,22 +1399,6 @@
                }

        }
-
- protected void updateContactHeaderTransport(String transport) throws ParseException { - ContactHeader contactHeader = (ContactHeader)message.getHeader(ContactHeader.NAME);
-               if(contactHeader != null) {
- // We need to update the originally created contact header if the request changed the transport
-                       javax.sip.address.URI uri = 
contactHeader.getAddress().getURI();
-                       if(uri.isSipURI()) {
-                               javax.sip.address.SipURI sipUri = 
(javax.sip.address.SipURI) uri;
-
- // It is always UDP by default, so we only need to modify it if it is different that UDP
-                               if(!transport.equalsIgnoreCase("udp")) {
-                                       sipUri.setTransportParam(transport);
-                               }
-                       }
-               }
-       }

        /**
         * Add a route header to route back to the container
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java Mon Dec 20 06:05:51 2010 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java Mon Dec 20 08:59:45 2010
@@ -296,6 +296,7 @@
String dontSetRURI = ce.getServletContext().getInitParameter("dontSetRURI");
                if(dontSetRURI == null) {
SipURI requestURI = sipFactory.createSipURI("LittleGuy", "127.0.0.1:5080"); + requestURI.setSecure(ce.getServletContext().getInitParameter("secureRURI")!=null); if(ce.getServletContext().getInitParameter("encodeRequestURI") != null) {
                                sipApplicationSession.encodeURI(requestURI);
                                sipApplicationSession.setAttribute(ENCODE_URI, 
"true");
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java Wed Dec 15 09:52:02 2010 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java Mon Dec 20 08:59:45 2010
@@ -30,6 +30,7 @@
 import javax.sip.header.ProxyAuthorizationHeader;
 import javax.sip.header.ToHeader;
 import javax.sip.header.UserAgentHeader;
+import javax.sip.header.ViaHeader;
 import javax.sip.message.Request;
 import javax.sip.message.Response;

@@ -43,6 +44,8 @@
 import org.mobicents.servlet.sip.testsuite.ProtocolObjects;
 import org.mobicents.servlet.sip.testsuite.TestSipListener;

+import test.tck.msgflow.callflows.tls.TlsTest;
+
 public class ShootistSipServletTest extends SipServletTestCase {
private static transient Logger logger = Logger.getLogger(ShootistSipServletTest.class);
        private static final String TRANSPORT = "udp";
@@ -123,6 +126,11 @@

        @Override
        protected void setUp() throws Exception {
+
+ System.setProperty( "javax.net.ssl.keyStore", TlsTest.class.getResource("testkeys").getPath() ); + System.setProperty( "javax.net.ssl.trustStore", TlsTest.class.getResource("testkeys").getPath() ); + System.setProperty( "javax.net.ssl.keyStorePassword", "passphrase" );
+        System.setProperty( "javax.net.ssl.keyStoreType", "jks" );
                super.setUp();
        }

@@ -424,6 +432,31 @@
ContactHeader contactHeader = (ContactHeader) receiver.getInviteRequest().getHeader(ContactHeader.NAME); assertFalse(((SipURI)contactHeader.getAddress().getURI()).toString().contains("transport=udp"));
        }
+
+       public void testShootistContactTlsTransport() 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("secureRURI", "true");
+               Thread.sleep(TIMEOUT);
+               assertTrue(receiver.getByeReceived());
+ ContactHeader contactHeader = (ContactHeader) receiver.getInviteRequest().getHeader(ContactHeader.NAME); + assertTrue(((SipURI)contactHeader.getAddress().getURI()).toString().contains("sips:")); + 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