maguro 2005/10/27 15:10:14
Modified:
modules/openejb-builder/src/java/org/openejb/corba/security/config/tss
TSSConfigEditor.java
Log:
Updated configurations to handle realm->login-domain->principal hierarchy.
Revision Changes Path
1.9 +23 -12
openejb/modules/openejb-builder/src/java/org/openejb/corba/security/config/tss/TSSConfigEditor.java
Index: TSSConfigEditor.java
===================================================================
RCS file:
/scm/openejb/openejb/modules/openejb-builder/src/java/org/openejb/corba/security/config/tss/TSSConfigEditor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TSSConfigEditor.java 28 Sep 2005 22:14:25 -0000 1.8
+++ TSSConfigEditor.java 27 Oct 2005 19:10:14 -0000 1.9
@@ -47,6 +47,8 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
import org.omg.CSIIOP.CompositeDelegation;
import org.omg.CSIIOP.Confidentiality;
import org.omg.CSIIOP.DetectMisordering;
@@ -57,8 +59,6 @@
import org.omg.CSIIOP.NoDelegation;
import org.omg.CSIIOP.NoProtection;
import org.omg.CSIIOP.SimpleDelegation;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.common.propertyeditor.PropertyEditorException;
@@ -78,8 +78,8 @@
import org.openejb.xbeans.csiv2.tss.TSSIdentityTokenTypeList;
import org.openejb.xbeans.csiv2.tss.TSSSSLType;
import org.openejb.xbeans.csiv2.tss.TSSSasMechType;
-import org.openejb.xbeans.csiv2.tss.TSSTssType;
import org.openejb.xbeans.csiv2.tss.TSSTssDocument;
+import org.openejb.xbeans.csiv2.tss.TSSTssType;
/**
@@ -125,7 +125,6 @@
DefaultPrincipal defaultPrincipal = new DefaultPrincipal();
GerDefaultPrincipalType defaultPrincipalType =
tss.getDefaultPrincipal();
-
defaultPrincipal.setRealmName(defaultPrincipalType.getRealmName().trim());
defaultPrincipal.setPrincipal(SecurityBuilder.buildPrincipal(defaultPrincipalType.getPrincipal()));
tssConfig.setDefaultPrincipal(defaultPrincipal);
@@ -220,16 +219,28 @@
sasMechConfig.addIdentityToken(new TSSITTAnonymous());
}
if (identityTokenTypes.isSetITTPrincipalNameGSSUP()) {
- String realmName =
identityTokenTypes.getITTPrincipalNameGSSUP().getRealmName().trim();
- sasMechConfig.addIdentityToken(new
TSSITTPrincipalNameGSSUP(realmName));
+ String realmName =
identityTokenTypes.getITTPrincipalNameGSSUP().getRealmName();
+ String domainName =
identityTokenTypes.getITTPrincipalNameGSSUP().getDomainName();
+
+ realmName = (realmName == null ? "" : realmName.trim());
+ domainName = (domainName == null ? "" : domainName.trim());
+ sasMechConfig.addIdentityToken(new
TSSITTPrincipalNameGSSUP(realmName, domainName));
}
if (identityTokenTypes.isSetITTDistinguishedName()) {
- String realmName =
identityTokenTypes.getITTDistinguishedName().getRealmName().trim();
- sasMechConfig.addIdentityToken(new
TSSITTDistinguishedName(realmName));
+ String realmName =
identityTokenTypes.getITTDistinguishedName().getRealmName();
+ String domainName =
identityTokenTypes.getITTDistinguishedName().getDomainName();
+
+ realmName = (realmName == null ? "" : realmName.trim());
+ domainName = (domainName == null ? "" : domainName.trim());
+ sasMechConfig.addIdentityToken(new
TSSITTDistinguishedName(realmName, domainName));
}
if (identityTokenTypes.isSetITTX509CertChain()) {
- String realmName =
identityTokenTypes.getITTX509CertChain().getRealmName().trim();
- sasMechConfig.addIdentityToken(new
TSSITTX509CertChain(realmName));
+ String realmName =
identityTokenTypes.getITTX509CertChain().getRealmName();
+ String domainName =
identityTokenTypes.getITTX509CertChain().getDomainName();
+
+ realmName = (realmName == null ? "" : realmName.trim());
+ domainName = (domainName == null ? "" : domainName.trim());
+ sasMechConfig.addIdentityToken(new
TSSITTX509CertChain(realmName, domainName));
}
}
