[jboss-cvs] JBossAS SVN: r109513 - in projects/security/security-negotiation/trunk: jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Nov 27 11:17:35 EST 2010
Author: darran.lofthouse at jboss.com
Date: 2010-11-27 11:17:34 -0500 (Sat, 27 Nov 2010)
New Revision: 109513
Added:
projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/Constants.java
Modified:
projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/OidNameUtil.java
projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java
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/tests/java/org/jboss/security/negotiation/spnego/encoding/NegTokenTargEncoderTest.java
Log:
[SECURITY-545] Code Cleanup Tasks.
Centralise OID instantiation to single location.
Added: projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/Constants.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/Constants.java (rev 0)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/Constants.java 2010-11-27 16:17:34 UTC (rev 109513)
@@ -0,0 +1,31 @@
+package org.jboss.security.negotiation;
+
+import org.ietf.jgss.GSSException;
+import org.ietf.jgss.Oid;
+
+public class Constants
+{
+ public static final Oid KERBEROS_V5;
+
+ public static final Oid KERBEROS_V5_LEGACY;
+
+ public static final Oid NTLM;
+
+ public static final Oid SPNEGO;
+
+ static
+ {
+ try
+ {
+ KERBEROS_V5 = new Oid("1.2.840.113554.1.2.2");
+ KERBEROS_V5_LEGACY = new Oid("1.2.840.48018.1.2.2");
+ SPNEGO = new Oid("1.3.6.1.5.5.2");
+ NTLM = new Oid("1.3.6.1.4.1.311.2.2.10");
+ }
+ catch (GSSException e)
+ {
+ throw new RuntimeException("Unable to initialise Oid", e);
+ }
+ }
+
+}
Property changes on: projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/Constants.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/OidNameUtil.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/OidNameUtil.java 2010-11-27 15:09:00 UTC (rev 109512)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/OidNameUtil.java 2010-11-27 16:17:34 UTC (rev 109513)
@@ -22,7 +22,11 @@
*/
package org.jboss.security.negotiation;
-import org.ietf.jgss.GSSException;
+import static org.jboss.security.negotiation.Constants.KERBEROS_V5;
+import static org.jboss.security.negotiation.Constants.KERBEROS_V5_LEGACY;
+import static org.jboss.security.negotiation.Constants.NTLM;
+import static org.jboss.security.negotiation.Constants.SPNEGO;
+
import org.ietf.jgss.Oid;
/**
@@ -34,29 +38,6 @@
public class OidNameUtil
{
- private static final Oid KERBEROS_V5;
-
- private static final Oid KERBEROS_V5_LEGACY;
-
- private static final Oid NTLM;
-
- private static final Oid SPNEGO;
-
- static
- {
- try
- {
- KERBEROS_V5 = new Oid("1.2.840.113554.1.2.2");
- KERBEROS_V5_LEGACY = new Oid("1.2.840.48018.1.2.2");
- SPNEGO = new Oid("1.3.6.1.5.5.2");
- NTLM = new Oid("1.3.6.1.4.1.311.2.2.10");
- }
- catch (GSSException e)
- {
- throw new RuntimeException("Unable to initialise Oid", e);
- }
- }
-
/**
* Return the name of the passed in Oid, if this is not available
* return the identifier.
@@ -65,7 +46,7 @@
* @return
*/
public static String getName(final Oid oid)
- {
+ {
if (KERBEROS_V5.equals(oid))
{
return "Kerberos V5";
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java 2010-11-27 15:09:00 UTC (rev 109512)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java 2010-11-27 16:17:34 UTC (rev 109513)
@@ -22,6 +22,8 @@
*/
package org.jboss.security.negotiation.spnego;
+import static org.jboss.security.negotiation.Constants.KERBEROS_V5;
+
import java.security.Principal;
import java.security.PrivilegedAction;
import java.security.acl.Group;
@@ -37,7 +39,6 @@
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
-import org.ietf.jgss.GSSException;
import org.ietf.jgss.GSSManager;
import org.ietf.jgss.Oid;
import org.jboss.security.SimpleGroup;
@@ -62,7 +63,7 @@
private static final String REMOVE_REALM_FROM_PRINCIPAL = "removeRealmFromPrincipal";
- private static final Oid kerberos;
+ private static final Oid kerberos = KERBEROS_V5;
// TODO - Pick a name for a default domain?
private String serverSecurityDomain;
@@ -73,18 +74,6 @@
private Principal identity = null;
- static
- {
- try
- {
- kerberos = new Oid("1.2.840.113554.1.2.2");
- }
- catch (GSSException e)
- {
- throw new RuntimeException("Unable to initialise Oid", e);
- }
- }
-
@Override
public void initialize(final Subject subject, final CallbackHandler callbackHandler, final Map sharedState,
final Map options)
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 2010-11-27 15:09:00 UTC (rev 109512)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/InitSPNEGOContextAction.java 2010-11-27 16:17:34 UTC (rev 109513)
@@ -21,6 +21,8 @@
*/
package org.jboss.security.negotiation.spnego.net;
+import static org.jboss.security.negotiation.Constants.SPNEGO;
+
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -80,7 +82,7 @@
DataInputStream inStream = new DataInputStream(socket.getInputStream());
DataOutputStream outStream = new DataOutputStream(socket.getOutputStream());
- Oid oid = new Oid("1.3.6.1.5.5.2");
+ Oid oid = SPNEGO;
GSSName serverName = manager.createName("jboss/mmoyses", null);
context = manager.createContext(serverName, oid, null, GSSContext.DEFAULT_LIFETIME);
while (!context.isEstablished())
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/tests/java/org/jboss/security/negotiation/spnego/encoding/NegTokenTargEncoderTest.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/tests/java/org/jboss/security/negotiation/spnego/encoding/NegTokenTargEncoderTest.java 2010-11-27 15:09:00 UTC (rev 109512)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/src/tests/java/org/jboss/security/negotiation/spnego/encoding/NegTokenTargEncoderTest.java 2010-11-27 16:17:34 UTC (rev 109513)
@@ -15,15 +15,15 @@
*/
package org.jboss.security.negotiation.spnego.encoding;
+import static org.jboss.security.negotiation.Constants.KERBEROS_V5;
import java.io.IOException;
+import junit.framework.TestCase;
+
import org.ietf.jgss.GSSException;
-import org.ietf.jgss.Oid;
import org.jboss.security.negotiation.common.DebugHelper;
-import junit.framework.TestCase;
-
/**
* Test case for the NegTokenTargEncoder.
*
@@ -43,7 +43,7 @@
{
NegTokenTarg targ = new NegTokenTarg();
targ.setNegResult(NegTokenTarg.ACCEPT_INCOMPLETE);
- targ.setSupportedMech(new Oid("1.2.840.113554.1.2.2"));
+ targ.setSupportedMech(KERBEROS_V5);
byte[] response = NegTokenTargEncoder.encode(targ);
More information about the jboss-cvs-commits
mailing list