[jboss-cvs] JBossAS SVN: r110643 - in projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation: common and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2011-02-11 12:57:28 -0500 (Fri, 11 Feb 2011)
New Revision: 110643

Modified:
   projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java
   projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common/NegotiationContext.java
Log:
[SECURITY-537] Include timestamp in CallerPrincipal username.

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java	2011-02-11 17:54:00 UTC (rev 110642)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java	2011-02-11 17:57:28 UTC (rev 110643)
@@ -156,13 +156,17 @@
       NegotiationContext negotiationContext = (NegotiationContext) session.getNote(NEGOTIATION_CONTEXT);
       if (negotiationContext == null)
       {
-
          log.debug("Creating new NegotiationContext");
          negotiationContext = new NegotiationContext();
          session.setNote(NEGOTIATION_CONTEXT, negotiationContext);
       }
 
-      String username = session.getId();
+      String username = negotiationContext.getUsername();
+      if (username == null || username.length() == 0)
+      {
+         username = session.getId() + "_" + String.valueOf(System.currentTimeMillis());
+         negotiationContext.setUsername(username);
+      }
       String authenticationMethod = "";
       try
       {

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common/NegotiationContext.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common/NegotiationContext.java	2011-02-11 17:54:00 UTC (rev 110642)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common/NegotiationContext.java	2011-02-11 17:57:28 UTC (rev 110643)
@@ -40,6 +40,8 @@
 
    private static final ThreadLocal<NegotiationContext> negotiationContext = new ThreadLocal<NegotiationContext>();
 
+   private String username;
+   
    private boolean authenticated = false;
 
    private String authenticationMethod;
@@ -74,6 +76,16 @@
       negotiationContext.remove();
    }
 
+   public String getUsername()
+   {
+      return username;
+   }
+
+   public void setUsername(String username)
+   {
+      this.username = username;
+   }
+
    public boolean isAuthenticated()
    {
       return authenticated;