Revision: 049f1d00ecb1
Author: Jean Deruelle <[email protected]>
Date: Wed Jun 6 12:51:00 2012
Log: Fixes Issue 88
http://code.google.com/p/sipservlets/source/detail?r=049f1d00ecb1
Modified:
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/security/CatalinaSipPrincipal.java
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/security/authentication/DigestAuthenticator.java
/containers/sip-servlets-catalina-7/src/main/java/org/mobicents/servlet/sip/catalina/security/CatalinaSipPrincipal.java
/containers/sip-servlets-catalina-7/src/main/java/org/mobicents/servlet/sip/catalina/security/authentication/DigestAuthenticator.java
/containers/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/security/CatalinaSipPrincipal.java
/containers/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/security/authentication/DigestAuthenticator.java
/sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/security/SipPrincipal.java
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/security/ShootmeSipServletAuthTest.java
/sip-servlets-test-suite/testsuite/src/test/resources/log4j.xml
=======================================
---
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/security/CatalinaSipPrincipal.java
Tue Mar 27 08:02:55 2012
+++
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/security/CatalinaSipPrincipal.java
Wed Jun 6 12:51:00 2012
@@ -52,4 +52,8 @@
return ((GenericPrincipal)principal).hasRole(role);
}
-}
+ @Override
+ public Principal getPrincipal() {
+ return principal;
+ }
+}
=======================================
---
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/security/authentication/DigestAuthenticator.java
Tue Mar 27 08:02:55 2012
+++
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/security/authentication/DigestAuthenticator.java
Wed Jun 6 12:51:00 2012
@@ -168,7 +168,9 @@
String authorization = request.getHeader("authorization");
if (authorization != null) {
principal = findPrincipal(request, authorization,
context.getRealm());
- if (principal != null) {
+ if (principal != null &&
+ // fix for
http://code.google.com/p/sipservlets/issues/detail?id=88
+ principal.getPrincipal() != null) {
String username = parseUsername(authorization);
register(request, response, principal,
"DIGEST",//Constants.DIGEST_METHOD,
=======================================
---
/containers/sip-servlets-catalina-7/src/main/java/org/mobicents/servlet/sip/catalina/security/CatalinaSipPrincipal.java
Tue Mar 27 08:02:55 2012
+++
/containers/sip-servlets-catalina-7/src/main/java/org/mobicents/servlet/sip/catalina/security/CatalinaSipPrincipal.java
Wed Jun 6 12:51:00 2012
@@ -52,4 +52,8 @@
return ((GenericPrincipal)principal).hasRole(role);
}
-}
+ @Override
+ public Principal getPrincipal() {
+ return principal;
+ }
+}
=======================================
---
/containers/sip-servlets-catalina-7/src/main/java/org/mobicents/servlet/sip/catalina/security/authentication/DigestAuthenticator.java
Tue Mar 27 08:02:55 2012
+++
/containers/sip-servlets-catalina-7/src/main/java/org/mobicents/servlet/sip/catalina/security/authentication/DigestAuthenticator.java
Wed Jun 6 12:51:00 2012
@@ -168,7 +168,9 @@
String authorization = request.getHeader("authorization");
if (authorization != null) {
principal = findPrincipal(request, authorization,
context.getRealm());
- if (principal != null) {
+ if (principal != null &&
+ // fix for
http://code.google.com/p/sipservlets/issues/detail?id=88
+ principal.getPrincipal() != null) {
String username = parseUsername(authorization);
register(request, response, principal,
Constants.DIGEST_METHOD,
=======================================
---
/containers/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/security/CatalinaSipPrincipal.java
Tue Mar 27 08:02:55 2012
+++
/containers/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/security/CatalinaSipPrincipal.java
Wed Jun 6 12:51:00 2012
@@ -52,5 +52,10 @@
public boolean isUserInRole(String role) {
return ((GenericPrincipal)principal).hasRole(role);
}
+
+ @Override
+ public Principal getPrincipal() {
+ return principal;
+ }
}
=======================================
---
/containers/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/security/authentication/DigestAuthenticator.java
Tue Mar 27 08:02:55 2012
+++
/containers/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/security/authentication/DigestAuthenticator.java
Wed Jun 6 12:51:00 2012
@@ -164,7 +164,9 @@
String authorization = request.getHeader("authorization");
if (authorization != null) {
principal = findPrincipal(request, authorization,
context.getRealm());
- if (principal != null) {
+ if (principal != null &&
+ // fix for
http://code.google.com/p/sipservlets/issues/detail?id=88
+ principal.getPrincipal() != null) {
String username = parseUsername(authorization);
register(request, response, principal,
Constants.DIGEST_METHOD,
=======================================
---
/sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/security/SipPrincipal.java
Tue Sep 20 08:23:24 2011
+++
/sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/security/SipPrincipal.java
Wed Jun 6 12:51:00 2012
@@ -31,5 +31,5 @@
public interface SipPrincipal extends Principal {
boolean isUserInRole(String role);
-
-}
+ Principal getPrincipal();
+}
=======================================
---
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
Wed Nov 16 13:44:45 2011
+++
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
Wed Jun 6 12:51:00 2012
@@ -341,6 +341,8 @@
private boolean addRecordRouteForResponses;
private RFC5626UseCase rfc5626UseCase;
+
+ private String securityUser = "user";
class MyEventSource implements Runnable {
private TestSipListener notifier;
@@ -1816,7 +1818,12 @@
URI uriReq = tid.getRequest().getRequestURI();
Request authrequest =
this.processResponseAuthorization(
response, uriReq);
-
+
+ if(authrequest == null) {
+ System.out
+ .println("INVITE AUTHORIZATION null,
stopping there");
+ return;
+ }
inviteClientTid.sendRequest();
System.out
.println("INVITE AUTHORIZATION
sent:\n" + authrequest);
@@ -1864,6 +1871,10 @@
logger.error("Cannot increment the Cseq header to the new INVITE
request",e);
throw new IllegalArgumentException("Cannot create the INVITE
request",e);
}
+ // non regression test for
http://code.google.com/p/sipservlets/issues/detail?id=88
+ if(securityUser.equalsIgnoreCase("badUser") && cSeq.getSeqNumber() > 2)
{
+ return null;
+ }
requestauth.setHeader(cSeq);
requestauth.removeHeader(ViaHeader.NAME);
// Create ViaHeaders
@@ -1895,7 +1906,7 @@
"", // TODO: What is this entity-body?
((WWWAuthenticate) (response
.getHeader(SIPHeaderNames.WWW_AUTHENTICATE))),
- "user",
+ securityUser,
"pass",
((WWWAuthenticate) (response
.getHeader(SIPHeaderNames.WWW_AUTHENTICATE))).getNonce(),
@@ -3284,4 +3295,8 @@
public void setRFC5626UseCase(RFC5626UseCase rfc5626UseCase) {
this.rfc5626UseCase = rfc5626UseCase;
}
-}
+
+ public void setSecurityUser(String securityUser) {
+ this.securityUser = securityUser;
+ }
+}
=======================================
---
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/security/ShootmeSipServletAuthTest.java
Thu Sep 8 02:20:56 2011
+++
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/security/ShootmeSipServletAuthTest.java
Wed Jun 6 12:51:00 2012
@@ -126,6 +126,28 @@
assertTrue(sender.isAckSent());
assertTrue(sender.getOkToByeReceived());
}
+
+ // non regression test for
http://code.google.com/p/sipservlets/issues/detail?id=88
+ public void testShootmeBadUser() throws InterruptedException,
SipException,
+ ParseException, InvalidArgumentException {
+ String fromName = "sender";
+ String fromSipAddress = "sip-servlets.com";
+ SipURI fromAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ fromName, fromSipAddress);
+
+ String toUser = "receiver";
+ String toSipAddress = "sip-servlets.com";
+ SipURI toAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ toUser, toSipAddress);
+
+ sender.setSecurityUser("baduser");
+ sender.sendSipRequest("INVITE", fromAddress, toAddress, null,
null,
+ false);
+ Thread.sleep(TIMEOUT);
+ assertFalse(sender.isAckSent());
+ assertFalse(sender.getOkToByeReceived());
+ assertEquals(401, sender.getFinalResponseStatus());
+ }
@Override
protected void tearDown() throws Exception {
=======================================
--- /sip-servlets-test-suite/testsuite/src/test/resources/log4j.xml Tue
Apr 3 08:35:52 2012
+++ /sip-servlets-test-suite/testsuite/src/test/resources/log4j.xml Wed
Jun 6 12:51:00 2012
@@ -19,7 +19,7 @@
</layout>
</appender>
<root>
- <priority value ="INFO" />
+ <priority value ="DEBUG" />
<appender-ref ref="rolling-file" />
<appender-ref ref="console" />
</root>