[jboss-cvs] JBossAS SVN: r110569 - projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net.

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

Author: mmoyses
Date: 2011-02-09 12:41:16 -0500 (Wed, 09 Feb 2011)
New Revision: 110569

Modified:
   projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/InitSPNEGOContextAction.java
   projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SPNEGOSocket.java
   projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SecurityActions.java
Log:
SECURITY-565: fixing hardcoded server name

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/InitSPNEGOContextAction.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/InitSPNEGOContextAction.java	2011-02-09 17:20:56 UTC (rev 110568)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/InitSPNEGOContextAction.java	2011-02-09 17:41:16 UTC (rev 110569)
@@ -83,7 +83,10 @@
          DataOutputStream outStream = new DataOutputStream(socket.getOutputStream());
 
          Oid oid = SPNEGO;
-         GSSName serverName = manager.createName("jboss/mmoyses", null);
+         String nameStr = SecurityActions.getServerName();
+         if (nameStr == null)
+            throw new IllegalArgumentException("Server name must be set using the org.jboss.security.negotiation.server.principal system property");
+         GSSName serverName = manager.createName(nameStr, null);
          context = manager.createContext(serverName, oid, null, GSSContext.DEFAULT_LIFETIME);
          while (!context.isEstablished())
          {

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SPNEGOSocket.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SPNEGOSocket.java	2011-02-09 17:20:56 UTC (rev 110568)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SPNEGOSocket.java	2011-02-09 17:41:16 UTC (rev 110569)
@@ -155,7 +155,8 @@
     */
    protected Subject login() throws LoginException
    {
-      lc = new LoginContext("com.sun.security.jgss.krb5.initiate", new SecurityAssociationHandler());
+      String securityDomainName = SecurityActions.getClientSecurityDomain();
+      lc = new LoginContext(securityDomainName, new SecurityAssociationHandler());
       lc.login();
       return lc.getSubject();
    }

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SecurityActions.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SecurityActions.java	2011-02-09 17:20:56 UTC (rev 110568)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SecurityActions.java	2011-02-09 17:41:16 UTC (rev 110569)
@@ -77,4 +77,26 @@
       });
    }
    
+   static String getClientSecurityDomain()
+   {
+      return AccessController.doPrivileged(new PrivilegedAction<String>()
+      {
+         public String run()
+         {
+            return (String) System.getProperty("org.jboss.security.negotiation.default.client.security.domain", "com.sun.security.jgss.krb5.initiate");
+         }
+      });
+   }
+   
+   static String getServerName()
+   {
+      return AccessController.doPrivileged(new PrivilegedAction<String>()
+      {
+         public String run()
+         {
+            return (String) System.getProperty("org.jboss.security.negotiation.server.principal");
+         }
+      });
+   }
+   
 }