Revision: 15906
Author: [email protected]
Date: Mon Dec 20 14:08:02 2010
Log: Update Issue 2173

Updating non regression test to actually check if the nonce returned by the UAC is the correct one that was generated by the UAC
http://code.google.com/p/mobicents/source/detail?r=15906

Modified:
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/security/ShootistSipServletAuthTest.java

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java Mon Dec 20 13:43:10 2010 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java Mon Dec 20 14:08:02 2010
@@ -302,6 +302,8 @@

        private boolean testNextNonce =false;

+       private String nextNonce = null;
+
        class MyEventSource implements Runnable {
                private TestSipListener notifier;
                private EventHeader eventHeader;
@@ -960,7 +962,8 @@
                                        Response.OK, request);
                        if(testNextNonce) {
AuthenticationInfoHeader authenticationInfoHeader = protocolObjects.headerFactory.createAuthenticationInfoHeader("");
-                               
authenticationInfoHeader.setNextNonce(dsam.generateNonce());
+                               nextNonce = dsam.generateNonce();
+                               
authenticationInfoHeader.setNextNonce(nextNonce);
                                
authenticationInfoHeader.removeParameter(ParameterNames.RESPONSE_AUTH);
                                okResponse.addHeader(authenticationInfoHeader);
                        }
@@ -1148,7 +1151,8 @@
                                }
                                if(testNextNonce) {
AuthenticationInfoHeader authenticationInfoHeader = protocolObjects.headerFactory.createAuthenticationInfoHeader("");
-                                       
authenticationInfoHeader.setNextNonce(dsam.generateNonce());
+                                       nextNonce = dsam.generateNonce();
+                                       
authenticationInfoHeader.setNextNonce(nextNonce);
authenticationInfoHeader.removeParameter(ParameterNames.RESPONSE_AUTH);
                                        
getFinalResponse().addHeader(authenticationInfoHeader);
                                }
@@ -1178,21 +1182,25 @@

        public boolean checkProxyAuthorization(Request request) {
         // Let Acks go through unchallenged.
-        boolean retorno;
         ProxyAuthorizationHeader proxyAuthorization=
(ProxyAuthorizationHeader)request.getHeader(ProxyAuthorizationHeader.NAME);

        if (proxyAuthorization==null) {
- System.out.println("Authentication failed: ProxyAuthorization header missing!"); + logger.error("Authentication failed: ProxyAuthorization header missing!");
            return false;
        }else{
+
+ if(nextNonce != null && !proxyAuthorization.getNonce().equals(nextNonce)) { + throw new IllegalArgumentException("Authentication failed: ProxyAuthorization nonce " + proxyAuthorization.getNonce() + " is different from the nextnonce previously generated " + nextNonce);
+          }
+
            String username=proxyAuthorization.getParameter("username");
            //String password=proxyAuthorization.getParameter("password");

            try{
boolean res=dsam.doAuthenticate(username,proxyAuthorization,request); - if (res) System.out.println("Authentication passed for user: "+username); - else System.out.println("Authentication failed for user: "+username); + if (res) logger.info("Authentication passed for user: "+username); + else logger.error("Authentication failed for user: "+username);
                 return res;
            }
            catch(Exception e) {
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/security/ShootistSipServletAuthTest.java Mon Dec 20 13:43:10 2010 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/security/ShootistSipServletAuthTest.java Mon Dec 20 14:08:02 2010
@@ -171,7 +171,8 @@
                params.put("nbSubsequentReq","4");
                params.put("METHOD", "REGISTER");
                deployApplication(params);
-               Thread.sleep(TIMEOUT);
+               Thread.sleep(TIMEOUT);
+               assertEquals(4, receiver.getLastRegisterCSeqNumber());
        }

        /*

Reply via email to