February 2011 - picketlink-commits

Picketlink SVN: r785 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-28 16:22:22 -0500 (Mon, 28 Feb 2011) New Revision: 785 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ProviderType.java Log: minor initialization change Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ProviderType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ProviderType.java 2011-02-28 21:07:55 UTC (rev 784) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ProviderType.java 2011-02-28 21:22:22 UTC (rev 785) @@ -71,7 +71,7 @@ protected String serverEnvironment; - protected String canonicalizationMethod; + protected String canonicalizationMethod = CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS; /** * Gets the value of the identityURL property. @@ -220,9 +220,6 @@ */ public String getCanonicalizationMethod() { - if (canonicalizationMethod == null) - canonicalizationMethod = CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS; - return canonicalizationMethod; }

13 years, 1 month

1
0
0 / 0

Picketlink SVN: r784 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-28 16:07:55 -0500 (Mon, 28 Feb 2011) New Revision: 784 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/AuthPropertyType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorsType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/EncAlgoType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/EncryptionType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/IDPType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/KeyProviderType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/KeyValueType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/MetadataProviderType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ProviderType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/SPType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/STSType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ServiceProviderType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ServiceProvidersType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProviderType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProvidersType.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TrustType.java Log: add license header Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/AuthPropertyType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/AuthPropertyType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/AuthPropertyType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; /** @@ -16,7 +37,6 @@ * * */ -public class AuthPropertyType - extends KeyValueType -{ +public class AuthPropertyType extends KeyValueType +{ } \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; import java.util.ArrayList; @@ -2,3 +23,3 @@ import java.util.Collections; -import java.util.List; +import java.util.List; @@ -24,81 +45,89 @@ * </pre> * * - */ -public class ClaimsProcessorType { + */ +public class ClaimsProcessorType +{ - protected List<KeyValueType> property = new ArrayList<KeyValueType>(); - protected String processorClass; - protected String dialect; + protected List<KeyValueType> property = new ArrayList<KeyValueType>(); - public void add( KeyValueType kv ) - { - this.property.add(kv); - } - - public void remove( KeyValueType kv ) - { - this.property.remove(kv); - } - - /** - * Gets the value of the property property. - * - * Objects of the following type(s) are allowed in the list - * {@link KeyValueType } - * - * - */ - public List<KeyValueType> getProperty() { - return Collections.unmodifiableList( this.property ); - } + protected String processorClass; - /** - * Gets the value of the processorClass property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getProcessorClass() { - return processorClass; - } + protected String dialect; - /** - * Sets the value of the processorClass property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setProcessorClass(String value) { - this.processorClass = value; - } + public void add(KeyValueType kv) + { + this.property.add(kv); + } - /** - * Gets the value of the dialect property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDialect() { - return dialect; - } + public void remove(KeyValueType kv) + { + this.property.remove(kv); + } - /** - * Sets the value of the dialect property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDialect(String value) { - this.dialect = value; - } + /** + * Gets the value of the property property. + * + * Objects of the following type(s) are allowed in the list + * {@link KeyValueType } + * + * + */ + public List<KeyValueType> getProperty() + { + return Collections.unmodifiableList(this.property); + } + /** + * Gets the value of the processorClass property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getProcessorClass() + { + return processorClass; + } + + /** + * Sets the value of the processorClass property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setProcessorClass(String value) + { + this.processorClass = value; + } + + /** + * Gets the value of the dialect property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDialect() + { + return dialect; + } + + /** + * Sets the value of the dialect property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDialect(String value) + { + this.dialect = value; + } + } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorsType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorsType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorsType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; import java.util.ArrayList; @@ -26,31 +47,33 @@ * </pre> * * - */ -public class ClaimsProcessorsType { + */ +public class ClaimsProcessorsType +{ - protected List<ClaimsProcessorType> claimsProcessor = new ArrayList<ClaimsProcessorType>(); + protected List<ClaimsProcessorType> claimsProcessor = new ArrayList<ClaimsProcessorType>(); - public void add( ClaimsProcessorType claim ) - { - this.claimsProcessor.add( claim); - } - - public void remove( ClaimsProcessorType claim ) - { - this.claimsProcessor.remove( claim); - } - - /** - * Gets the value of the claimsProcessor property. - * - * Objects of the following type(s) are allowed in the list - * {@link ClaimsProcessorType } - * - * - */ - public List<ClaimsProcessorType> getClaimsProcessor() { - return Collections.unmodifiableList( this.claimsProcessor ); - } + public void add(ClaimsProcessorType claim) + { + this.claimsProcessor.add(claim); + } + public void remove(ClaimsProcessorType claim) + { + this.claimsProcessor.remove(claim); + } + + /** + * Gets the value of the claimsProcessor property. + * + * Objects of the following type(s) are allowed in the list + * {@link ClaimsProcessorType } + * + * + */ + public List<ClaimsProcessorType> getClaimsProcessor() + { + return Collections.unmodifiableList(this.claimsProcessor); + } + } \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/EncAlgoType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/EncAlgoType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/EncAlgoType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; /** @@ -15,29 +36,32 @@ * </simpleType> * </pre> * - */ + */ public enum EncAlgoType { - AES("AES"), - DES("DES"), - DE_SEDE("DESede"); - private final String value; + AES("AES"), DES("DES"), DE_SEDE("DESede"); + private final String value; - EncAlgoType(String v) { - value = v; - } + EncAlgoType(String v) + { + value = v; + } - public String value() { - return value; - } + public String value() + { + return value; + } - public static EncAlgoType fromValue(String v) { - for (EncAlgoType c: EncAlgoType.values()) { - if (c.value.equals(v)) { - return c; - } - } - throw new IllegalArgumentException(v); - } + public static EncAlgoType fromValue(String v) + { + for (EncAlgoType c : EncAlgoType.values()) + { + if (c.value.equals(v)) + { + return c; + } + } + throw new IllegalArgumentException(v); + } } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/EncryptionType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/EncryptionType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/EncryptionType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,5 +1,25 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; - /** * Java class for EncryptionType complex type. @@ -20,50 +40,56 @@ * </pre> * * - */ -public class EncryptionType { - - protected EncAlgoType encAlgo; - protected int keySize; + */ +public class EncryptionType +{ - /** - * Gets the value of the encAlgo property. - * - * @return - * possible object is - * {@link EncAlgoType } - * - */ - public EncAlgoType getEncAlgo() { - return encAlgo; - } + protected EncAlgoType encAlgo; - /** - * Sets the value of the encAlgo property. - * - * @param value - * allowed object is - * {@link EncAlgoType } - * - */ - public void setEncAlgo(EncAlgoType value) { - this.encAlgo = value; - } + protected int keySize; - /** - * Gets the value of the keySize property. - * - */ - public int getKeySize() { - return keySize; - } + /** + * Gets the value of the encAlgo property. + * + * @return + * possible object is + * {@link EncAlgoType } + * + */ + public EncAlgoType getEncAlgo() + { + return encAlgo; + } - /** - * Sets the value of the keySize property. - * - */ - public void setKeySize(int value) { - this.keySize = value; - } + /** + * Sets the value of the encAlgo property. + * + * @param value + * allowed object is + * {@link EncAlgoType } + * + */ + public void setEncAlgo(EncAlgoType value) + { + this.encAlgo = value; + } + /** + * Gets the value of the keySize property. + * + */ + public int getKeySize() + { + return keySize; + } + + /** + * Sets the value of the keySize property. + * + */ + public void setKeySize(int value) + { + this.keySize = value; + } + } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/IDPType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/IDPType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/IDPType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,5 +1,25 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; - /** * @@ -28,151 +48,176 @@ * </pre> * * - */ -public class IDPType - extends ProviderType + */ +public class IDPType extends ProviderType { - protected EncryptionType encryption; - protected Long assertionValidity; - protected String roleGenerator; - protected String attributeManager; - protected Boolean encrypt; + protected EncryptionType encryption; - /** - * Gets the value of the encryption property. - * - * @return - * possible object is - * {@link EncryptionType } - * - */ - public EncryptionType getEncryption() { - return encryption; - } + protected Long assertionValidity; - /** - * Sets the value of the encryption property. - * - * @param value - * allowed object is - * {@link EncryptionType } - * - */ - public void setEncryption(EncryptionType value) { - this.encryption = value; - } + protected String roleGenerator; - /** - * Gets the value of the assertionValidity property. - * - * @return - * possible object is - * {@link Long } - * - */ - public long getAssertionValidity() { - if (assertionValidity == null) { - return 300000L; - } else { - return assertionValidity; - } - } + protected String attributeManager; - /** - * Sets the value of the assertionValidity property. - * - * @param value - * allowed object is - * {@link Long } - * - */ - public void setAssertionValidity(Long value) { - this.assertionValidity = value; - } + protected Boolean encrypt; - /** - * Gets the value of the roleGenerator property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getRoleGenerator() { - if (roleGenerator == null) { - return "org.picketlink.identity.federation.bindings.tomcat.TomcatRoleGenerator"; - } else { - return roleGenerator; - } - } + /** + * Gets the value of the encryption property. + * + * @return + * possible object is + * {@link EncryptionType } + * + */ + public EncryptionType getEncryption() + { + return encryption; + } - /** - * Sets the value of the roleGenerator property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRoleGenerator(String value) { - this.roleGenerator = value; - } + /** + * Sets the value of the encryption property. + * + * @param value + * allowed object is + * {@link EncryptionType } + * + */ + public void setEncryption(EncryptionType value) + { + this.encryption = value; + } - /** - * Gets the value of the attributeManager property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAttributeManager() { - if (attributeManager == null) { - return "org.picketlink.identity.federation.bindings.tomcat.TomcatAttributeManager"; - } else { - return attributeManager; - } - } + /** + * Gets the value of the assertionValidity property. + * + * @return + * possible object is + * {@link Long } + * + */ + public long getAssertionValidity() + { + if (assertionValidity == null) + { + return 300000L; + } + else + { + return assertionValidity; + } + } - /** - * Sets the value of the attributeManager property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAttributeManager(String value) { - this.attributeManager = value; - } + /** + * Sets the value of the assertionValidity property. + * + * @param value + * allowed object is + * {@link Long } + * + */ + public void setAssertionValidity(Long value) + { + this.assertionValidity = value; + } - /** - * Gets the value of the encrypt property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isEncrypt() { - if (encrypt == null) { - return false; - } else { - return encrypt; - } - } + /** + * Gets the value of the roleGenerator property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRoleGenerator() + { + if (roleGenerator == null) + { + return "org.picketlink.identity.federation.bindings.tomcat.TomcatRoleGenerator"; + } + else + { + return roleGenerator; + } + } - /** - * Sets the value of the encrypt property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setEncrypt(Boolean value) { - this.encrypt = value; - } + /** + * Sets the value of the roleGenerator property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRoleGenerator(String value) + { + this.roleGenerator = value; + } + /** + * Gets the value of the attributeManager property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAttributeManager() + { + if (attributeManager == null) + { + return "org.picketlink.identity.federation.bindings.tomcat.TomcatAttributeManager"; + } + else + { + return attributeManager; + } + } + + /** + * Sets the value of the attributeManager property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAttributeManager(String value) + { + this.attributeManager = value; + } + + /** + * Gets the value of the encrypt property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isEncrypt() + { + if (encrypt == null) + { + return false; + } + else + { + return encrypt; + } + } + + /** + * Sets the value of the encrypt property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setEncrypt(Boolean value) + { + this.encrypt = value; + } + } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/KeyProviderType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/KeyProviderType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/KeyProviderType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; import java.util.ArrayList; @@ -3,7 +24,5 @@ import java.util.Collections; import java.util.List; - - /** * @@ -31,102 +50,114 @@ * </pre> * * - */ -public class KeyProviderType { - - protected List<AuthPropertyType> auth = new ArrayList<AuthPropertyType>(); - protected List<KeyValueType> validatingAlias = new ArrayList<KeyValueType>(); - protected String signingAlias; - protected String className; + */ +public class KeyProviderType +{ - public void add( AuthPropertyType kv) - { - this.auth.add(kv); - } - public void remove( AuthPropertyType kv) - { - this.auth.remove(kv); - } - - /** - * Gets the value of the auth property. - * - * Objects of the following type(s) are allowed in the list - * {@link AuthPropertyType } - * - * - */ - public List<AuthPropertyType> getAuth() { - return Collections.unmodifiableList( this.auth ); - } - - public void add(KeyValueType kv) - { - this.validatingAlias.add(kv); - } - public void remove(KeyValueType kv) - { - this.validatingAlias.remove(kv); - } + protected List<AuthPropertyType> auth = new ArrayList<AuthPropertyType>(); - /** - * Gets the value of the validatingAlias property. - * - * Objects of the following type(s) are allowed in the list - * {@link KeyValueType } - * - * - */ - public List<KeyValueType> getValidatingAlias() { - return Collections.unmodifiableList( this.validatingAlias ); - } + protected List<KeyValueType> validatingAlias = new ArrayList<KeyValueType>(); - /** - * Gets the value of the signingAlias property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSigningAlias() { - return signingAlias; - } + protected String signingAlias; - /** - * Sets the value of the signingAlias property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSigningAlias(String value) { - this.signingAlias = value; - } + protected String className; - /** - * Gets the value of the className property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getClassName() { - return className; - } + public void add(AuthPropertyType kv) + { + this.auth.add(kv); + } - /** - * Sets the value of the className property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setClassName(String value) { - this.className = value; - } + public void remove(AuthPropertyType kv) + { + this.auth.remove(kv); + } + /** + * Gets the value of the auth property. + * + * Objects of the following type(s) are allowed in the list + * {@link AuthPropertyType } + * + * + */ + public List<AuthPropertyType> getAuth() + { + return Collections.unmodifiableList(this.auth); + } + + public void add(KeyValueType kv) + { + this.validatingAlias.add(kv); + } + + public void remove(KeyValueType kv) + { + this.validatingAlias.remove(kv); + } + + /** + * Gets the value of the validatingAlias property. + * + * Objects of the following type(s) are allowed in the list + * {@link KeyValueType } + * + * + */ + public List<KeyValueType> getValidatingAlias() + { + return Collections.unmodifiableList(this.validatingAlias); + } + + /** + * Gets the value of the signingAlias property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSigningAlias() + { + return signingAlias; + } + + /** + * Sets the value of the signingAlias property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSigningAlias(String value) + { + this.signingAlias = value; + } + + /** + * Gets the value of the className property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getClassName() + { + return className; + } + + /** + * Sets the value of the className property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setClassName(String value) + { + this.className = value; + } + } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/KeyValueType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/KeyValueType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/KeyValueType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; /** @@ -17,58 +38,64 @@ * </pre> * * - */ -public class KeyValueType { - - protected String key; - protected String value; + */ +public class KeyValueType +{ - /** - * Gets the value of the key property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getKey() { - return key; - } + protected String key; - /** - * Sets the value of the key property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setKey(String value) { - this.key = value; - } + protected String value; - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() + { + return key; + } - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) + { + this.key = value; + } + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() + { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) + { + this.value = value; + } + } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/MetadataProviderType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/MetadataProviderType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/MetadataProviderType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; import java.util.ArrayList; @@ -4,7 +25,6 @@ import java.util.Collections; import java.util.List; - /** * Java class for MetadataProviderType complex type. * @@ -24,56 +44,62 @@ * </pre> * * - */ -public class MetadataProviderType { - - protected List<KeyValueType> option = new ArrayList<KeyValueType>(); - protected String className; + */ +public class MetadataProviderType +{ - public void add( KeyValueType kv ) - { - this.option.add(kv); - } - public void remove( KeyValueType kv ) - { - this.option.remove(kv); - } - - /** - * Gets the value of the option property. - * - * - * Objects of the following type(s) are allowed in the list - * {@link KeyValueType } - * - * - */ - public List<KeyValueType> getOption() { - return Collections.unmodifiableList( this.option ); - } + protected List<KeyValueType> option = new ArrayList<KeyValueType>(); - /** - * Gets the value of the className property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getClassName() { - return className; - } + protected String className; - /** - * Sets the value of the className property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setClassName(String value) { - this.className = value; - } + public void add(KeyValueType kv) + { + this.option.add(kv); + } + public void remove(KeyValueType kv) + { + this.option.remove(kv); + } + + /** + * Gets the value of the option property. + * + * + * Objects of the following type(s) are allowed in the list + * {@link KeyValueType } + * + * + */ + public List<KeyValueType> getOption() + { + return Collections.unmodifiableList(this.option); + } + + /** + * Gets the value of the className property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getClassName() + { + return className; + } + + /** + * Sets the value of the className property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setClassName(String value) + { + this.className = value; + } + } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ProviderType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ProviderType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ProviderType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; import javax.xml.crypto.dsig.CanonicalizationMethod; @@ -2,3 +23,2 @@ - /** @@ -37,154 +57,172 @@ * </pre> * * - */ -public class ProviderType { + */ +public class ProviderType +{ - protected String identityURL; - protected TrustType trust; - protected KeyProviderType keyProvider; - protected MetadataProviderType metaDataProvider; - protected String serverEnvironment; - protected String canonicalizationMethod; + protected String identityURL; - /** - * Gets the value of the identityURL property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIdentityURL() { - return identityURL; - } + protected TrustType trust; - /** - * Sets the value of the identityURL property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIdentityURL(String value) { - this.identityURL = value; - } + protected KeyProviderType keyProvider; - /** - * Gets the value of the trust property. - * - * @return - * possible object is - * {@link TrustType } - * - */ - public TrustType getTrust() { - return trust; - } + protected MetadataProviderType metaDataProvider; - /** - * Sets the value of the trust property. - * - * @param value - * allowed object is - * {@link TrustType } - * - */ - public void setTrust(TrustType value) { - this.trust = value; - } + protected String serverEnvironment; - /** - * Gets the value of the keyProvider property. - * - * @return - * possible object is - * {@link KeyProviderType } - * - */ - public KeyProviderType getKeyProvider() { - return keyProvider; - } + protected String canonicalizationMethod; - /** - * Sets the value of the keyProvider property. - * - * @param value - * allowed object is - * {@link KeyProviderType } - * - */ - public void setKeyProvider(KeyProviderType value) { - this.keyProvider = value; - } + /** + * Gets the value of the identityURL property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIdentityURL() + { + return identityURL; + } - /** - * Gets the value of the metaDataProvider property. - * - * @return - * possible object is - * {@link MetadataProviderType } - * - */ - public MetadataProviderType getMetaDataProvider() { - return metaDataProvider; - } + /** + * Sets the value of the identityURL property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIdentityURL(String value) + { + this.identityURL = value; + } - /** - * Sets the value of the metaDataProvider property. - * - * @param value - * allowed object is - * {@link MetadataProviderType } - * - */ - public void setMetaDataProvider(MetadataProviderType value) { - this.metaDataProvider = value; - } + /** + * Gets the value of the trust property. + * + * @return + * possible object is + * {@link TrustType } + * + */ + public TrustType getTrust() + { + return trust; + } - /** - * Gets the value of the serverEnvironment property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getServerEnvironment() { - if (serverEnvironment == null) { - return "picketlink"; - } else { - return serverEnvironment; - } - } + /** + * Sets the value of the trust property. + * + * @param value + * allowed object is + * {@link TrustType } + * + */ + public void setTrust(TrustType value) + { + this.trust = value; + } - /** - * Sets the value of the serverEnvironment property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setServerEnvironment(String value) { - this.serverEnvironment = value; - } + /** + * Gets the value of the keyProvider property. + * + * @return + * possible object is + * {@link KeyProviderType } + * + */ + public KeyProviderType getKeyProvider() + { + return keyProvider; + } + /** + * Sets the value of the keyProvider property. + * + * @param value + * allowed object is + * {@link KeyProviderType } + * + */ + public void setKeyProvider(KeyProviderType value) + { + this.keyProvider = value; + } - /** - * Gets the value of the canonicalizationMethod property. - * - * @return - * possible object is - * {@link String } - * - */ + /** + * Gets the value of the metaDataProvider property. + * + * @return + * possible object is + * {@link MetadataProviderType } + * + */ + public MetadataProviderType getMetaDataProvider() + { + return metaDataProvider; + } + + /** + * Sets the value of the metaDataProvider property. + * + * @param value + * allowed object is + * {@link MetadataProviderType } + * + */ + public void setMetaDataProvider(MetadataProviderType value) + { + this.metaDataProvider = value; + } + + /** + * Gets the value of the serverEnvironment property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getServerEnvironment() + { + if (serverEnvironment == null) + { + return "picketlink"; + } + else + { + return serverEnvironment; + } + } + + /** + * Sets the value of the serverEnvironment property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setServerEnvironment(String value) + { + this.serverEnvironment = value; + } + + /** + * Gets the value of the canonicalizationMethod property. + * + * @return + * possible object is + * {@link String } + * + */ public String getCanonicalizationMethod() { - if( canonicalizationMethod == null ) + if (canonicalizationMethod == null) canonicalizationMethod = CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS; - + return canonicalizationMethod; } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/SPType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/SPType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/SPType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,6 +1,26 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; - /** * Service Provider Type * @@ -21,35 +41,36 @@ * </pre> * * - */ -public class SPType - extends ProviderType + */ +public class SPType extends ProviderType { - - protected String serviceURL; - /** - * Gets the value of the serviceURL property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getServiceURL() { - return serviceURL; - } + protected String serviceURL; - /** - * Sets the value of the serviceURL property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setServiceURL(String value) { - this.serviceURL = value; - } + /** + * Gets the value of the serviceURL property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getServiceURL() + { + return serviceURL; + } + /** + * Sets the value of the serviceURL property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setServiceURL(String value) + { + this.serviceURL = value; + } + } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/STSType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/STSType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/STSType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; import javax.xml.crypto.dsig.CanonicalizationMethod; @@ -2,4 +23,2 @@ - - /** @@ -32,265 +51,305 @@ * </pre> * * - */ -public class STSType { - - protected KeyProviderType keyProvider; - protected String requestHandler; - protected ClaimsProcessorsType claimsProcessors; - protected TokenProvidersType tokenProviders; - protected ServiceProvidersType serviceProviders; - protected String stsName; - protected Integer tokenTimeout; - protected Boolean signToken; - protected Boolean encryptToken; - protected String canonicalizationMethod; + */ +public class STSType +{ - /** - * Gets the value of the keyProvider property. - * - * @return - * possible object is - * {@link KeyProviderType } - * - */ - public KeyProviderType getKeyProvider() { - return keyProvider; - } + protected KeyProviderType keyProvider; - /** - * Sets the value of the keyProvider property. - * - * @param value - * allowed object is - * {@link KeyProviderType } - * - */ - public void setKeyProvider(KeyProviderType value) { - this.keyProvider = value; - } + protected String requestHandler; - /** - * Gets the value of the requestHandler property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getRequestHandler() { - return requestHandler; - } + protected ClaimsProcessorsType claimsProcessors; - /** - * Sets the value of the requestHandler property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRequestHandler(String value) { - this.requestHandler = value; - } + protected TokenProvidersType tokenProviders; - /** - * Gets the value of the claimsProcessors property. - * - * @return - * possible object is - * {@link ClaimsProcessorsType } - * - */ - public ClaimsProcessorsType getClaimsProcessors() { - return claimsProcessors; - } + protected ServiceProvidersType serviceProviders; - /** - * Sets the value of the claimsProcessors property. - * - * @param value - * allowed object is - * {@link ClaimsProcessorsType } - * - */ - public void setClaimsProcessors(ClaimsProcessorsType value) { - this.claimsProcessors = value; - } + protected String stsName; - /** - * Gets the value of the tokenProviders property. - * - * @return - * possible object is - * {@link TokenProvidersType } - * - */ - public TokenProvidersType getTokenProviders() { - return tokenProviders; - } + protected Integer tokenTimeout; - /** - * Sets the value of the tokenProviders property. - * - * @param value - * allowed object is - * {@link TokenProvidersType } - * - */ - public void setTokenProviders(TokenProvidersType value) { - this.tokenProviders = value; - } + protected Boolean signToken; - /** - * Gets the value of the serviceProviders property. - * - * @return - * possible object is - * {@link ServiceProvidersType } - * - */ - public ServiceProvidersType getServiceProviders() { - return serviceProviders; - } + protected Boolean encryptToken; - /** - * Sets the value of the serviceProviders property. - * - * @param value - * allowed object is - * {@link ServiceProvidersType } - * - */ - public void setServiceProviders(ServiceProvidersType value) { - this.serviceProviders = value; - } + protected String canonicalizationMethod; - /** - * Gets the value of the stsName property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSTSName() { - if (stsName == null) { - return "PicketLinkSTS"; - } else { - return stsName; - } - } + /** + * Gets the value of the keyProvider property. + * + * @return + * possible object is + * {@link KeyProviderType } + * + */ + public KeyProviderType getKeyProvider() + { + return keyProvider; + } - /** - * Sets the value of the stsName property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSTSName(String value) { - this.stsName = value; - } + /** + * Sets the value of the keyProvider property. + * + * @param value + * allowed object is + * {@link KeyProviderType } + * + */ + public void setKeyProvider(KeyProviderType value) + { + this.keyProvider = value; + } - /** - * Gets the value of the tokenTimeout property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public int getTokenTimeout() { - if (tokenTimeout == null) { - return 3600; - } else { - return tokenTimeout; - } - } + /** + * Gets the value of the requestHandler property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRequestHandler() + { + return requestHandler; + } - /** - * Sets the value of the tokenTimeout property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setTokenTimeout(Integer value) { - this.tokenTimeout = value; - } + /** + * Sets the value of the requestHandler property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRequestHandler(String value) + { + this.requestHandler = value; + } - /** - * Gets the value of the signToken property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isSignToken() { - if (signToken == null) { - return true; - } else { - return signToken; - } - } + /** + * Gets the value of the claimsProcessors property. + * + * @return + * possible object is + * {@link ClaimsProcessorsType } + * + */ + public ClaimsProcessorsType getClaimsProcessors() + { + return claimsProcessors; + } - /** - * Sets the value of the signToken property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setSignToken(Boolean value) { - this.signToken = value; - } + /** + * Sets the value of the claimsProcessors property. + * + * @param value + * allowed object is + * {@link ClaimsProcessorsType } + * + */ + public void setClaimsProcessors(ClaimsProcessorsType value) + { + this.claimsProcessors = value; + } - /** - * Gets the value of the encryptToken property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isEncryptToken() { - if (encryptToken == null) { - return false; - } else { - return encryptToken; - } - } + /** + * Gets the value of the tokenProviders property. + * + * @return + * possible object is + * {@link TokenProvidersType } + * + */ + public TokenProvidersType getTokenProviders() + { + return tokenProviders; + } - /** - * Sets the value of the encryptToken property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setEncryptToken(Boolean value) { - this.encryptToken = value; - } + /** + * Sets the value of the tokenProviders property. + * + * @param value + * allowed object is + * {@link TokenProvidersType } + * + */ + public void setTokenProviders(TokenProvidersType value) + { + this.tokenProviders = value; + } - /** - * Gets the value of the canonicalizationMethod property. - * - * @return - * possible object is - * {@link String } - * - */ + /** + * Gets the value of the serviceProviders property. + * + * @return + * possible object is + * {@link ServiceProvidersType } + * + */ + public ServiceProvidersType getServiceProviders() + { + return serviceProviders; + } + + /** + * Sets the value of the serviceProviders property. + * + * @param value + * allowed object is + * {@link ServiceProvidersType } + * + */ + public void setServiceProviders(ServiceProvidersType value) + { + this.serviceProviders = value; + } + + /** + * Gets the value of the stsName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSTSName() + { + if (stsName == null) + { + return "PicketLinkSTS"; + } + else + { + return stsName; + } + } + + /** + * Sets the value of the stsName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSTSName(String value) + { + this.stsName = value; + } + + /** + * Gets the value of the tokenTimeout property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public int getTokenTimeout() + { + if (tokenTimeout == null) + { + return 3600; + } + else + { + return tokenTimeout; + } + } + + /** + * Sets the value of the tokenTimeout property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setTokenTimeout(Integer value) + { + this.tokenTimeout = value; + } + + /** + * Gets the value of the signToken property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isSignToken() + { + if (signToken == null) + { + return true; + } + else + { + return signToken; + } + } + + /** + * Sets the value of the signToken property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setSignToken(Boolean value) + { + this.signToken = value; + } + + /** + * Gets the value of the encryptToken property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isEncryptToken() + { + if (encryptToken == null) + { + return false; + } + else + { + return encryptToken; + } + } + + /** + * Sets the value of the encryptToken property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setEncryptToken(Boolean value) + { + this.encryptToken = value; + } + + /** + * Gets the value of the canonicalizationMethod property. + * + * @return + * possible object is + * {@link String } + * + */ public String getCanonicalizationMethod() { - if( canonicalizationMethod == null ) + if (canonicalizationMethod == null) canonicalizationMethod = CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS; - + return canonicalizationMethod; } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ServiceProviderType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ServiceProviderType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ServiceProviderType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,6 +1,26 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; - /** * * The service provider type contains information about a specific service provider. In particular, @@ -27,83 +47,92 @@ * </pre> * * - */ -public class ServiceProviderType { - - protected String endpoint; - protected String tokenType; - protected String truststoreAlias; + */ +public class ServiceProviderType +{ - /** - * Gets the value of the endpoint property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEndpoint() { - return endpoint; - } + protected String endpoint; - /** - * Sets the value of the endpoint property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEndpoint(String value) { - this.endpoint = value; - } + protected String tokenType; - /** - * Gets the value of the tokenType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTokenType() { - return tokenType; - } + protected String truststoreAlias; - /** - * Sets the value of the tokenType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTokenType(String value) { - this.tokenType = value; - } + /** + * Gets the value of the endpoint property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEndpoint() + { + return endpoint; + } - /** - * Gets the value of the truststoreAlias property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTruststoreAlias() { - return truststoreAlias; - } + /** + * Sets the value of the endpoint property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEndpoint(String value) + { + this.endpoint = value; + } - /** - * Sets the value of the truststoreAlias property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTruststoreAlias(String value) { - this.truststoreAlias = value; - } + /** + * Gets the value of the tokenType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTokenType() + { + return tokenType; + } + /** + * Sets the value of the tokenType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTokenType(String value) + { + this.tokenType = value; + } + + /** + * Gets the value of the truststoreAlias property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTruststoreAlias() + { + return truststoreAlias; + } + + /** + * Sets the value of the truststoreAlias property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTruststoreAlias(String value) + { + this.truststoreAlias = value; + } + } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ServiceProvidersType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ServiceProvidersType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ServiceProvidersType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; import java.util.ArrayList; @@ -2,3 +23,3 @@ import java.util.Collections; -import java.util.List; +import java.util.List; @@ -26,32 +47,34 @@ * </pre> * * - */ -public class ServiceProvidersType { - - protected List<ServiceProviderType> serviceProvider = new ArrayList<ServiceProviderType>(); + */ +public class ServiceProvidersType +{ - public void add( ServiceProviderType sp ) - { - this.serviceProvider.add(sp); - } - - public void remove( ServiceProviderType sp ) - { - this.serviceProvider.remove(sp); - } - - /** - * Gets the value of the serviceProvider property. - * - * - * Objects of the following type(s) are allowed in the list - * {@link ServiceProviderType } - * - * - */ - public List<ServiceProviderType> getServiceProvider() { - return Collections.unmodifiableList( this.serviceProvider ); - } + protected List<ServiceProviderType> serviceProvider = new ArrayList<ServiceProviderType>(); + public void add(ServiceProviderType sp) + { + this.serviceProvider.add(sp); + } + + public void remove(ServiceProviderType sp) + { + this.serviceProvider.remove(sp); + } + + /** + * Gets the value of the serviceProvider property. + * + * + * Objects of the following type(s) are allowed in the list + * {@link ServiceProviderType } + * + * + */ + public List<ServiceProviderType> getServiceProvider() + { + return Collections.unmodifiableList(this.serviceProvider); + } + } \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProviderType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProviderType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProviderType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; import java.util.ArrayList; @@ -2,5 +23,4 @@ import java.util.Collections; -import java.util.List; +import java.util.List; - /** @@ -27,131 +47,145 @@ * </pre> * * - */ -public class TokenProviderType { - - protected List<KeyValueType> property = new ArrayList<KeyValueType>(); - protected String providerClass; - protected String tokenType; - protected String tokenElement; - protected String tokenElementNS; + */ +public class TokenProviderType +{ - public void add( KeyValueType kv ) - { - property.add(kv); - } - - public void remove( KeyValueType kv ) - { - this.remove(kv); - } - - /** - * Gets the value of the property property. - * - * Objects of the following type(s) are allowed in the list - * {@link KeyValueType } - * - * - */ - public List<KeyValueType> getProperty() { - return Collections.unmodifiableList( this.property ); - } + protected List<KeyValueType> property = new ArrayList<KeyValueType>(); - /** - * Gets the value of the providerClass property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getProviderClass() { - return providerClass; - } + protected String providerClass; - /** - * Sets the value of the providerClass property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setProviderClass(String value) { - this.providerClass = value; - } + protected String tokenType; - /** - * Gets the value of the tokenType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTokenType() { - return tokenType; - } + protected String tokenElement; - /** - * Sets the value of the tokenType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTokenType(String value) { - this.tokenType = value; - } + protected String tokenElementNS; - /** - * Gets the value of the tokenElement property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTokenElement() { - return tokenElement; - } + public void add(KeyValueType kv) + { + property.add(kv); + } - /** - * Sets the value of the tokenElement property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTokenElement(String value) { - this.tokenElement = value; - } + public void remove(KeyValueType kv) + { + this.remove(kv); + } - /** - * Gets the value of the tokenElementNS property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTokenElementNS() { - return tokenElementNS; - } + /** + * Gets the value of the property property. + * + * Objects of the following type(s) are allowed in the list + * {@link KeyValueType } + * + * + */ + public List<KeyValueType> getProperty() + { + return Collections.unmodifiableList(this.property); + } - /** - * Sets the value of the tokenElementNS property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTokenElementNS(String value) { - this.tokenElementNS = value; - } + /** + * Gets the value of the providerClass property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getProviderClass() + { + return providerClass; + } + /** + * Sets the value of the providerClass property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setProviderClass(String value) + { + this.providerClass = value; + } + + /** + * Gets the value of the tokenType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTokenType() + { + return tokenType; + } + + /** + * Sets the value of the tokenType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTokenType(String value) + { + this.tokenType = value; + } + + /** + * Gets the value of the tokenElement property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTokenElement() + { + return tokenElement; + } + + /** + * Sets the value of the tokenElement property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTokenElement(String value) + { + this.tokenElement = value; + } + + /** + * Gets the value of the tokenElementNS property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTokenElementNS() + { + return tokenElementNS; + } + + /** + * Sets the value of the tokenElementNS property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTokenElementNS(String value) + { + this.tokenElementNS = value; + } + } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProvidersType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProvidersType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProvidersType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; import java.util.ArrayList; @@ -2,5 +23,4 @@ import java.util.Collections; -import java.util.List; +import java.util.List; - /** @@ -29,31 +49,33 @@ * </pre> * * - */ -public class TokenProvidersType { - - protected List<TokenProviderType> tokenProvider = new ArrayList<TokenProviderType>(); + */ +public class TokenProvidersType +{ - public void add( TokenProviderType tp ) - { - this.tokenProvider.add(tp); - } - - public void remove( TokenProviderType tp ) - { - this.tokenProvider.remove(tp); - } - - /** - * Gets the value of the tokenProvider property. - * - * Objects of the following type(s) are allowed in the list - * {@link TokenProviderType } - * - * - */ - public List<TokenProviderType> getTokenProvider() { - return Collections.unmodifiableList( this.tokenProvider ); - } + protected List<TokenProviderType> tokenProvider = new ArrayList<TokenProviderType>(); + public void add(TokenProviderType tp) + { + this.tokenProvider.add(tp); + } + + public void remove(TokenProviderType tp) + { + this.tokenProvider.remove(tp); + } + + /** + * Gets the value of the tokenProvider property. + * + * Objects of the following type(s) are allowed in the list + * {@link TokenProviderType } + * + * + */ + public List<TokenProviderType> getTokenProvider() + { + return Collections.unmodifiableList(this.tokenProvider); + } + } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TrustType.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TrustType.java 2011-02-28 20:28:24 UTC (rev 783) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TrustType.java 2011-02-28 21:07:55 UTC (rev 784) @@ -1,5 +1,26 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.federation.core.config; - + /** * Aspects involved in trust decisions such as the domains that the IDP or the Service Provider trusts. * @@ -20,33 +41,36 @@ * </pre> * * - */ -public class TrustType { - - protected String domains; + */ +public class TrustType +{ - /** - * Gets the value of the domains property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDomains() { - return domains; - } + protected String domains; - /** - * Sets the value of the domains property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDomains(String value) { - this.domains = value; - } + /** + * Gets the value of the domains property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDomains() + { + return domains; + } + /** + * Sets the value of the domains property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDomains(String value) + { + this.domains = value; + } + }

13 years, 1 month

1
0
0 / 0

Picketlink SVN: r783 - federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-28 15:28:24 -0500 (Mon, 28 Feb 2011) New Revision: 783 Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java Log: PLFED-151: add a new method just for the key descriptor Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java 2011-02-28 20:17:28 UTC (rev 782) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java 2011-02-28 20:28:24 UTC (rev 783) @@ -37,40 +37,72 @@ * @since Apr 20, 2009 */ public class KeyDescriptorMetaDataBuilder -{ +{ /** - * Create a Key Descriptor Type + * Create a Key Descriptor + * @param keyInfo + * @param algorithm + * @param keySize + * @param isSigningKey Whether the key is for signing + * @param isEncryptionKey Whether the key is for encryption + * @throws {@link IllegalArgumentException} when keyinfo is null + * @throws {@link IllegalArgumentException} when both the parameters "isSigningKey" and "isEncryptionKey" are same * @return */ - public static KeyDescriptorType createKeyDescriptor( Element keyInfo, - String algorithm, int keySize, + public static KeyDescriptorType createKeyDescriptor(Element keyInfo, String algorithm, int keySize, boolean isSigningKey, boolean isEncryptionKey) { - if(keyInfo == null) + if (keyInfo == null) throw new IllegalArgumentException("keyInfo is null"); - - if(isSigningKey == isEncryptionKey) - throw new IllegalArgumentException("Only one of isSigningKey " + - "and isEncryptionKey should be true"); - + + if (isSigningKey == isEncryptionKey) + throw new IllegalArgumentException("Only one of isSigningKey " + "and isEncryptionKey should be true"); + KeyDescriptorType keyDescriptor = new KeyDescriptorType(); - - if(isNotNull(algorithm)) + + if (isNotNull(algorithm)) { - EncryptionMethodType encryptionMethod = new EncryptionMethodType( algorithm ); - - encryptionMethod.setEncryptionMethod( new EncryptionMethod( BigInteger.valueOf(keySize), null )); - - keyDescriptor.addEncryptionMethod( encryptionMethod ); - } - - if(isSigningKey) + EncryptionMethodType encryptionMethod = new EncryptionMethodType(algorithm); + + encryptionMethod.setEncryptionMethod(new EncryptionMethod(BigInteger.valueOf(keySize), null)); + + keyDescriptor.addEncryptionMethod(encryptionMethod); + } + + if (isSigningKey) keyDescriptor.setUse(KeyTypes.SIGNING); - if(isEncryptionKey) - keyDescriptor.setUse(KeyTypes.ENCRYPTION); - - keyDescriptor.setKeyInfo( keyInfo ); - + if (isEncryptionKey) + keyDescriptor.setUse(KeyTypes.ENCRYPTION); + + keyDescriptor.setKeyInfo(keyInfo); + return keyDescriptor; } + + /** + * Create a key descriptor that specifies an algorithm but does not specify + * whether the key is for signing or encryption + * @param keyInfo + * @param algorithm + * @param keySize + * @return + */ + public static KeyDescriptorType createKeyDescriptor(Element keyInfo, String algorithm, int keySize) + { + if (keyInfo == null) + throw new IllegalArgumentException("keyInfo is null"); + KeyDescriptorType keyDescriptor = new KeyDescriptorType(); + + if (isNotNull(algorithm)) + { + EncryptionMethodType encryptionMethod = new EncryptionMethodType(algorithm); + + encryptionMethod.setEncryptionMethod(new EncryptionMethod(BigInteger.valueOf(keySize), null)); + + keyDescriptor.addEncryptionMethod(encryptionMethod); + } + keyDescriptor.setKeyInfo(keyInfo); + + return keyDescriptor; + } } \ No newline at end of file

13 years, 1 month

1
0
0 / 0

Picketlink SVN: r782 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-28 15:17:28 -0500 (Mon, 28 Feb 2011) New Revision: 782 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java Log: PLFED-150: use value rather than toString() Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java 2011-02-28 14:53:29 UTC (rev 781) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java 2011-02-28 20:17:28 UTC (rev 782) @@ -507,7 +507,7 @@ KeyTypes keyTypes = keyDescriptor.getUse(); if (keyTypes != null) - StaxUtil.writeAttribute(writer, new QName(JBossSAMLConstants.USE.get()), keyTypes.toString()); + StaxUtil.writeAttribute(writer, new QName(JBossSAMLConstants.USE.get()), keyTypes.value()); Element keyInfo = keyDescriptor.getKeyInfo(); StaxUtil.writeDOMElement(writer, keyInfo);

13 years, 1 month

1
0
0 / 0

Picketlink SVN: r781 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-28 09:53:29 -0500 (Mon, 28 Feb 2011) New Revision: 781 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java Log: PLFED-148: write out the sp sso descrip attribs Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java 2011-02-28 14:47:03 UTC (rev 780) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java 2011-02-28 14:53:29 UTC (rev 781) @@ -65,508 +65,533 @@ */ public class SAMLMetadataWriter extends BaseWriter { - private String METADATA_PREFIX = "md"; + private final String METADATA_PREFIX = "md"; public SAMLMetadataWriter(XMLStreamWriter writer) throws ProcessingException { - super(writer); + super(writer); } - - public void writeEntitiesDescriptor( EntitiesDescriptorType entities ) throws ProcessingException + + public void writeEntitiesDescriptor(EntitiesDescriptorType entities) throws ProcessingException { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ENTITIES_DESCRIPTOR.get(), METADATA_NSURI.get()); - - StaxUtil.writeDefaultNameSpace(writer, JBossSAMLURIConstants.METADATA_NSURI.get() ); - StaxUtil.writeNameSpace(writer, "md", JBossSAMLURIConstants.METADATA_NSURI.get() ); - StaxUtil.writeNameSpace(writer, "saml", JBossSAMLURIConstants.ASSERTION_NSURI.get() ); - StaxUtil.writeNameSpace(writer, "ds", JBossSAMLURIConstants.XMLDSIG_NSURI.get() ); - - if( entities.getValidUntil() != null ) + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ENTITIES_DESCRIPTOR.get(), + METADATA_NSURI.get()); + + StaxUtil.writeDefaultNameSpace(writer, JBossSAMLURIConstants.METADATA_NSURI.get()); + StaxUtil.writeNameSpace(writer, "md", JBossSAMLURIConstants.METADATA_NSURI.get()); + StaxUtil.writeNameSpace(writer, "saml", JBossSAMLURIConstants.ASSERTION_NSURI.get()); + StaxUtil.writeNameSpace(writer, "ds", JBossSAMLURIConstants.XMLDSIG_NSURI.get()); + + if (entities.getValidUntil() != null) { - StaxUtil.writeAttribute(writer, JBossSAMLConstants.VALID_UNTIL.get(), entities.getValidUntil().toString() ); + StaxUtil.writeAttribute(writer, JBossSAMLConstants.VALID_UNTIL.get(), entities.getValidUntil().toString()); } - if( entities.getID() != null ) + if (entities.getID() != null) { - StaxUtil.writeAttribute(writer, JBossSAMLConstants.ID.get(), entities.getID() ); + StaxUtil.writeAttribute(writer, JBossSAMLConstants.ID.get(), entities.getID()); } - if( entities.getName() != null ) + if (entities.getName() != null) { - StaxUtil.writeAttribute(writer, JBossSAMLConstants.NAME.get(), entities.getName() ); + StaxUtil.writeAttribute(writer, JBossSAMLConstants.NAME.get(), entities.getName()); } - + List<Object> entityDescriptors = entities.getEntityDescriptor(); - for( Object ed: entityDescriptors ) + for (Object ed : entityDescriptors) { - if( ed instanceof EntityDescriptorType ) + if (ed instanceof EntityDescriptorType) { - writeEntityDescriptor( (EntityDescriptorType)ed ); + writeEntityDescriptor((EntityDescriptorType) ed); } else - writeEntitiesDescriptor( (EntitiesDescriptorType) ed ); + writeEntitiesDescriptor((EntitiesDescriptorType) ed); } StaxUtil.writeEndElement(writer); - StaxUtil.flush(writer); + StaxUtil.flush(writer); } - - public void writeEntityDescriptor( EntityDescriptorType entityDescriptor ) throws ProcessingException + + public void writeEntityDescriptor(EntityDescriptorType entityDescriptor) throws ProcessingException { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ENTITY_DESCRIPTOR.get(), METADATA_NSURI.get()); - StaxUtil.writeDefaultNameSpace(writer, JBossSAMLURIConstants.METADATA_NSURI.get() ); - StaxUtil.writeNameSpace(writer, "md", JBossSAMLURIConstants.METADATA_NSURI.get() ); - StaxUtil.writeNameSpace(writer, "saml", JBossSAMLURIConstants.ASSERTION_NSURI.get() ); - StaxUtil.writeNameSpace(writer, "ds", JBossSAMLURIConstants.XMLDSIG_NSURI.get() ); - - StaxUtil.writeAttribute(writer, JBossSAMLConstants.ENTITY_ID.get(), entityDescriptor.getEntityID() ); - if( entityDescriptor.getValidUntil() != null ) + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ENTITY_DESCRIPTOR.get(), + METADATA_NSURI.get()); + StaxUtil.writeDefaultNameSpace(writer, JBossSAMLURIConstants.METADATA_NSURI.get()); + StaxUtil.writeNameSpace(writer, "md", JBossSAMLURIConstants.METADATA_NSURI.get()); + StaxUtil.writeNameSpace(writer, "saml", JBossSAMLURIConstants.ASSERTION_NSURI.get()); + StaxUtil.writeNameSpace(writer, "ds", JBossSAMLURIConstants.XMLDSIG_NSURI.get()); + + StaxUtil.writeAttribute(writer, JBossSAMLConstants.ENTITY_ID.get(), entityDescriptor.getEntityID()); + if (entityDescriptor.getValidUntil() != null) { - StaxUtil.writeAttribute(writer, JBossSAMLConstants.VALID_UNTIL.get(), entityDescriptor.getValidUntil().toString() ); + StaxUtil.writeAttribute(writer, JBossSAMLConstants.VALID_UNTIL.get(), entityDescriptor.getValidUntil() + .toString()); } - if( entityDescriptor.getID() != null ) + if (entityDescriptor.getID() != null) { - StaxUtil.writeAttribute(writer, JBossSAMLConstants.ID.get(), entityDescriptor.getID() ); + StaxUtil.writeAttribute(writer, JBossSAMLConstants.ID.get(), entityDescriptor.getID()); } - + List<EDTChoiceType> choiceTypes = entityDescriptor.getChoiceType(); - for( EDTChoiceType edtChoice : choiceTypes ) + for (EDTChoiceType edtChoice : choiceTypes) { AffiliationDescriptorType affliationDesc = edtChoice.getAffiliationDescriptor(); - if( affliationDesc != null ) - throw new RuntimeException( "handle affliation" ); //TODO: affiliation - + if (affliationDesc != null) + throw new RuntimeException("handle affliation"); //TODO: affiliation + List<EDTDescriptorChoiceType> edtDescChoices = edtChoice.getDescriptors(); - for( EDTDescriptorChoiceType edtDescChoice : edtDescChoices ) + for (EDTDescriptorChoiceType edtDescChoice : edtDescChoices) { RoleDescriptorType roleDesc = edtDescChoice.getRoleDescriptor(); - - if( roleDesc != null ) - throw new RuntimeException( "Role Descriptor type not handled" ); - + + if (roleDesc != null) + throw new RuntimeException("Role Descriptor type not handled"); + IDPSSODescriptorType idpSSO = edtDescChoice.getIdpDescriptor(); - if( idpSSO != null ) - write( idpSSO ); - + if (idpSSO != null) + write(idpSSO); + SPSSODescriptorType spSSO = edtDescChoice.getSpDescriptor(); - if( spSSO != null ) - write( spSSO ); - + if (spSSO != null) + write(spSSO); + AttributeAuthorityDescriptorType attribAuth = edtDescChoice.getAttribDescriptor(); - if( attribAuth != null ) + if (attribAuth != null) writeAttributeAuthorityDescriptor(attribAuth); - + AuthnAuthorityDescriptorType authNDesc = edtDescChoice.getAuthnDescriptor(); - if( authNDesc != null ) - throw new RuntimeException( "NYI" ); + if (authNDesc != null) + throw new RuntimeException("NYI"); } } OrganizationType organization = entityDescriptor.getOrganization(); - if( organization != null ) + if (organization != null) { writeOrganization(organization); } - + List<ContactType> contactPersons = entityDescriptor.getContactPerson(); - for( ContactType contact : contactPersons ) + for (ContactType contact : contactPersons) { - write( contact ); + write(contact); } - + StaxUtil.writeEndElement(writer); - StaxUtil.flush(writer); + StaxUtil.flush(writer); } - - public void write( SSODescriptorType ssoDescriptor ) throws ProcessingException + + public void write(SSODescriptorType ssoDescriptor) throws ProcessingException { - throw new RuntimeException( "should not be called" ); + throw new RuntimeException("should not be called"); } - - public void write( SPSSODescriptorType spSSODescriptor ) throws ProcessingException + + public void write(SPSSODescriptorType spSSODescriptor) throws ProcessingException { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.SP_SSO_DESCRIPTOR.get(), METADATA_NSURI.get()); - StaxUtil.writeAttribute(writer, new QName( JBossSAMLConstants.PROTOCOL_SUPPORT_ENUMERATION.get()) - , spSSODescriptor.getProtocolSupportEnumeration().get(0) ); + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.SP_SSO_DESCRIPTOR.get(), + METADATA_NSURI.get()); + StaxUtil.writeAttribute(writer, new QName(JBossSAMLConstants.PROTOCOL_SUPPORT_ENUMERATION.get()), spSSODescriptor + .getProtocolSupportEnumeration().get(0)); + //Write the attributes + Boolean authnSigned = spSSODescriptor.isAuthnRequestsSigned(); + if (authnSigned != null) + { + StaxUtil.writeAttribute(writer, new QName(JBossSAMLConstants.WANT_AUTHN_REQUESTS_SIGNED.get()), + authnSigned.toString()); + } + Boolean wantAssertionsSigned = spSSODescriptor.isWantAssertionsSigned(); + if (wantAssertionsSigned != null) + { + StaxUtil.writeAttribute(writer, new QName(JBossSAMLConstants.WANT_ASSERTIONS_SIGNED.get()), + wantAssertionsSigned.toString()); + } + //Get the key descriptors List<KeyDescriptorType> keyDescriptors = spSSODescriptor.getKeyDescriptor(); - for( KeyDescriptorType keyDescriptor :keyDescriptors ) - { - writeKeyDescriptor(keyDescriptor); + for (KeyDescriptorType keyDescriptor : keyDescriptors) + { + writeKeyDescriptor(keyDescriptor); } - + List<EndpointType> sloServices = spSSODescriptor.getSingleLogoutService(); - for( EndpointType endpoint: sloServices ) + for (EndpointType endpoint : sloServices) { writeSingleLogoutService(endpoint); } - - + List<IndexedEndpointType> artifactResolutions = spSSODescriptor.getArtifactResolutionService(); - for( IndexedEndpointType artifactResolution: artifactResolutions ) - { - writeArtifactResolutionService( artifactResolution ); + for (IndexedEndpointType artifactResolution : artifactResolutions) + { + writeArtifactResolutionService(artifactResolution); } - + List<String> nameIDFormats = spSSODescriptor.getNameIDFormat(); - for( String nameIDFormat : nameIDFormats ) + for (String nameIDFormat : nameIDFormats) { writeNameIDFormat(nameIDFormat); } - + List<IndexedEndpointType> assertionConsumers = spSSODescriptor.getAssertionConsumerService(); - for( IndexedEndpointType assertionConsumer: assertionConsumers ) - { - writeAssertionConsumerService( assertionConsumer ); + for (IndexedEndpointType assertionConsumer : assertionConsumers) + { + writeAssertionConsumerService(assertionConsumer); } - + List<AttributeConsumingServiceType> attributeConsumers = spSSODescriptor.getAttributeConsumingService(); - for( AttributeConsumingServiceType attributeConsumer : attributeConsumers ) + for (AttributeConsumingServiceType attributeConsumer : attributeConsumers) { writeAttributeConsumingService(attributeConsumer); } - + StaxUtil.writeEndElement(writer); - StaxUtil.flush(writer); + StaxUtil.flush(writer); } - - public void write( IDPSSODescriptorType idpSSODescriptor ) throws ProcessingException + + public void write(IDPSSODescriptorType idpSSODescriptor) throws ProcessingException { - if( idpSSODescriptor == null ) - throw new ProcessingException( "IDPSSODescriptorType is null" ); - - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.IDP_SSO_DESCRIPTOR.get(), METADATA_NSURI.get()); - + if (idpSSODescriptor == null) + throw new ProcessingException("IDPSSODescriptorType is null"); + + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.IDP_SSO_DESCRIPTOR.get(), + METADATA_NSURI.get()); + Boolean wantsAuthnRequestsSigned = idpSSODescriptor.isWantAuthnRequestsSigned(); - if( wantsAuthnRequestsSigned != null ) + if (wantsAuthnRequestsSigned != null) { - StaxUtil.writeAttribute(writer, new QName( JBossSAMLConstants.WANT_AUTHN_REQUESTS_SIGNED.get() ), - wantsAuthnRequestsSigned.toString() ); + StaxUtil.writeAttribute(writer, new QName(JBossSAMLConstants.WANT_AUTHN_REQUESTS_SIGNED.get()), + wantsAuthnRequestsSigned.toString()); } - writeProtocolSupportEnumeration( idpSSODescriptor.getProtocolSupportEnumeration() ); - + writeProtocolSupportEnumeration(idpSSODescriptor.getProtocolSupportEnumeration()); + List<IndexedEndpointType> artifactResolutionServices = idpSSODescriptor.getArtifactResolutionService(); - for( IndexedEndpointType indexedEndpoint: artifactResolutionServices ) + for (IndexedEndpointType indexedEndpoint : artifactResolutionServices) { - writeArtifactResolutionService( indexedEndpoint ); + writeArtifactResolutionService(indexedEndpoint); } - + List<EndpointType> sloServices = idpSSODescriptor.getSingleLogoutService(); - for( EndpointType endpoint: sloServices ) + for (EndpointType endpoint : sloServices) { writeSingleLogoutService(endpoint); } - + List<EndpointType> ssoServices = idpSSODescriptor.getSingleSignOnService(); - for( EndpointType endpoint: ssoServices ) + for (EndpointType endpoint : ssoServices) { - writeSingleSignOnService( endpoint ); + writeSingleSignOnService(endpoint); } - + List<String> nameIDFormats = idpSSODescriptor.getNameIDFormat(); - for( String nameIDFormat: nameIDFormats ) + for (String nameIDFormat : nameIDFormats) { - writeNameIDFormat( nameIDFormat ); + writeNameIDFormat(nameIDFormat); } - + List<AttributeType> attributes = idpSSODescriptor.getAttribute(); - for( AttributeType attribType : attributes ) + for (AttributeType attribType : attributes) { - write( attribType ); + write(attribType); } - + StaxUtil.writeEndElement(writer); - StaxUtil.flush(writer); + StaxUtil.flush(writer); } - - public void writeAttributeAuthorityDescriptor( AttributeAuthorityDescriptorType attributeAuthority ) throws ProcessingException - { + + public void writeAttributeAuthorityDescriptor(AttributeAuthorityDescriptorType attributeAuthority) + throws ProcessingException + { StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ATTRIBUTE_AUTHORITY_DESCRIPTOR.get(), METADATA_NSURI.get()); - - writeProtocolSupportEnumeration( attributeAuthority.getProtocolSupportEnumeration() ); - + + writeProtocolSupportEnumeration(attributeAuthority.getProtocolSupportEnumeration()); + List<KeyDescriptorType> keyDescriptorList = attributeAuthority.getKeyDescriptor(); - for( KeyDescriptorType keyDescriptor: keyDescriptorList ) + for (KeyDescriptorType keyDescriptor : keyDescriptorList) { - writeKeyDescriptor( keyDescriptor ); + writeKeyDescriptor(keyDescriptor); } - + List<EndpointType> attributeServices = attributeAuthority.getAttributeService(); - for( EndpointType endpoint : attributeServices ) + for (EndpointType endpoint : attributeServices) { - writeAttributeService( endpoint ); + writeAttributeService(endpoint); } - + List<String> nameIDFormats = attributeAuthority.getNameIDFormat(); - for( String nameIDFormat: nameIDFormats ) - { - writeNameIDFormat( nameIDFormat ); + for (String nameIDFormat : nameIDFormats) + { + writeNameIDFormat(nameIDFormat); } - + List<AttributeType> attributes = attributeAuthority.getAttribute(); - for( AttributeType attributeType: attributes ) + for (AttributeType attributeType : attributes) { - write( attributeType ); + write(attributeType); } StaxUtil.writeEndElement(writer); - StaxUtil.flush(writer); + StaxUtil.flush(writer); } - - public void writeArtifactResolutionService( IndexedEndpointType indexedEndpoint ) throws ProcessingException + + public void writeArtifactResolutionService(IndexedEndpointType indexedEndpoint) throws ProcessingException { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ARTIFACT_RESOLUTION_SERVICE.get(), METADATA_NSURI.get()); + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ARTIFACT_RESOLUTION_SERVICE.get(), + METADATA_NSURI.get()); - writeIndexedEndpointType(indexedEndpoint); + writeIndexedEndpointType(indexedEndpoint); } - - public void writeAssertionConsumerService( IndexedEndpointType indexedEndpoint ) throws ProcessingException + + public void writeAssertionConsumerService(IndexedEndpointType indexedEndpoint) throws ProcessingException { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ASSERTION_CONSUMER_SERVICE.get(), METADATA_NSURI.get()); - writeIndexedEndpointType(indexedEndpoint); + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ASSERTION_CONSUMER_SERVICE.get(), + METADATA_NSURI.get()); + writeIndexedEndpointType(indexedEndpoint); } - - public void writeIndexedEndpointType( IndexedEndpointType indexedEndpoint ) throws ProcessingException + + public void writeIndexedEndpointType(IndexedEndpointType indexedEndpoint) throws ProcessingException { - writeEndpointType( indexedEndpoint ); - if( indexedEndpoint.isIsDefault() != null ) - StaxUtil.writeAttribute(writer, JBossSAMLConstants.ISDEFAULT.get(), ""+ indexedEndpoint.isIsDefault() ); + writeEndpointType(indexedEndpoint); + if (indexedEndpoint.isIsDefault() != null) + StaxUtil.writeAttribute(writer, JBossSAMLConstants.ISDEFAULT.get(), "" + indexedEndpoint.isIsDefault()); - StaxUtil.writeAttribute(writer, JBossSAMLConstants.INDEX.get(), ""+ indexedEndpoint.getIndex() ); + StaxUtil.writeAttribute(writer, JBossSAMLConstants.INDEX.get(), "" + indexedEndpoint.getIndex()); StaxUtil.writeEndElement(writer); StaxUtil.flush(writer); } - - public void writeAttributeConsumingService( AttributeConsumingServiceType attributeConsumer ) throws ProcessingException + + public void writeAttributeConsumingService(AttributeConsumingServiceType attributeConsumer) + throws ProcessingException { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ATTRIBUTE_CONSUMING_SERVICE.get(), METADATA_NSURI.get()); - - - StaxUtil.writeAttribute(writer, JBossSAMLConstants.ISDEFAULT.get(), ""+ attributeConsumer.isIsDefault() ); - StaxUtil.writeAttribute(writer, JBossSAMLConstants.INDEX.get(), ""+ attributeConsumer.getIndex() ); - + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ATTRIBUTE_CONSUMING_SERVICE.get(), + METADATA_NSURI.get()); + + StaxUtil.writeAttribute(writer, JBossSAMLConstants.ISDEFAULT.get(), "" + attributeConsumer.isIsDefault()); + StaxUtil.writeAttribute(writer, JBossSAMLConstants.INDEX.get(), "" + attributeConsumer.getIndex()); + //Service Name List<LocalizedNameType> serviceNames = attributeConsumer.getServiceName(); - for( LocalizedNameType serviceName: serviceNames ) - { - writeLocalizedNameType( serviceName, new QName(METADATA_NSURI.get(), JBossSAMLConstants.SERVICE_NAME.get(), - METADATA_PREFIX )); + for (LocalizedNameType serviceName : serviceNames) + { + writeLocalizedNameType(serviceName, new QName(METADATA_NSURI.get(), JBossSAMLConstants.SERVICE_NAME.get(), + METADATA_PREFIX)); } - + List<LocalizedNameType> serviceDescriptions = attributeConsumer.getServiceDescription(); - for( LocalizedNameType serviceDescription: serviceDescriptions ) - { - writeLocalizedNameType( serviceDescription, new QName(METADATA_NSURI.get(), JBossSAMLConstants.SERVICE_DESCRIPTION.get(), - METADATA_PREFIX )); + for (LocalizedNameType serviceDescription : serviceDescriptions) + { + writeLocalizedNameType(serviceDescription, new QName(METADATA_NSURI.get(), + JBossSAMLConstants.SERVICE_DESCRIPTION.get(), METADATA_PREFIX)); } - + List<RequestedAttributeType> requestedAttributes = attributeConsumer.getRequestedAttribute(); - for( RequestedAttributeType requestedAttribute : requestedAttributes ) + for (RequestedAttributeType requestedAttribute : requestedAttributes) { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.REQUESTED_ATTRIBUTE.get(), METADATA_NSURI.get()); + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.REQUESTED_ATTRIBUTE.get(), + METADATA_NSURI.get()); Boolean isRequired = requestedAttribute.isIsRequired(); - if( isRequired != null ) + if (isRequired != null) { - StaxUtil.writeAttribute(writer, new QName( JBossSAMLConstants.IS_REQUIRED.get()), isRequired.toString() ); + StaxUtil.writeAttribute(writer, new QName(JBossSAMLConstants.IS_REQUIRED.get()), isRequired.toString()); } writeAttributeTypeWithoutRootTag(requestedAttribute); - StaxUtil.writeEndElement(writer); + StaxUtil.writeEndElement(writer); } - + StaxUtil.writeEndElement(writer); - StaxUtil.flush(writer); + StaxUtil.flush(writer); } - - public void writeOrganization( OrganizationType org ) throws ProcessingException - { - if( org == null ) - throw new ProcessingException( "Organization is null" ); - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ORGANIZATION.get(), - METADATA_NSURI.get()); - + + public void writeOrganization(OrganizationType org) throws ProcessingException + { + if (org == null) + throw new ProcessingException("Organization is null"); + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ORGANIZATION.get(), METADATA_NSURI.get()); + //Write the name List<LocalizedNameType> nameList = org.getOrganizationName(); - for( LocalizedNameType localName: nameList ) + for (LocalizedNameType localName : nameList) { StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ORGANIZATION_NAME.get(), METADATA_NSURI.get()); - - writeLocalizedType( localName ); + + writeLocalizedType(localName); } - + //Write the display name List<LocalizedNameType> displayNameList = org.getOrganizationDisplayName(); - for( LocalizedNameType localName: displayNameList ) + for (LocalizedNameType localName : displayNameList) { StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ORGANIZATION_DISPLAY_NAME.get(), METADATA_NSURI.get()); - writeLocalizedType( localName ); + writeLocalizedType(localName); } - + //Write the url List<LocalizedURIType> uriList = org.getOrganizationURL(); - for( LocalizedURIType uri: uriList ) + for (LocalizedURIType uri : uriList) { StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ORGANIZATION_URL.get(), METADATA_NSURI.get()); - + String lang = uri.getLang(); String val = uri.getValue().toString(); - StaxUtil.writeAttribute(writer, new QName( JBossSAMLURIConstants.XML.get(), JBossSAMLConstants.LANG.get(), "xml" ), lang ); - - StaxUtil.writeCharacters(writer, val ); - + StaxUtil.writeAttribute(writer, new QName(JBossSAMLURIConstants.XML.get(), JBossSAMLConstants.LANG.get(), + "xml"), lang); + + StaxUtil.writeCharacters(writer, val); + StaxUtil.writeEndElement(writer); } StaxUtil.writeEndElement(writer); StaxUtil.flush(writer); } - - public void write( ContactType contact ) throws ProcessingException - { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.CONTACT_PERSON.get(), - METADATA_NSURI.get()); - - ContactTypeType attribs = contact.getContactType(); - StaxUtil.writeAttribute(writer, JBossSAMLConstants.CONTACT_TYPE.get(), attribs.value() ); - + + public void write(ContactType contact) throws ProcessingException + { + StaxUtil + .writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.CONTACT_PERSON.get(), METADATA_NSURI.get()); + + ContactTypeType attribs = contact.getContactType(); + StaxUtil.writeAttribute(writer, JBossSAMLConstants.CONTACT_TYPE.get(), attribs.value()); + //Write the name String company = contact.getCompany(); - if( company != null ) + if (company != null) { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.COMPANY.get(), - METADATA_NSURI.get()); + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.COMPANY.get(), METADATA_NSURI.get()); StaxUtil.writeCharacters(writer, company); - StaxUtil.writeEndElement(writer); + StaxUtil.writeEndElement(writer); } String givenName = contact.getGivenName(); - if( givenName != null ) + if (givenName != null) { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.GIVEN_NAME.get(), - METADATA_NSURI.get()); - StaxUtil.writeCharacters(writer, givenName ); + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.GIVEN_NAME.get(), METADATA_NSURI.get()); + StaxUtil.writeCharacters(writer, givenName); StaxUtil.writeEndElement(writer); } - + String surName = contact.getSurName(); - if( surName != null ) + if (surName != null) { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.SURNAME.get(), - METADATA_NSURI.get()); - StaxUtil.writeCharacters(writer, surName ); + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.SURNAME.get(), METADATA_NSURI.get()); + StaxUtil.writeCharacters(writer, surName); StaxUtil.writeEndElement(writer); } - + List<String> emailAddresses = contact.getEmailAddress(); - for( String email: emailAddresses ) + for (String email : emailAddresses) { StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.EMAIL_ADDRESS.get(), METADATA_NSURI.get()); - StaxUtil.writeCharacters(writer, email ); + StaxUtil.writeCharacters(writer, email); StaxUtil.writeEndElement(writer); } - + List<String> tels = contact.getTelephoneNumber(); - for( String telephone: tels ) + for (String telephone : tels) { StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.TELEPHONE_NUMBER.get(), METADATA_NSURI.get()); - StaxUtil.writeCharacters(writer, telephone ); + StaxUtil.writeCharacters(writer, telephone); StaxUtil.writeEndElement(writer); } - + StaxUtil.writeEndElement(writer); StaxUtil.flush(writer); } - - public void writeKeyDescriptor( KeyDescriptorType keyDescriptor ) throws ProcessingException - { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.KEY_DESCRIPTOR.get(), - METADATA_NSURI.get()); - + + public void writeKeyDescriptor(KeyDescriptorType keyDescriptor) throws ProcessingException + { + StaxUtil + .writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.KEY_DESCRIPTOR.get(), METADATA_NSURI.get()); + KeyTypes keyTypes = keyDescriptor.getUse(); - if( keyTypes != null ) - StaxUtil.writeAttribute(writer, new QName( JBossSAMLConstants.USE.get()), keyTypes.toString() ); - + if (keyTypes != null) + StaxUtil.writeAttribute(writer, new QName(JBossSAMLConstants.USE.get()), keyTypes.toString()); + Element keyInfo = keyDescriptor.getKeyInfo(); StaxUtil.writeDOMElement(writer, keyInfo); StaxUtil.writeEndElement(writer); StaxUtil.flush(writer); } - - public void writeAttributeService( EndpointType endpoint ) throws ProcessingException + + public void writeAttributeService(EndpointType endpoint) throws ProcessingException { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ATTRIBUTE_SERVICE.get(), METADATA_NSURI.get()); - - writeEndpointType( endpoint ); - + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.ATTRIBUTE_SERVICE.get(), + METADATA_NSURI.get()); + + writeEndpointType(endpoint); + StaxUtil.writeEndElement(writer); StaxUtil.flush(writer); } - - public void writeSingleLogoutService( EndpointType endpoint ) throws ProcessingException + + public void writeSingleLogoutService(EndpointType endpoint) throws ProcessingException { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.SINGLE_LOGOUT_SERVICE.get(), METADATA_NSURI.get()); - - writeEndpointType( endpoint ); - + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.SINGLE_LOGOUT_SERVICE.get(), + METADATA_NSURI.get()); + + writeEndpointType(endpoint); + StaxUtil.writeEndElement(writer); StaxUtil.flush(writer); } - - public void writeSingleSignOnService( EndpointType endpoint ) throws ProcessingException + + public void writeSingleSignOnService(EndpointType endpoint) throws ProcessingException { - StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.SINGLE_SIGNON_SERVICE.get(), METADATA_NSURI.get()); - - writeEndpointType( endpoint ); - + StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.SINGLE_SIGNON_SERVICE.get(), + METADATA_NSURI.get()); + + writeEndpointType(endpoint); + StaxUtil.writeEndElement(writer); StaxUtil.flush(writer); } - - private void writeProtocolSupportEnumeration( List<String> protoEnum ) throws ProcessingException + + private void writeProtocolSupportEnumeration(List<String> protoEnum) throws ProcessingException { - if( protoEnum.size() > 0 ) + if (protoEnum.size() > 0) { StringBuilder sb = new StringBuilder(); - for( String str: protoEnum ) + for (String str : protoEnum) { sb.append(str).append(" "); } - - StaxUtil.writeAttribute(writer, new QName( JBossSAMLConstants.PROTOCOL_SUPPORT_ENUMERATION.get() ), sb.toString().trim() ); + + StaxUtil.writeAttribute(writer, new QName(JBossSAMLConstants.PROTOCOL_SUPPORT_ENUMERATION.get()), sb + .toString().trim()); } } - - private void writeEndpointType( EndpointType endpoint ) throws ProcessingException + + private void writeEndpointType(EndpointType endpoint) throws ProcessingException { - StaxUtil.writeAttribute(writer, JBossSAMLConstants.BINDING.get(), endpoint.getBinding().toString() ); - StaxUtil.writeAttribute(writer, JBossSAMLConstants.LOCATION.get(), endpoint.getLocation().toString() ); - + StaxUtil.writeAttribute(writer, JBossSAMLConstants.BINDING.get(), endpoint.getBinding().toString()); + StaxUtil.writeAttribute(writer, JBossSAMLConstants.LOCATION.get(), endpoint.getLocation().toString()); + URI responseLocation = endpoint.getResponseLocation(); - if( responseLocation != null ) + if (responseLocation != null) { - StaxUtil.writeAttribute(writer, JBossSAMLConstants.RESPONSE_LOCATION.get(), responseLocation.toString() ); + StaxUtil.writeAttribute(writer, JBossSAMLConstants.RESPONSE_LOCATION.get(), responseLocation.toString()); } } - - private void writeLocalizedType( LocalizedNameType localName ) throws ProcessingException + + private void writeLocalizedType(LocalizedNameType localName) throws ProcessingException { String lang = localName.getLang(); String val = localName.getValue(); - StaxUtil.writeAttribute(writer, new QName( JBossSAMLURIConstants.XML.get(), JBossSAMLConstants.LANG.get(), "xml" ), lang ); - - StaxUtil.writeCharacters(writer, val ); - + StaxUtil.writeAttribute(writer, new QName(JBossSAMLURIConstants.XML.get(), JBossSAMLConstants.LANG.get(), "xml"), + lang); + + StaxUtil.writeCharacters(writer, val); + StaxUtil.writeEndElement(writer); } - - private void writeNameIDFormat( String nameIDFormat ) throws ProcessingException + + private void writeNameIDFormat(String nameIDFormat) throws ProcessingException { StaxUtil.writeStartElement(writer, METADATA_PREFIX, JBossSAMLConstants.NAMEID_FORMAT.get(), METADATA_NSURI.get()); - StaxUtil.writeCharacters(writer, nameIDFormat ); + StaxUtil.writeCharacters(writer, nameIDFormat); StaxUtil.writeEndElement(writer); } } \ No newline at end of file

13 years, 1 month

1
0
0 / 0

Picketlink SVN: r780 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-28 09:47:03 -0500 (Mon, 28 Feb 2011) New Revision: 780 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java Log: add log info statement that the expiration has expired Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java 2011-02-25 22:39:31 UTC (rev 779) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java 2011-02-28 14:47:03 UTC (rev 780) @@ -147,6 +147,8 @@ */ public static boolean hasExpired(AssertionType assertion) throws ConfigurationException { + boolean expiry = false; + //Check for validity of assertion ConditionsType conditionsType = assertion.getConditions(); if(conditionsType != null) @@ -156,10 +158,15 @@ XMLGregorianCalendar notOnOrAfter = conditionsType.getNotOnOrAfter(); if(trace) log.trace("Now="+now.toXMLFormat() + " ::notBefore="+notBefore.toXMLFormat() + "::notOnOrAfter="+notOnOrAfter); - return !XMLTimeUtil.isValid(now, notBefore, notOnOrAfter); + expiry = !XMLTimeUtil.isValid(now, notBefore, notOnOrAfter); + if( !expiry ) + { + log.info( "Assertion has expired with id=" + assertion.getID() ); + } } + //TODO: if conditions do not exist, assume the assertion to be everlasting? - return false; + return expiry; } /**

13 years, 1 month

1
0
0 / 0

Picketlink SVN: r779 - federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-25 17:39:31 -0500 (Fri, 25 Feb 2011) New Revision: 779 Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java Log: disable test due to hudson Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java 2011-02-25 22:03:26 UTC (rev 778) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java 2011-02-25 22:39:31 UTC (rev 779) @@ -123,24 +123,29 @@ @Test public void testShibbolethMetadata() throws Exception { - ClassLoader tcl = Thread.currentThread().getContextClassLoader(); - InputStream is = - tcl.getResourceAsStream("saml2/metadata/testshib-two-metadata.xml"); - assertNotNull("Inputstream not null", is); - SAMLParser parser = new SAMLParser(); + boolean runTest = false; + System.out.println( "Test is disabled because of heap space issues in test env" ); + if( runTest ) + { + ClassLoader tcl = Thread.currentThread().getContextClassLoader(); + InputStream is = + tcl.getResourceAsStream("saml2/metadata/testshib-two-metadata.xml"); + assertNotNull("Inputstream not null", is); + SAMLParser parser = new SAMLParser(); - EntitiesDescriptorType entities = (EntitiesDescriptorType) parser.parse(is); - assertNotNull(entities); - assertEquals( "urn:mace:shibboleth:testshib:two", entities.getName() ); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - XMLStreamWriter writer = StaxUtil.getXMLStreamWriter( baos ); - - //write it back - SAMLMetadataWriter mdWriter = new SAMLMetadataWriter( writer ); - mdWriter.writeEntitiesDescriptor(entities); - - //System.out.println( new String( baos.toByteArray() )); + EntitiesDescriptorType entities = (EntitiesDescriptorType) parser.parse(is); + assertNotNull(entities); + assertEquals( "urn:mace:shibboleth:testshib:two", entities.getName() ); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + XMLStreamWriter writer = StaxUtil.getXMLStreamWriter( baos ); + + //write it back + SAMLMetadataWriter mdWriter = new SAMLMetadataWriter( writer ); + mdWriter.writeEntitiesDescriptor(entities); + + //System.out.println( new String( baos.toByteArray() )); + } } } \ No newline at end of file

13 years, 2 months

1
0
0 / 0

Picketlink SVN: r778 - in federation/trunk: picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants and 2 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-25 17:03:26 -0500 (Fri, 25 Feb 2011) New Revision: 778 Added: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/core/IdentityParticipantStack.java Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants/GeneralConstants.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/core/IdentityServer.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/IDPServlet.java Log: PLFED-145: use an interface for participant stack Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java =================================================================== --- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2011-02-25 19:12:09 UTC (rev 777) +++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2011-02-25 22:03:26 UTC (rev 778) @@ -94,6 +94,7 @@ import org.picketlink.identity.federation.saml.v2.SAML2Object; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; +import org.picketlink.identity.federation.web.core.IdentityParticipantStack; import org.picketlink.identity.federation.web.core.IdentityServer; import org.picketlink.identity.federation.web.util.ConfigurationUtil; import org.picketlink.identity.federation.web.util.IDPWebRequestUtil; @@ -144,6 +145,11 @@ protected String canonicalizationMethod = CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS; /** + * If the user wants to set a particular {@link IdentityParticipantStack} + */ + protected String identityParticipantStack = null; + + /** * A Lock for Handler operations in the chain */ private Lock chainLock = new ReentrantLock(); @@ -209,6 +215,11 @@ { this.samlHandlerChainClass = samlHandlerChainClass; } + + public void setIdentityParticipantStack( String fqn ) + { + this.identityParticipantStack = fqn; + } @Override public void invoke(Request request, Response response) throws IOException, ServletException @@ -1006,7 +1017,27 @@ if(identityServer == null) { identityServer = new IdentityServer(); - context.getServletContext().setAttribute(GeneralConstants.IDENTITY_SERVER, identityServer); + context.getServletContext().setAttribute(GeneralConstants.IDENTITY_SERVER, identityServer); + if( StringUtil.isNotNull( this.identityParticipantStack )) + { + try + { + Class<?> stackClass = SecurityActions.getContextClassLoader().loadClass( this.identityParticipantStack ); + identityServer.setStack( (IdentityParticipantStack) stackClass.newInstance() ); + } + catch (ClassNotFoundException e) + { + log.error( "Unable to set the Identity Participant Stack Class. Will just use the default", e ); + } + catch (InstantiationException e) + { + log.error( "Unable to set the Identity Participant Stack Class. Will just use the default", e ); + } + catch (IllegalAccessException e) + { + log.error( "Unable to set the Identity Participant Stack Class. Will just use the default", e ); + } + } } } Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants/GeneralConstants.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants/GeneralConstants.java 2011-02-25 19:12:09 UTC (rev 777) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants/GeneralConstants.java 2011-02-25 22:03:26 UTC (rev 778) @@ -45,6 +45,7 @@ String HANDLER_CONFIG_FILE_LOCATION = "/WEB-INF/picketlink-handlers.xml"; String IDENTITY_SERVER = "IDENTITY_SERVER"; + String IDENTITY_PARTICIPANT_STACK = "IDENTITY_PARTICIPANT_STACK"; String IGNORE_SIGNATURES = "IGNORE_SIGNATURES"; String KEYPAIR = "KEYPAIR"; Added: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/core/IdentityParticipantStack.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/core/IdentityParticipantStack.java (rev 0) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/core/IdentityParticipantStack.java 2011-02-25 22:03:26 UTC (rev 778) @@ -0,0 +1,115 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.web.core; + +/** + * A stack to register and deregister participants + * in the identity federation + * @author Anil.Saldhana(a)redhat.com + * @since Feb 25, 2011 + */ +public interface IdentityParticipantStack +{ + + /** + * Peek at the most recent participant in the session + * @param sessionID + * @return + */ + String peek(String sessionID); + + /** + * Remove the most recent participant in the session + * @param sessionID + * @return + */ + String pop(String sessionID); + + /** + * Register a participant in a session + * @param sessionID + * @param participant + */ + void register(String sessionID, String participant, boolean postBinding); + + /** + * For a given identity session, return the number of participants + * @param sessionID + * @return + */ + int getParticipants(String sessionID); + + /** + * Register a participant as in transit in a logout interaction + * @param sessionID + * @param participant + * @return + */ + boolean registerTransitParticipant(String sessionID, String participant); + + /** + * Deregister a participant as in transit in a logout interaction + * @param sessionID + * @param participant + * @return + */ + boolean deRegisterTransitParticipant(String sessionID, String participant); + + /** + * Return the number of participants in transit + * @param sessionID + * @return + */ + int getNumOfParticipantsInTransit(String sessionID); + + /** + * + * For a particular participant, indicate whether it supports + * POST or REDIRECT binding. + * + * + * NOTE: true: POST, false: REDIRECT, null: does not exist + * + * @param participant + * @return + */ + Boolean getBinding(String participant); + + /** + * The total number of sessions active + * @return + */ + int totalSessions(); + + /** + * Create a session + * @param id + */ + void createSession( String id ); + + /** + * Remove a session + * @param id + */ + void removeSession( String id ); + +} \ No newline at end of file Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/core/IdentityServer.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/core/IdentityServer.java 2011-02-25 19:12:09 UTC (rev 777) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/core/IdentityServer.java 2011-02-25 22:03:26 UTC (rev 778) @@ -58,9 +58,9 @@ private static int activeSessionCount = 0; - private STACK stack = new STACK(); + private IdentityParticipantStack stack = new STACK(); - public class STACK + public class STACK implements IdentityParticipantStack { private ConcurrentHashMap<String,Stack<String>> sessionParticipantsMap = new ConcurrentHashMap<String, Stack<String>>(); @@ -71,9 +71,7 @@ private ConcurrentHashMap<String, Boolean> postBindingMap = new ConcurrentHashMap<String, Boolean>(); /** - * Peek at the most recent participant in the session - * @param sessionID - * @return + * @see org.picketlink.identity.federation.web.core.IdentityParticipantStack#peek(java.lang.String) */ public String peek(String sessionID) { @@ -84,9 +82,7 @@ } /** - * Remove the most recent participant in the session - * @param sessionID - * @return + * @see org.picketlink.identity.federation.web.core.IdentityParticipantStack#pop(java.lang.String) */ public String pop(String sessionID) { @@ -100,9 +96,7 @@ } /** - * Register a participant in a session - * @param sessionID - * @param participant + * @see org.picketlink.identity.federation.web.core.IdentityParticipantStack#register(java.lang.String, java.lang.String, boolean) */ public void register(String sessionID, String participant, boolean postBinding) { @@ -120,9 +114,7 @@ } /** - * For a given identity session, return the number of participants - * @param sessionID - * @return + * @see org.picketlink.identity.federation.web.core.IdentityParticipantStack#getParticipants(java.lang.String) */ public int getParticipants(String sessionID) { @@ -134,10 +126,7 @@ } /** - * Register a participant as in transit in a logout interaction - * @param sessionID - * @param participant - * @return + * @see org.picketlink.identity.federation.web.core.IdentityParticipantStack#registerTransitParticipant(java.lang.String, java.lang.String) */ public boolean registerTransitParticipant(String sessionID, String participant) { @@ -151,10 +140,7 @@ } /** - * Deregister a participant as in transit in a logout interaction - * @param sessionID - * @param participant - * @return + * @see org.picketlink.identity.federation.web.core.IdentityParticipantStack#deRegisterTransitParticipant(java.lang.String, java.lang.String) */ public boolean deRegisterTransitParticipant(String sessionID, String participant) { @@ -168,9 +154,7 @@ } /** - * Return the number of participants in transit - * @param sessionID - * @return + * @see org.picketlink.identity.federation.web.core.IdentityParticipantStack#getNumOfParticipantsInTransit(java.lang.String) */ public int getNumOfParticipantsInTransit(String sessionID) { @@ -181,15 +165,7 @@ } /** - * - * For a particular participant, indicate whether it supports - * POST or REDIRECT binding. - * - * - * NOTE: true: POST, false: REDIRECT, null: does not exist - * - * @param participant - * @return + * @see org.picketlink.identity.federation.web.core.IdentityParticipantStack#getBinding(java.lang.String) */ public Boolean getBinding( String participant ) { @@ -197,21 +173,26 @@ } /** - * The total number of sessions active - * @return + * @see org.picketlink.identity.federation.web.core.IdentityParticipantStack#totalSessions() */ public int totalSessions() { return sessionParticipantsMap.keySet().size(); } - private void put(String id) + /** + * @see org.picketlink.identity.federation.web.core.IdentityParticipantStack#createSession(java.lang.String) + */ + public void createSession( String id ) { sessionParticipantsMap.put(id, new Stack<String>()); inTransitMap.put(id, new HashSet<String>()); } - private void remove(String id) + /** + * @see org.picketlink.identity.federation.web.core.IdentityParticipantStack#removeSession(java.lang.String) + */ + public void removeSession( String id ) { sessionParticipantsMap.remove(id); inTransitMap.remove(id); @@ -231,11 +212,20 @@ * Return a reference to the internal stack * @return */ - public STACK stack() + public IdentityParticipantStack stack() { return stack; } + /** + * Set a custom instance of the {@link IdentityParticipantStack} + * @param theStack + */ + public void setStack( IdentityParticipantStack theStack ) + { + this.stack = theStack; + } + /** * @see HttpSessionListener#sessionCreated(HttpSessionEvent) @@ -268,7 +258,7 @@ throw new IllegalStateException("Identity Server mismatch"); String id = sessionEvent.getSession().getId(); - stack.put(id); + stack.createSession( id ); } /** @@ -282,6 +272,6 @@ if(trace) log.trace("Session Destroyed with id=" + id + "::active session count=" + activeSessionCount); - stack.remove(id); + stack.removeSession( id ); } } \ No newline at end of file Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/IDPServlet.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/IDPServlet.java 2011-02-25 19:12:09 UTC (rev 777) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/IDPServlet.java 2011-02-25 22:03:26 UTC (rev 778) @@ -75,12 +75,14 @@ import org.picketlink.identity.federation.core.saml.v2.util.HandlerUtil; import org.picketlink.identity.federation.core.sts.PicketLinkCoreSTS; import org.picketlink.identity.federation.core.util.CoreConfigUtil; +import org.picketlink.identity.federation.core.util.StringUtil; import org.picketlink.identity.federation.core.util.XMLSignatureUtil; import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusResponseType; import org.picketlink.identity.federation.saml.v2.SAML2Object; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; +import org.picketlink.identity.federation.web.core.IdentityParticipantStack; import org.picketlink.identity.federation.web.core.IdentityServer; import org.picketlink.identity.federation.web.roles.DefaultRoleGenerator; import org.picketlink.identity.federation.web.util.ConfigurationUtil; @@ -105,28 +107,33 @@ protected transient IDPType idpConfiguration = null; - private transient RoleGenerator roleGenerator = new DefaultRoleGenerator(); + protected transient RoleGenerator roleGenerator = new DefaultRoleGenerator(); - private transient DelegatedAttributeManager attribManager = new DelegatedAttributeManager(); + protected transient DelegatedAttributeManager attribManager = new DelegatedAttributeManager(); - private List<String> attributeKeys = new ArrayList<String>(); + protected List<String> attributeKeys = new ArrayList<String>(); - private long assertionValidity = 5000; // 5 seconds in miliseconds + protected long assertionValidity = 5000; // 5 seconds in miliseconds - private String identityURL = null; + protected String identityURL = null; - private transient TrustKeyManager keyManager; + protected transient TrustKeyManager keyManager; - private Boolean ignoreIncomingSignatures = false; + protected Boolean ignoreIncomingSignatures = false; - private Boolean signOutgoingMessages = true; + protected Boolean signOutgoingMessages = true; protected String canonicalizationMethod = CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS; - private transient ServletContext context = null; + protected transient ServletContext context = null; - private transient SAML2HandlerChain chain = null; + protected transient SAML2HandlerChain chain = null; + /** + * If the user wants to set a particular {@link IdentityParticipantStack} + */ + protected String identityParticipantStack = null; + public Boolean getIgnoreIncomingSignatures() { return ignoreIncomingSignatures; @@ -252,6 +259,27 @@ { identityServer = new IdentityServer(); context.setAttribute(GeneralConstants.IDENTITY_SERVER, identityServer); + String theStackParam = config.getInitParameter( GeneralConstants.IDENTITY_PARTICIPANT_STACK ); + if( StringUtil.isNotNull( theStackParam ) ) + { + try + { + Class<?> stackClass = SecurityActions.getContextClassLoader().loadClass(theStackParam); + identityServer.setStack( (IdentityParticipantStack) stackClass.newInstance() ); + } + catch (ClassNotFoundException e) + { + log( "Unable to set the Identity Participant Stack Class. Will just use the default", e ); + } + catch (InstantiationException e) + { + log( "Unable to set the Identity Participant Stack Class. Will just use the default", e ); + } + catch (IllegalAccessException e) + { + log( "Unable to set the Identity Participant Stack Class. Will just use the default", e ); + } + } } //Ensure the configuration in the STS

13 years, 2 months

1
0
0 / 0

Picketlink SVN: r777 - in idm/branches/2.0.0: picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory and 22 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-25 14:12:09 -0500 (Fri, 25 Feb 2011) New Revision: 777 Added: idm/branches/2.0.0/picketlink-idm-memory/ idm/branches/2.0.0/picketlink-idm-memory/pom.xml idm/branches/2.0.0/picketlink-idm-memory/src/ idm/branches/2.0.0/picketlink-idm-memory/src/main/ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityObjectRelationship.java idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStore.java idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreRepository.java idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreSession.java idm/branches/2.0.0/picketlink-idm-memory/src/main/resources/ idm/branches/2.0.0/picketlink-idm-memory/src/test/ idm/branches/2.0.0/picketlink-idm-memory/src/test/java/ idm/branches/2.0.0/picketlink-idm-memory/src/test/java/org/ idm/branches/2.0.0/picketlink-idm-memory/src/test/java/org/picketlink/ idm/branches/2.0.0/picketlink-idm-memory/src/test/java/org/picketlink/test/ idm/branches/2.0.0/picketlink-idm-memory/src/test/java/org/picketlink/test/idm/ idm/branches/2.0.0/picketlink-idm-memory/src/test/java/org/picketlink/test/idm/api/ idm/branches/2.0.0/picketlink-idm-memory/src/test/java/org/picketlink/test/idm/api/model/ idm/branches/2.0.0/picketlink-idm-memory/src/test/java/org/picketlink/test/idm/api/model/CorporateModelUnitTestCase.java idm/branches/2.0.0/picketlink-idm-memory/src/test/resources/ idm/branches/2.0.0/picketlink-idm-memory/src/test/resources/configs/ idm/branches/2.0.0/picketlink-idm-memory/src/test/resources/configs/memory-config.xml Removed: idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityObjectRelationship.java idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStore.java idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreRepository.java idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreSession.java idm/branches/2.0.0/picketlink-idm-core/src/test/java/org/picketlink/test/idm/api/model/CorporateModelUnitTestCase.java idm/branches/2.0.0/picketlink-idm-core/src/test/resources/configs/memory-config.xml Modified: idm/branches/2.0.0/pom.xml Log: move the memory based identity store to separate module Deleted: idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityObjectRelationship.java =================================================================== --- idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityObjectRelationship.java 2011-02-23 21:23:57 UTC (rev 776) +++ idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityObjectRelationship.java 2011-02-25 19:12:09 UTC (rev 777) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.picketlink.idm.impl.store.memory; - -import org.picketlink.idm.spi.model.IdentityObject; -import org.picketlink.idm.spi.model.IdentityObjectRelationship; -import org.picketlink.idm.spi.model.IdentityObjectRelationshipType; - -/** - * A {@link IdentityObjectRelationship} for use in the - * {@link MemoryIdentityStore} - * @author Anil.Saldhana(a)redhat.com - * @since Feb 14, 2011 - */ -public class MemoryIdentityObjectRelationship implements IdentityObjectRelationship -{ - private String name; - private IdentityObjectRelationshipType type; - private IdentityObject to; - private IdentityObject from; - - public MemoryIdentityObjectRelationship( String name, IdentityObjectRelationshipType type, - IdentityObject from, IdentityObject to ) - { - this.name = name; - this.type = type; - this.to = to; - this.from = from; - } - - public String getName() - { - return name; - } - - public IdentityObjectRelationshipType getType() - { - return type; - } - - public IdentityObject getFromIdentityObject() - { - return from; - } - - public IdentityObject getToIdentityObject() - { - return to; - } -} \ No newline at end of file Deleted: idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStore.java =================================================================== --- idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStore.java 2011-02-23 21:23:57 UTC (rev 776) +++ idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStore.java 2011-02-25 19:12:09 UTC (rev 777) @@ -1,529 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.picketlink.idm.impl.store.memory; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import org.picketlink.idm.common.exception.IdentityException; -import org.picketlink.idm.impl.types.SimpleIdentityObject; -import org.picketlink.idm.spi.configuration.IdentityStoreConfigurationContext; -import org.picketlink.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData; -import org.picketlink.idm.spi.exception.OperationNotSupportedException; -import org.picketlink.idm.spi.model.IdentityObject; -import org.picketlink.idm.spi.model.IdentityObjectAttribute; -import org.picketlink.idm.spi.model.IdentityObjectCredential; -import org.picketlink.idm.spi.model.IdentityObjectCredentialType; -import org.picketlink.idm.spi.model.IdentityObjectRelationship; -import org.picketlink.idm.spi.model.IdentityObjectRelationshipType; -import org.picketlink.idm.spi.model.IdentityObjectType; -import org.picketlink.idm.spi.model.IdentityObjectType.TYPE; -import org.picketlink.idm.spi.search.IdentityObjectSearchCriteria; -import org.picketlink.idm.spi.store.FeaturesMetaData; -import org.picketlink.idm.spi.store.IdentityObjectSearchCriteriaType; -import org.picketlink.idm.spi.store.IdentityStore; -import org.picketlink.idm.spi.store.IdentityStoreInvocationContext; -import org.picketlink.idm.spi.store.IdentityStoreSession; - -/** - * An implementation of {@link IdentityStore} that resides in memory - * @author Anil.Saldhana(a)redhat.com - * @since Feb 14, 2011 - */ -public class MemoryIdentityStore implements IdentityStore, Serializable -{ - private static final long serialVersionUID = 1L; - private String id; - - protected Map<String,IdentityObject> users = new HashMap<String,IdentityObject>(); - - protected Map<String, IdentityObject> roles = new HashMap<String,IdentityObject>(); - protected Map<String, IdentityObject> groups = new HashMap<String,IdentityObject>(); - - protected Map<String, Set<IdentityObjectAttribute>> attributes = new HashMap<String, Set<IdentityObjectAttribute>>(); - /** - * General hashmap that is keyed by relationship name. - */ - protected Map<String, List<IdentityObjectRelationship>> relationships = new HashMap<String, List<IdentityObjectRelationship>>(); - - protected Set<String> relationshipNames = new TreeSet<String>(); - - public MemoryIdentityStore( String id ) - { - this.id = id; - } - - public Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext invocationContext, - IdentityObjectType identityType) throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public Map<String, IdentityObjectAttributeMetaData> getAttributesMetaData( - IdentityStoreInvocationContext invocationContext, IdentityObjectType identityType) - { - throw new RuntimeException( "NYI" ); - } - - public Map<String, IdentityObjectAttribute> getAttributes(IdentityStoreInvocationContext invocationContext, - IdentityObject identity) throws IdentityException - { - Map<String, IdentityObjectAttribute> map = new HashMap<String, IdentityObjectAttribute>(); - - Set<IdentityObjectAttribute> attrs = attributes.get( identity.getName()); - if( attrs != null ) - { - for( IdentityObjectAttribute ioa: attrs ) - { - map.put(ioa.getName(), ioa ); - } - } - return map; - } - - public IdentityObjectAttribute getAttribute(IdentityStoreInvocationContext invocationContext, - IdentityObject identity, String name) throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public void updateAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, - IdentityObjectAttribute[] attributes) throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public void addAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, - IdentityObjectAttribute[] attributes) throws IdentityException - { - Set<IdentityObjectAttribute> set = this.attributes.get( identity.getName() ); - if( set == null) - { - set = new HashSet<IdentityObjectAttribute>(); - this.attributes.put( identity.getName(), set ); - } - set.addAll( Arrays.asList( attributes )); - } - - public void removeAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, - String[] attributeNames) throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public IdentityObject findIdentityObjectByUniqueAttribute(IdentityStoreInvocationContext invocationCtx, - IdentityObjectType identityObjectType, IdentityObjectAttribute attribute) throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public IdentityStoreSession createIdentityStoreSession() throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public IdentityStoreSession createIdentityStoreSession(Map<String, Object> sessionOptions) throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public void bootstrap(IdentityStoreConfigurationContext configurationContext) throws IdentityException - { - } - - public String getId() - { - return id; - } - - public FeaturesMetaData getSupportedFeatures() - { - return new FeaturesMetaData() - { - public boolean isSearchCriteriaTypeSupported(IdentityObjectType identityObjectType, - IdentityObjectSearchCriteriaType storeSearchConstraint) - { - return true; - } - - public boolean isRoleNameSearchCriteriaTypeSupported(IdentityObjectSearchCriteriaType constraint) - { - return true; - } - - public boolean isRelationshipTypeSupported(IdentityObjectType fromType, IdentityObjectType toType, - IdentityObjectRelationshipType relationshipType) throws IdentityException - { - return true; - } - - public boolean isRelationshipPropertiesSupported() - { - return true; - } - - public boolean isRelationshipNameAddRemoveSupported() - { - return true; - } - - public boolean isNamedRelationshipsSupported() - { - return true; - } - - public boolean isIdentityObjectTypeSupported(IdentityObjectType identityObjectType) - { - return true; - } - - public boolean isIdentityObjectAddRemoveSupported(IdentityObjectType objectType) - { - return true; - } - - public boolean isCredentialSupported(IdentityObjectType identityObjectType, - IdentityObjectCredentialType credentialType) - { - return true; - } - - public Set<String> getSupportedRelationshipTypes() - { - return null; - } - - public Set<String> getSupportedIdentityObjectTypes() - { - return null; - } - }; - } - - public IdentityObject createIdentityObject(IdentityStoreInvocationContext invocationCtx, String name, - IdentityObjectType identityObjectType) throws IdentityException - { - if( identityObjectType == null ) - throw new IllegalArgumentException( "Identity Object Type is null" ); - - IdentityObject io = null; - - String identityObjectTypeName = identityObjectType.getName(); - - TYPE type = identityObjectType.getType(); - - if( type == TYPE.GROUP ) - { - io = groups.get(identityObjectTypeName); - if( io == null ) - { - io = new SimpleIdentityObject( name, identityObjectType ); - groups.put(name, io); - } - } - else if( type == TYPE.USER ) - { - io = users.get(identityObjectTypeName); - if( io ==null) - { - io = new SimpleIdentityObject( name, identityObjectType ); - users.put( name, io ); - } - } - else - { - io = roles.get(identityObjectTypeName); - if( io == null ) - { - io = new SimpleIdentityObject( name, identityObjectType ); - roles.put(identityObjectTypeName, io); - } - } - /*if( identityObjectTypeName.equals( "ORGANIZATION" ) || identityObjectTypeName.equals( "DIVISION" ) - || identityObjectTypeName.equals( "DEPARTMENT") || identityObjectTypeName.equals( "ORGANIZATION_UNIT") - || identityObjectTypeName.equals( "PROJECT" ) || identityObjectTypeName.equals( "PEOPLE" )) - { - io = generalBucket.get(name); - - if( io == null ) - { - io = new SimpleIdentityObject( name, identityObjectType ); - generalBucket.put(name, io); - } - } - else if( identityObjectTypeName.equals( "USER" )) - { - io = users.get( name ); - if( io == null ) - { - io = new SimpleIdentityObject( name, identityObjectType ); - users.put(name, io ); - } - } - else - throw new RuntimeException( "Unknown type : " + identityObjectTypeName );*/ - return io; - } - - public IdentityObject createIdentityObject(IdentityStoreInvocationContext invocationCtx, String name, - IdentityObjectType identityObjectType, Map<String, String[]> attributes) throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public void removeIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObject identity) - throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public int getIdentityObjectsCount(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityType) - throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationContext, String name, - IdentityObjectType identityObjectType) throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationContext, String id) - throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, - IdentityObjectType identityType, IdentityObjectSearchCriteria criteria) throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCxt, - IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, - IdentityObjectSearchCriteria criteria) throws IdentityException - { - Collection<IdentityObject> result = new HashSet<IdentityObject>(); - - String relationshipName = relationshipType.getName(); - List<IdentityObjectRelationship> rels = relationships.get(relationshipName); - if( rels != null ) - { - for( IdentityObjectRelationship rel: rels ) - { - String identityName = identity.getName(); - IdentityObject from = rel.getFromIdentityObject(); - IdentityObject to = rel.getToIdentityObject(); - - if( from.getName().equals(identityName) || to.getName().equals(identityName) ) - { - result.add( from ); - result.add( to); - } - } - } - - /*TYPE type = identity.getIdentityType().getType(); - if( type == TYPE.GROUP ) - { - IdentityObject io = groups.get( identity.getName() ); - System.out.println( io ); - - } - throw new RuntimeException( "NYI" );*/ - return result; - } - - public IdentityObjectRelationship createRelationship(IdentityStoreInvocationContext invocationCxt, - IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType, - String relationshipName, boolean createNames) throws IdentityException - { - String relationshipTypeName = relationshipType.getName(); - - List<IdentityObjectRelationship> rels; - - IdentityObjectRelationship ior = new MemoryIdentityObjectRelationship(relationshipName, - relationshipType, fromIdentity, toIdentity); - - if( ! relationships.containsKey(relationshipTypeName) ) - { - rels = new ArrayList<IdentityObjectRelationship>(); - rels.add(ior); - relationships.put(relationshipTypeName, rels ); - } - else - { - rels = relationships.get(relationshipTypeName); - rels.add(ior); - } - return ior; - } - - public void removeRelationship(IdentityStoreInvocationContext invocationCxt, IdentityObject fromIdentity, - IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType, String relationshipName) - throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public void removeRelationships(IdentityStoreInvocationContext invocationCtx, IdentityObject identity1, - IdentityObject identity2, boolean named) throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext invocationCxt, - IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType) - throws IdentityException - { - Set<IdentityObjectRelationship> set = new HashSet<IdentityObjectRelationship>(); - - String relationshipTypeName = relationshipType.getName(); - List<IdentityObjectRelationship> rels = relationships.get(relationshipTypeName); - if( rels != null ) - { - for( IdentityObjectRelationship ior : rels ) - { - IdentityObject iroFrom = ior.getFromIdentityObject(); - IdentityObject iroTo = ior.getToIdentityObject(); - if( iroFrom.getName().equals( fromIdentity.getName() ) && iroTo.getName().equals( toIdentity.getName() ) ) - set.add(ior); - } - } - return set; - } - - public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext invocationCxt, - IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, boolean named, - String name) throws IdentityException - { - throw new RuntimeException( "NYI" ); - } - - public String createRelationshipName(IdentityStoreInvocationContext ctx, String name) throws IdentityException, - OperationNotSupportedException - { - relationshipNames.add(name); - return name; - } - - public String removeRelationshipName(IdentityStoreInvocationContext ctx, String name) throws IdentityException, - OperationNotSupportedException - { - throw new RuntimeException( "NYI" ); - } - - public Map<String, String> getRelationshipNameProperties(IdentityStoreInvocationContext ctx, String name) - throws IdentityException, OperationNotSupportedException - { - throw new RuntimeException( "NYI" ); - } - - public void setRelationshipNameProperties(IdentityStoreInvocationContext ctx, String name, - Map<String, String> properties) throws IdentityException, OperationNotSupportedException - { - throw new RuntimeException( "NYI" ); - } - - public void removeRelationshipNameProperties(IdentityStoreInvocationContext ctx, String name, Set<String> properties) - throws IdentityException, OperationNotSupportedException - { - throw new RuntimeException( "NYI" ); - } - - public Map<String, String> getRelationshipProperties(IdentityStoreInvocationContext ctx, - IdentityObjectRelationship relationship) throws IdentityException, OperationNotSupportedException - { - throw new RuntimeException( "NYI" ); - } - - public void setRelationshipProperties(IdentityStoreInvocationContext ctx, IdentityObjectRelationship relationship, - Map<String, String> properties) throws IdentityException, OperationNotSupportedException - { - throw new RuntimeException( "NYI" ); - } - - public void removeRelationshipProperties(IdentityStoreInvocationContext ctx, - IdentityObjectRelationship relationship, Set<String> properties) throws IdentityException, - OperationNotSupportedException - { - throw new RuntimeException( "NYI" ); - } - - public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObjectSearchCriteria criteria) - throws IdentityException, OperationNotSupportedException - { - return Collections.unmodifiableSet( relationshipNames ); - } - - public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, - IdentityObjectSearchCriteria criteria) throws IdentityException, OperationNotSupportedException - { - Set<String> result = new TreeSet<String>(); - - String identityName = identity.getName(); - - if( identityName == null ) - throw new IllegalStateException( "Identity Name null" ); - - Set<String> keys = relationships.keySet(); - for( String key : keys ) - { - List<IdentityObjectRelationship> iors = relationships.get(key); - for( IdentityObjectRelationship ior: iors ) - { - if( ior.getName() == null ) - continue; - - String fromID = ior.getFromIdentityObject().getName(); - String toID = ior.getToIdentityObject().getName(); - - if( fromID.equals( identityName) || toID.equals( identityName )) - result.add(ior.getName()); - } - } - return result; - } - - public boolean validateCredential(IdentityStoreInvocationContext ctx, IdentityObject identityObject, - IdentityObjectCredential credential) throws IdentityException - { - return false; - } - - public void updateCredential(IdentityStoreInvocationContext ctx, IdentityObject identityObject, - IdentityObjectCredential credential) throws IdentityException - { - throw new RuntimeException( "NYI" ); - } -} \ No newline at end of file Deleted: idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreRepository.java =================================================================== --- idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreRepository.java 2011-02-23 21:23:57 UTC (rev 776) +++ idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreRepository.java 2011-02-25 19:12:09 UTC (rev 777) @@ -1,378 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.picketlink.idm.impl.store.memory; - -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import org.picketlink.idm.common.exception.IdentityException; -import org.picketlink.idm.core.factories.IdentityFactory; -import org.picketlink.idm.spi.configuration.IdentityRepositoryConfigurationContext; -import org.picketlink.idm.spi.configuration.IdentityStoreConfigurationContext; -import org.picketlink.idm.spi.configuration.metadata.IdentityConfigurationMetaData; -import org.picketlink.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData; -import org.picketlink.idm.spi.configuration.metadata.IdentityRepositoryConfigurationMetaData; -import org.picketlink.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData; -import org.picketlink.idm.spi.exception.OperationNotSupportedException; -import org.picketlink.idm.spi.model.IdentityObject; -import org.picketlink.idm.spi.model.IdentityObjectAttribute; -import org.picketlink.idm.spi.model.IdentityObjectCredential; -import org.picketlink.idm.spi.model.IdentityObjectRelationship; -import org.picketlink.idm.spi.model.IdentityObjectRelationshipType; -import org.picketlink.idm.spi.model.IdentityObjectType; -import org.picketlink.idm.spi.repository.IdentityStoreRepository; -import org.picketlink.idm.spi.search.IdentityObjectSearchCriteria; -import org.picketlink.idm.spi.store.AttributeStore; -import org.picketlink.idm.spi.store.FeaturesMetaData; -import org.picketlink.idm.spi.store.IdentityObjectSearchCriteriaType; -import org.picketlink.idm.spi.store.IdentityStore; -import org.picketlink.idm.spi.store.IdentityStoreInvocationContext; -import org.picketlink.idm.spi.store.IdentityStoreSession; - -/** - * A {@link IdentityStoreRepository} that resides in memory - * @author Anil.Saldhana(a)redhat.com - * @since Feb 14, 2011 - */ -public class MemoryIdentityStoreRepository implements IdentityStoreRepository -{ - private static final long serialVersionUID = 1L; - - protected String id = null; - - protected IdentityStore store; - - protected IdentityConfigurationMetaData md; - - protected IdentityRepositoryConfigurationMetaData repoMD = null; - - protected IdentityStoreConfigurationMetaData storeMD = null; - - private static Set<IdentityObjectSearchCriteriaType> supportedIdentityObjectSearchCriteria = - new HashSet<IdentityObjectSearchCriteriaType>(); - - private static Set<String> supportedCredentialTypes = new HashSet<String>(); - - public static final String CREDENTIAL_TYPE_PASSWORD = "PASSWORD"; - - public static final String CREDENTIAL_TYPE_BINARY = "BINARY"; - - static { - // List all supported criteria classes - - supportedIdentityObjectSearchCriteria.add(IdentityObjectSearchCriteriaType.ATTRIBUTE_FILTER); - supportedIdentityObjectSearchCriteria.add(IdentityObjectSearchCriteriaType.NAME_FILTER); - supportedIdentityObjectSearchCriteria.add(IdentityObjectSearchCriteriaType.PAGE); - supportedIdentityObjectSearchCriteria.add(IdentityObjectSearchCriteriaType.SORT); - - // credential types supported by this impl - supportedCredentialTypes.add(CREDENTIAL_TYPE_PASSWORD); - supportedCredentialTypes.add(CREDENTIAL_TYPE_BINARY); - - } - - - public MemoryIdentityStoreRepository( String id ) - { - this.id = id; - store = new MemoryIdentityStore(id); - } - - public String getId() - { - return id; - } - - public FeaturesMetaData getSupportedFeatures() - { - return store.getSupportedFeatures(); - } - - public IdentityObject createIdentityObject(IdentityStoreInvocationContext invocationCtx, String name, - IdentityObjectType identityObjectType) throws IdentityException - { - return store.createIdentityObject(invocationCtx, name, identityObjectType); - } - - public IdentityObject createIdentityObject(IdentityStoreInvocationContext invocationCtx, String name, - IdentityObjectType identityObjectType, Map<String, String[]> attributes) throws IdentityException - { - return store.createIdentityObject(invocationCtx, name, identityObjectType, attributes ); - } - - public void removeIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObject identity) - throws IdentityException - { - store.removeIdentityObject(invocationCtx, identity); - } - - public int getIdentityObjectsCount(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityType) - throws IdentityException - { - return store.getIdentityObjectsCount(invocationCtx, identityType); - } - - public IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationContext, String name, - IdentityObjectType identityObjectType) throws IdentityException - { - return store.findIdentityObject(invocationContext, name, identityObjectType ); - } - - public IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationContext, String id) - throws IdentityException - { - return store.findIdentityObject(invocationContext, id); - } - - public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, - IdentityObjectType identityType, IdentityObjectSearchCriteria criteria) throws IdentityException - { - return store.findIdentityObject(invocationCtx, identityType, criteria); - } - - public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCxt, - IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, - IdentityObjectSearchCriteria criteria) throws IdentityException - { - return store.findIdentityObject(invocationCxt, identity, relationshipType, parent, criteria); - } - - public IdentityObjectRelationship createRelationship(IdentityStoreInvocationContext invocationCxt, - IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType, - String relationshipName, boolean createNames) throws IdentityException - { - return store.createRelationship(invocationCxt, fromIdentity, toIdentity, relationshipType, relationshipName, createNames); - } - - public void removeRelationship(IdentityStoreInvocationContext invocationCxt, IdentityObject fromIdentity, - IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType, String relationshipName) - throws IdentityException - { - store.removeRelationship(invocationCxt, fromIdentity, toIdentity, relationshipType, relationshipName); - } - - public void removeRelationships(IdentityStoreInvocationContext invocationCtx, IdentityObject identity1, - IdentityObject identity2, boolean named) throws IdentityException - { - store.removeRelationships(invocationCtx, identity1, identity2, named); - } - - public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext invocationCxt, - IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType) - throws IdentityException - { - return store.resolveRelationships(invocationCxt, fromIdentity, toIdentity, relationshipType); - } - - public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext invocationCxt, - IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, boolean named, - String name) throws IdentityException - { - return store.resolveRelationships(invocationCxt, identity, relationshipType, parent, named, name ); - } - - public String createRelationshipName(IdentityStoreInvocationContext ctx, String name) throws IdentityException, - OperationNotSupportedException - { - return store.createRelationshipName(ctx, name); - } - - public String removeRelationshipName(IdentityStoreInvocationContext ctx, String name) throws IdentityException, - OperationNotSupportedException - { - return store.removeRelationshipName(ctx, name); - } - - public Map<String, String> getRelationshipNameProperties(IdentityStoreInvocationContext ctx, String name) - throws IdentityException, OperationNotSupportedException - { - return store.getRelationshipNameProperties(ctx, name); - } - - public void setRelationshipNameProperties(IdentityStoreInvocationContext ctx, String name, - Map<String, String> properties) throws IdentityException, OperationNotSupportedException - { - store.setRelationshipNameProperties(ctx, name, properties); - } - - public void removeRelationshipNameProperties(IdentityStoreInvocationContext ctx, String name, Set<String> properties) - throws IdentityException, OperationNotSupportedException - { - store.removeRelationshipNameProperties(ctx, name, properties); - } - - public Map<String, String> getRelationshipProperties(IdentityStoreInvocationContext ctx, - IdentityObjectRelationship relationship) throws IdentityException, OperationNotSupportedException - { - throw new RuntimeException( "NYI" ); - } - - public void setRelationshipProperties(IdentityStoreInvocationContext ctx, IdentityObjectRelationship relationship, - Map<String, String> properties) throws IdentityException, OperationNotSupportedException - { - - - } - - public void removeRelationshipProperties(IdentityStoreInvocationContext ctx, - IdentityObjectRelationship relationship, Set<String> properties) throws IdentityException, - OperationNotSupportedException - { - } - - public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObjectSearchCriteria criteria) - throws IdentityException, OperationNotSupportedException - { - - throw new RuntimeException( "NYI" ); - } - - public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, - IdentityObjectSearchCriteria criteria) throws IdentityException, OperationNotSupportedException - { - return store.getRelationshipNames(ctx, identity, criteria); - } - - public boolean validateCredential(IdentityStoreInvocationContext ctx, IdentityObject identityObject, - IdentityObjectCredential credential) throws IdentityException - { - return false; - } - - public void updateCredential(IdentityStoreInvocationContext ctx, IdentityObject identityObject, - IdentityObjectCredential credential) throws IdentityException - { - } - - public Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext invocationContext, - IdentityObjectType identityType) throws IdentityException - { - - throw new RuntimeException( "NYI" ); - } - - public Map<String, IdentityObjectAttributeMetaData> getAttributesMetaData( - IdentityStoreInvocationContext invocationContext, IdentityObjectType identityType) - { - - throw new RuntimeException( "NYI" ); - } - - public Map<String, IdentityObjectAttribute> getAttributes(IdentityStoreInvocationContext invocationContext, - IdentityObject identity) throws IdentityException - { - return store.getAttributes( invocationContext, identity); - } - - public IdentityObjectAttribute getAttribute(IdentityStoreInvocationContext invocationContext, - IdentityObject identity, String name) throws IdentityException - { - - throw new RuntimeException( "NYI" ); - } - - public void updateAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, - IdentityObjectAttribute[] attributes) throws IdentityException - { - } - - public void addAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, - IdentityObjectAttribute[] attributes) throws IdentityException - { - store.addAttributes( invocationCtx, identity, attributes); - } - - public void removeAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, - String[] attributeNames) throws IdentityException - { - store.removeAttributes(invocationCtx, identity, attributeNames); - } - - public IdentityObject findIdentityObjectByUniqueAttribute(IdentityStoreInvocationContext invocationCtx, - IdentityObjectType identityObjectType, IdentityObjectAttribute attribute) throws IdentityException - { - return store.findIdentityObjectByUniqueAttribute(invocationCtx, identityObjectType, attribute); - } - - public IdentityStoreSession createIdentityStoreSession() throws IdentityException - { - return store.createIdentityStoreSession(); - } - - public IdentityStoreSession createIdentityStoreSession(Map<String, Object> sessionOptions) throws IdentityException - { - return new MemoryIdentityStoreSession(); - } - - public void bootstrap(IdentityRepositoryConfigurationContext configurationContext, - Map<String, IdentityStore> bootstrappedIdentityStores, Map<String, AttributeStore> bootstrappedAttributeStores) - throws IdentityException - { - repoMD = configurationContext.getRepositoryConfigurationMetaData(); - storeMD = configurationContext.getConfigurationMetaData().getIdentityStores().get(0); - } - - - public void bootstrap(IdentityStoreConfigurationContext configurationContext) throws IdentityException - { - storeMD = configurationContext.getStoreConfigurationMetaData(); - } - - public Set<IdentityStore> getConfiguredIdentityStores() - { - - throw new RuntimeException( "NYI" ); - } - - public Set<AttributeStore> getConfiguredAttributeStores() - { - - throw new RuntimeException( "NYI" ); - } - - public Map<String, IdentityStore> getIdentityStoreMappings() - { - - throw new RuntimeException( "NYI" ); - } - - public Map<String, AttributeStore> getAttributeStoreMappings() - { - - throw new RuntimeException( "NYI" ); - } - - public IdentityStore getIdentityStore(IdentityObjectType identityObjectType) throws IdentityException - { - - throw new RuntimeException( "NYI" ); - } - - public AttributeStore getAttributeStore(IdentityObjectType identityObjectType) throws IdentityException - { - - throw new RuntimeException( "NYI" ); - } -} \ No newline at end of file Deleted: idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreSession.java =================================================================== --- idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreSession.java 2011-02-23 21:23:57 UTC (rev 776) +++ idm/branches/2.0.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreSession.java 2011-02-25 19:12:09 UTC (rev 777) @@ -1,88 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.picketlink.idm.impl.store.memory; - -import org.picketlink.idm.api.IdentitySession; -import org.picketlink.idm.common.exception.IdentityException; -import org.picketlink.idm.spi.store.IdentityStoreSession; - -/** - * A {@link IdentitySession} for memory - * @author Anil.Saldhana(a)redhat.com - * @since Feb 14, 2011 - */ -public class MemoryIdentityStoreSession implements IdentityStoreSession -{ - - public Object getSessionContext() throws IdentityException - { - return null; - } - - public void close() throws IdentityException - { - } - - public void save() throws IdentityException - { - } - - public void clear() throws IdentityException - { - } - - public boolean isOpen() - { - - return false; - } - - public boolean isTransactionSupported() - { - - return false; - } - - public void startTransaction() - { - - - } - - public void commitTransaction() - { - - - } - - public void rollbackTransaction() - { - - - } - - public boolean isTransactionActive() - { - - return false; - } -} \ No newline at end of file Deleted: idm/branches/2.0.0/picketlink-idm-core/src/test/java/org/picketlink/test/idm/api/model/CorporateModelUnitTestCase.java =================================================================== --- idm/branches/2.0.0/picketlink-idm-core/src/test/java/org/picketlink/test/idm/api/model/CorporateModelUnitTestCase.java 2011-02-23 21:23:57 UTC (rev 776) +++ idm/branches/2.0.0/picketlink-idm-core/src/test/java/org/picketlink/test/idm/api/model/CorporateModelUnitTestCase.java 2011-02-25 19:12:09 UTC (rev 777) @@ -1,454 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.picketlink.test.idm.api.model; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.Collection; -import java.util.Map; - -import org.junit.Test; -import org.picketlink.idm.api.Attribute; -import org.picketlink.idm.api.AttributesManager; -import org.picketlink.idm.api.Group; -import org.picketlink.idm.api.IdentitySession; -import org.picketlink.idm.api.IdentitySessionFactory; -import org.picketlink.idm.api.PersistenceManager; -import org.picketlink.idm.api.RelationshipManager; -import org.picketlink.idm.api.RoleManager; -import org.picketlink.idm.api.RoleType; -import org.picketlink.idm.api.User; -import org.picketlink.idm.api.cfg.IdentityConfiguration; -import org.picketlink.idm.common.p3p.P3PConstants; -import org.picketlink.idm.core.factories.IdentityFactory; -import org.picketlink.idm.impl.api.SimpleAttribute; - -/** - * Unit test a typical corporate model - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @author Anil.Saldhana(a)redhat.com - * @since Feb 14, 2011 - */ -public class CorporateModelUnitTestCase -{ - private String sampleOrganizationRealmName = "realm://memory"; - - String configFileName = "configs/memory-config.xml"; - - - @Test - public void testModel() throws Exception - { - IdentityConfiguration config = IdentityFactory.createConfiguration( configFileName ); - assertNotNull( config ); - IdentitySessionFactory sessionFactory = config.buildIdentitySessionFactory(); - assertNotNull( sessionFactory ); - - // GroupType - - String ORGANIZATION = "ORGANIZATION"; - String ORGANIZATION_UNIT = "ORGANIZATION_UNIT"; - String DIVISION = "DIVISION"; - String DEPARTMENT = "DEPARTMENT"; - String PROJECT = "PROJECT"; - String PEOPLE = "PEOPLE"; - - - IdentitySession session = sessionFactory .createIdentitySession( sampleOrganizationRealmName ); - - - begin(); - - // Organization structure - - PersistenceManager persistenceManager = session.getPersistenceManager(); - Group rhOrg = persistenceManager.createGroup("RedHat", ORGANIZATION); - - Group jbossDivision = persistenceManager.createGroup("JBoss", DIVISION); - Group rhelDivision = persistenceManager.createGroup("RHEL", DIVISION); - - RelationshipManager relationshipManager = session.getRelationshipManager(); - relationshipManager.associateGroups(rhOrg, jbossDivision); - relationshipManager.associateGroups(rhOrg, rhelDivision); - - Group itDepartment = persistenceManager.createGroup("IT", DEPARTMENT); - Group hrDepartment = persistenceManager.createGroup("HR", DEPARTMENT); - - relationshipManager.associateGroups(jbossDivision, itDepartment); - relationshipManager.associateGroups(jbossDivision, hrDepartment); - - Group rndDepartment = persistenceManager.createGroup("RnD", DEPARTMENT); - - relationshipManager.associateGroups(itDepartment, rndDepartment); - - Group projectsOU = persistenceManager.createGroup("Projects", ORGANIZATION_UNIT); - Group commonFrameworksOU = persistenceManager.createGroup("Common Frameworks", ORGANIZATION_UNIT); - - relationshipManager.associateGroups(rndDepartment, projectsOU); - - // Projects - - Group portalProject = persistenceManager.createGroup("Portal", PROJECT); - Group soaProject = persistenceManager.createGroup("SOA", PROJECT); - Group jbpmProject = persistenceManager.createGroup("jBPM", PROJECT); - Group seamProject = persistenceManager.createGroup("Seam", PROJECT); - Group asProject = persistenceManager.createGroup("AS", PROJECT); - Group securityProject = persistenceManager.createGroup("Security", PROJECT); - - relationshipManager.associateGroups(projectsOU, portalProject); - relationshipManager.associateGroups(projectsOU, soaProject); - relationshipManager.associateGroups(projectsOU, jbpmProject); - relationshipManager.associateGroups(projectsOU, asProject); - relationshipManager.associateGroups(projectsOU, seamProject); - - // Check... - assertTrue(relationshipManager.isAssociated(projectsOU, portalProject)); - assertTrue(relationshipManager.isAssociated(projectsOU, soaProject)); - assertTrue(relationshipManager.isAssociated(projectsOU, jbpmProject)); - assertTrue(relationshipManager.isAssociated(projectsOU, asProject)); - assertTrue(relationshipManager.isAssociated(projectsOU, seamProject)); - - // Portal is part of common frameworks - relationshipManager.associateGroups(commonFrameworksOU, portalProject); - - // People - - Group employeesGroup = persistenceManager.createGroup("Employees", PEOPLE); - - // Management - - User theuteUser = persistenceManager.createUser("theute"); - User mlittleUser = persistenceManager.createUser("mlittle"); - User bgeorgesUser = persistenceManager.createUser("bgeorges"); - User asaldhanaUser = persistenceManager.createUser("asaldhana"); - User janderseUser = persistenceManager.createUser("janderse"); - - // Portal Team - - User bdawidowUser = persistenceManager.createUser("bdawidow"); - User claprunUser = persistenceManager.createUser("claprun"); - User whalesUser = persistenceManager.createUser("whales"); - User sshahUser = persistenceManager.createUser("sshah"); - User mwringeUser = persistenceManager.createUser("mwringe"); - - // Store as employees - - relationshipManager.associateUser(employeesGroup, theuteUser); - relationshipManager.associateUser(employeesGroup, mlittleUser); - relationshipManager.associateUser(employeesGroup, asaldhanaUser); - relationshipManager.associateUser(employeesGroup, bdawidowUser); - relationshipManager.associateUser(employeesGroup, claprunUser); - relationshipManager.associateUser(employeesGroup, whalesUser); - relationshipManager.associateUser(employeesGroup, sshahUser); - relationshipManager.associateUser(employeesGroup, mwringeUser); - - // Portal team for management purposes - - Group portalTeamGroup = persistenceManager.createGroup("Portal Team", PEOPLE); - relationshipManager.associateUser(portalTeamGroup, bdawidowUser); - relationshipManager.associateUser(portalTeamGroup, claprunUser); - relationshipManager.associateUser(portalTeamGroup, whalesUser); - relationshipManager.associateUser(portalTeamGroup, sshahUser); - relationshipManager.associateUser(portalTeamGroup, mwringeUser); - - // Portal team is under common frameworks - - relationshipManager.associateGroups(commonFrameworksOU, portalTeamGroup); - - // Role Types - - RoleManager roleManager = session.getRoleManager(); - RoleType developerRT = roleManager.createRoleType("Developer"); - RoleType managerRT = roleManager.createRoleType("Manager"); - RoleType leadDeveloperRT = roleManager.createRoleType("Lead Developer"); - RoleType productManagerRT = roleManager.createRoleType("Product Manager"); - - // Assign roles - - // Common frameworks manager - - roleManager.createRole(managerRT, bgeorgesUser, commonFrameworksOU); - - // Portal developers - - roleManager.createRole(developerRT, theuteUser, portalProject); - roleManager.createRole(developerRT, bdawidowUser, portalProject); - roleManager.createRole(developerRT, claprunUser, portalProject); - roleManager.createRole(developerRT, whalesUser, portalProject); - roleManager.createRole(developerRT, sshahUser, portalProject); - roleManager.createRole(developerRT, mwringeUser, portalProject); - - // Portal management - roleManager.createRole(leadDeveloperRT, theuteUser, portalProject); - roleManager.createRole(managerRT, theuteUser, portalTeamGroup); - roleManager.createRole(productManagerRT, janderseUser, portalProject); - - // SOA - - roleManager.createRole(developerRT, mlittleUser, portalProject); - roleManager.createRole(productManagerRT, mlittleUser, portalProject); - - // AS & Security - - roleManager.createRole(developerRT, asaldhanaUser, asProject); - roleManager.createRole(developerRT, asaldhanaUser, securityProject); - roleManager.createRole(leadDeveloperRT, asaldhanaUser, securityProject); - - - // Check what RoleTypes has user theute - Collection<RoleType> roleTypes = roleManager.findUserRoleTypes(theuteUser); - assertEquals(3, roleTypes.size()); - assertTrue(roleTypes.contains(developerRT)); - assertTrue(roleTypes.contains(leadDeveloperRT)); - assertTrue(roleTypes.contains(managerRT)); - assertFalse(roleTypes.contains(productManagerRT)); - - assertTrue(roleManager.hasRole(theuteUser, portalProject, developerRT)); - assertTrue(roleManager.hasRole(theuteUser, portalProject, leadDeveloperRT)); - assertTrue(roleManager.hasRole(theuteUser, portalTeamGroup, managerRT)); - - // Check where anil is Lead Developer and where Developer - - roleTypes = roleManager.findUserRoleTypes(asaldhanaUser); - assertEquals(2, roleTypes.size()); - assertTrue(roleTypes.contains(developerRT)); - assertTrue(roleTypes.contains(leadDeveloperRT)); - - roleTypes = roleManager.findRoleTypes(asaldhanaUser, securityProject); - assertEquals(2, roleTypes.size()); - assertTrue(roleTypes.contains(leadDeveloperRT)); - - roleTypes = roleManager.findRoleTypes(asaldhanaUser, asProject); - assertEquals(1, roleTypes.size()); - assertTrue(roleTypes.contains(developerRT)); - - // and simpler... - assertTrue(roleManager.hasRole(asaldhanaUser, asProject, developerRT)); - - // Assert relationships - - Collection<User> identities = relationshipManager.findAssociatedUsers(portalTeamGroup, false); - assertEquals(5, identities.size()); - assertTrue(identities.contains(claprunUser)); - assertTrue(identities.contains(mwringeUser)); - assertTrue(identities.contains(sshahUser)); - assertTrue(identities.contains(whalesUser)); - assertTrue(identities.contains(bdawidowUser)); - - Collection<Group> groups = relationshipManager.findAssociatedGroups(rndDepartment, PROJECT, true, false); - assertEquals(0, groups.size()); - - // Check to which group Anil belongs - groups = relationshipManager.findAssociatedGroups(asaldhanaUser, PEOPLE); - assertEquals(1, groups.size()); - assertTrue(groups.contains(employeesGroup)); - - // Now check sshah - groups = relationshipManager.findAssociatedGroups(sshahUser, PEOPLE); - assertEquals(2, groups.size()); - assertTrue(groups.contains(employeesGroup)); - assertTrue(groups.contains(portalTeamGroup)); - - - - - // User attributes - Attribute[] userInfo = new Attribute[] - { - new SimpleAttribute(P3PConstants.INFO_USER_NAME_GIVEN, new String[]{"Boleslaw"}), - new SimpleAttribute(P3PConstants.INFO_USER_NAME_FAMILY, new String[]{"Dawidowicz"}), - //new SimpleAttribute("picture", new byte[][]{picture}), - new SimpleAttribute("email", new String[]{"bd(a)example.com"}) - }; - - AttributesManager attributesManager = session.getAttributesManager(); - attributesManager.addAttributes(bdawidowUser, userInfo); - - Map<String, Attribute> attributes = attributesManager.getAttributes(bdawidowUser); - assertEquals(3, attributes.keySet().size()); - assertEquals("Dawidowicz", (attributes.get(P3PConstants.INFO_USER_NAME_FAMILY)).getValue()); - - /* // Check readOnly attribute change - userInfo = new Attribute[] - { - new SimpleAttribute("description", new String[]{"some description"}) - }; - - attributesManager.addAttributes(bdawidowUser, userInfo); - attributesManager.updateAttributes(bdawidowUser, userInfo); - - attributes = attributesManager.getAttributes(bdawidowUser); - assertEquals(3, attributes.keySet().size()); - assertEquals(null, (attributes.get("description"))); - - // Generate random binary data for binary attribute - Random random = new Random(); - - // Check that binary attribute picture is mapped - AttributeDescription attributeDescription = attributesManager.getAttributeDescription(bdawidowUser, "picture"); - - if (attributeDescription != null && attributeDescription.getType().equals("binary")) - { - - // 900 kilobytes - byte[] picture = new byte[921600]; - random.nextBytes(picture); - - userInfo = new Attribute[] - { - new SimpleAttribute("picture", new byte[][]{picture}), - }; - - - attributesManager.addAttributes(bdawidowUser, userInfo); - - attributes = attributesManager.getAttributes(bdawidowUser); - assertEquals(4, attributes.keySet().size()); - assertEquals("Dawidowicz", (attributes.get(P3PConstants.INFO_USER_NAME_FAMILY)).getValue()); - assertTrue(Arrays.equals((byte[])attributes.get("picture").getValue(), picture)); - - // Update - - // 500 kilobytes - picture = new byte[50600]; - random.nextBytes(picture); - - userInfo = new Attribute[] - { - new SimpleAttribute("picture", new byte[][]{picture}), - }; - - - attributesManager.updateAttributes(bdawidowUser, userInfo); - - attributes = attributesManager.getAttributes(bdawidowUser); - assertEquals(4, attributes.keySet().size()); - assertTrue(Arrays.equals((byte[])attributes.get("picture").getValue(), picture)); - } - - - // Find user by email - assertNull(attributesManager.findUserByUniqueAttribute("email", "toto")); - User user = attributesManager.findUserByUniqueAttribute("email", "bd(a)example.com"); - assertEquals(bdawidowUser, user); - - - // If email is configured as unique it should not be possible to set same value for different user - - attributeDescription = attributesManager.getAttributeDescription(bdawidowUser, "email"); - - if (attributeDescription != null && attributeDescription.isUnique()) - { - - - // check if same unique email can be used for other user - try - { - userInfo = new Attribute[] - { - new SimpleAttribute("email", new String[]{"bd(a)example.com"}) - }; - - attributesManager.addAttributes(theuteUser, userInfo); - fail(); - } - catch (IdentityException e) - { - // expected - } - } - - - - // Credential - User anotherOne = bdawidowUser; //session.getPersistenceManager().createUser("blah1"); - - if (attributesManager.isCredentialTypeSupported(PasswordCredential.TYPE)) - { - - // There is a known issue that on some LDAP servers (MSAD at least) old password can - // still be used for some time together with the new one. Because of this testsuite cannot - // assert previously set password values - - // #1 - attributesManager.updatePassword(anotherOne, "Password2000"); - assertTrue(attributesManager.validatePassword(anotherOne, "Password2000")); - assertFalse(attributesManager.validatePassword(anotherOne, "Password2001")); - assertFalse(attributesManager.validatePassword(anotherOne, "Password2002")); - - // #1 - attributesManager.updatePassword(anotherOne, "Password2002"); - assertTrue(attributesManager.validatePassword(anotherOne, "Password2002")); - assertFalse(attributesManager.validatePassword(anotherOne, "Password2001")); - assertFalse(attributesManager.validatePassword(anotherOne, "wirdPasswordValue")); -// assertFalse(session.getAttributesManager().validatePassword(anotherOne, "Password2000")); - assertFalse(attributesManager.validatePassword(anotherOne, "Password2003")); - - - // #1 - attributesManager.updatePassword(anotherOne, "Password2003"); - assertTrue(attributesManager.validatePassword(anotherOne, "Password2003")); -// assertFalse(session.getAttributesManager().validatePassword(anotherOne, "Password2000")); -// assertFalse(session.getAttributesManager().validatePassword(anotherOne, "Password2002")); - assertFalse(attributesManager.validatePassword(anotherOne, "Password2005")); - assertFalse(attributesManager.validatePassword(anotherOne, "Password2006")); - assertFalse(attributesManager.validatePassword(anotherOne, "Password2007")); - - - // #2 - Credential password = new PasswordCredential("SuperPassword2345"); - attributesManager.updateCredential(anotherOne, password); - assertTrue(attributesManager.validateCredentials(anotherOne, new Credential[]{password})); - - // #3 - } - - if (attributesManager.isCredentialTypeSupported(BinaryCredential.TYPE)) - { - // 500 kilobytes - byte[] cert = new byte[512000]; - random.nextBytes(cert); - Credential binaryCredential = new BinaryCredential(cert); - attributesManager.updateCredential(anotherOne, binaryCredential); - assertTrue(attributesManager.validateCredentials(anotherOne, new Credential[]{binaryCredential})); - } - - persistenceManager.createUser("!(06_13_07 Sche) !(0"); - - User u1 = persistenceManager.findUser("!(06_13_07 Sche) !(0"); - - assertNotNull(u1);*/ - - - commit(); - } - - - public void begin() - {} - - public void commit() - {} -} \ No newline at end of file Deleted: idm/branches/2.0.0/picketlink-idm-core/src/test/resources/configs/memory-config.xml =================================================================== --- idm/branches/2.0.0/picketlink-idm-core/src/test/resources/configs/memory-config.xml 2011-02-23 21:23:57 UTC (rev 776) +++ idm/branches/2.0.0/picketlink-idm-core/src/test/resources/configs/memory-config.xml 2011-02-25 19:12:09 UTC (rev 777) @@ -1,125 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_ga" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd"> - <realms> - <realm> - <id>realm://memory</id> - <repository-id-ref>Memory based repo</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - </realms> - <repositories> - <repository> - <id>Memory based repo</id> - <class>org.picketlink.idm.impl.store.memory.MemoryIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>MemoryStore</default-identity-store-id> - <default-attribute-store-id>MemoryStore</default-attribute-store-id> -  -  -  -  -  -  -  - </repository> - </repositories> - <stores> - <attribute-stores/> - <identity-stores> - <identity-store> - <id>MemoryStore</id> - <class>org.picketlink.idm.impl.store.memory.MemoryIdentityStore</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>USER</name> - <relationships/> - <credentials> - <credential-type>PASSWORD</credential-type> - <credential-type>BINARY</credential-type> - </credentials> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>GROUP</name> - <relationships/> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>ORGANIZATION</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>USER</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ROLE</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>GROUP</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>ROLE</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>USER</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - </supported-identity-object-types> - <options> -  -  -  -  - <option> - <name>hibernateSessionFactoryJNDIName</name> - <value>java:/jbossidentity/HibernateStoreSessionFactory</value> - </option> - <option> - <name>populateRelationshipTypes</name> - <value>true</value> - </option> - <option> - <name>populateIdentityObjectTypes</name> - <value>true</value> - </option> - <option> - <name>isRealmAware</name> - <value>false</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </identity-store> - </identity-stores> - </stores> -</jboss-identity> \ No newline at end of file Added: idm/branches/2.0.0/picketlink-idm-memory/pom.xml =================================================================== --- idm/branches/2.0.0/picketlink-idm-memory/pom.xml (rev 0) +++ idm/branches/2.0.0/picketlink-idm-memory/pom.xml 2011-02-25 19:12:09 UTC (rev 777) @@ -0,0 +1,73 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>picketlink-idm-memory</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>PicketLink IDM Hibernate</name> + <url>http://labs.jboss.org/portal/jbosssecurity/</url> + <description>PicketLink IDM Memory Based Identity Store Module</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + + <dependencies> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <systemProperties> + <property> + <name>dataSourceName</name> + <value>${dataSourceName}</value> + </property> + <property> + <name>directoryName</name> + <value>${directoryName}</value> + </property> + </systemProperties> + </configuration> + </plugin> + + </plugins> + </build> + + +</project> Added: idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityObjectRelationship.java =================================================================== --- idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityObjectRelationship.java (rev 0) +++ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityObjectRelationship.java 2011-02-25 19:12:09 UTC (rev 777) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.idm.impl.store.memory; + +import org.picketlink.idm.spi.model.IdentityObject; +import org.picketlink.idm.spi.model.IdentityObjectRelationship; +import org.picketlink.idm.spi.model.IdentityObjectRelationshipType; + +/** + * A {@link IdentityObjectRelationship} for use in the + * {@link MemoryIdentityStore} + * @author Anil.Saldhana(a)redhat.com + * @since Feb 14, 2011 + */ +public class MemoryIdentityObjectRelationship implements IdentityObjectRelationship +{ + private String name; + private IdentityObjectRelationshipType type; + private IdentityObject to; + private IdentityObject from; + + public MemoryIdentityObjectRelationship( String name, IdentityObjectRelationshipType type, + IdentityObject from, IdentityObject to ) + { + this.name = name; + this.type = type; + this.to = to; + this.from = from; + } + + public String getName() + { + return name; + } + + public IdentityObjectRelationshipType getType() + { + return type; + } + + public IdentityObject getFromIdentityObject() + { + return from; + } + + public IdentityObject getToIdentityObject() + { + return to; + } +} \ No newline at end of file Added: idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStore.java =================================================================== --- idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStore.java (rev 0) +++ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStore.java 2011-02-25 19:12:09 UTC (rev 777) @@ -0,0 +1,529 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.idm.impl.store.memory; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import org.picketlink.idm.common.exception.IdentityException; +import org.picketlink.idm.impl.types.SimpleIdentityObject; +import org.picketlink.idm.spi.configuration.IdentityStoreConfigurationContext; +import org.picketlink.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData; +import org.picketlink.idm.spi.exception.OperationNotSupportedException; +import org.picketlink.idm.spi.model.IdentityObject; +import org.picketlink.idm.spi.model.IdentityObjectAttribute; +import org.picketlink.idm.spi.model.IdentityObjectCredential; +import org.picketlink.idm.spi.model.IdentityObjectCredentialType; +import org.picketlink.idm.spi.model.IdentityObjectRelationship; +import org.picketlink.idm.spi.model.IdentityObjectRelationshipType; +import org.picketlink.idm.spi.model.IdentityObjectType; +import org.picketlink.idm.spi.model.IdentityObjectType.TYPE; +import org.picketlink.idm.spi.search.IdentityObjectSearchCriteria; +import org.picketlink.idm.spi.store.FeaturesMetaData; +import org.picketlink.idm.spi.store.IdentityObjectSearchCriteriaType; +import org.picketlink.idm.spi.store.IdentityStore; +import org.picketlink.idm.spi.store.IdentityStoreInvocationContext; +import org.picketlink.idm.spi.store.IdentityStoreSession; + +/** + * An implementation of {@link IdentityStore} that resides in memory + * @author Anil.Saldhana(a)redhat.com + * @since Feb 14, 2011 + */ +public class MemoryIdentityStore implements IdentityStore, Serializable +{ + private static final long serialVersionUID = 1L; + private String id; + + protected Map<String,IdentityObject> users = new HashMap<String,IdentityObject>(); + + protected Map<String, IdentityObject> roles = new HashMap<String,IdentityObject>(); + protected Map<String, IdentityObject> groups = new HashMap<String,IdentityObject>(); + + protected Map<String, Set<IdentityObjectAttribute>> attributes = new HashMap<String, Set<IdentityObjectAttribute>>(); + /** + * General hashmap that is keyed by relationship name. + */ + protected Map<String, List<IdentityObjectRelationship>> relationships = new HashMap<String, List<IdentityObjectRelationship>>(); + + protected Set<String> relationshipNames = new TreeSet<String>(); + + public MemoryIdentityStore( String id ) + { + this.id = id; + } + + public Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext invocationContext, + IdentityObjectType identityType) throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public Map<String, IdentityObjectAttributeMetaData> getAttributesMetaData( + IdentityStoreInvocationContext invocationContext, IdentityObjectType identityType) + { + throw new RuntimeException( "NYI" ); + } + + public Map<String, IdentityObjectAttribute> getAttributes(IdentityStoreInvocationContext invocationContext, + IdentityObject identity) throws IdentityException + { + Map<String, IdentityObjectAttribute> map = new HashMap<String, IdentityObjectAttribute>(); + + Set<IdentityObjectAttribute> attrs = attributes.get( identity.getName()); + if( attrs != null ) + { + for( IdentityObjectAttribute ioa: attrs ) + { + map.put(ioa.getName(), ioa ); + } + } + return map; + } + + public IdentityObjectAttribute getAttribute(IdentityStoreInvocationContext invocationContext, + IdentityObject identity, String name) throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public void updateAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, + IdentityObjectAttribute[] attributes) throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public void addAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, + IdentityObjectAttribute[] attributes) throws IdentityException + { + Set<IdentityObjectAttribute> set = this.attributes.get( identity.getName() ); + if( set == null) + { + set = new HashSet<IdentityObjectAttribute>(); + this.attributes.put( identity.getName(), set ); + } + set.addAll( Arrays.asList( attributes )); + } + + public void removeAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, + String[] attributeNames) throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public IdentityObject findIdentityObjectByUniqueAttribute(IdentityStoreInvocationContext invocationCtx, + IdentityObjectType identityObjectType, IdentityObjectAttribute attribute) throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public IdentityStoreSession createIdentityStoreSession() throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public IdentityStoreSession createIdentityStoreSession(Map<String, Object> sessionOptions) throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public void bootstrap(IdentityStoreConfigurationContext configurationContext) throws IdentityException + { + } + + public String getId() + { + return id; + } + + public FeaturesMetaData getSupportedFeatures() + { + return new FeaturesMetaData() + { + public boolean isSearchCriteriaTypeSupported(IdentityObjectType identityObjectType, + IdentityObjectSearchCriteriaType storeSearchConstraint) + { + return true; + } + + public boolean isRoleNameSearchCriteriaTypeSupported(IdentityObjectSearchCriteriaType constraint) + { + return true; + } + + public boolean isRelationshipTypeSupported(IdentityObjectType fromType, IdentityObjectType toType, + IdentityObjectRelationshipType relationshipType) throws IdentityException + { + return true; + } + + public boolean isRelationshipPropertiesSupported() + { + return true; + } + + public boolean isRelationshipNameAddRemoveSupported() + { + return true; + } + + public boolean isNamedRelationshipsSupported() + { + return true; + } + + public boolean isIdentityObjectTypeSupported(IdentityObjectType identityObjectType) + { + return true; + } + + public boolean isIdentityObjectAddRemoveSupported(IdentityObjectType objectType) + { + return true; + } + + public boolean isCredentialSupported(IdentityObjectType identityObjectType, + IdentityObjectCredentialType credentialType) + { + return true; + } + + public Set<String> getSupportedRelationshipTypes() + { + return null; + } + + public Set<String> getSupportedIdentityObjectTypes() + { + return null; + } + }; + } + + public IdentityObject createIdentityObject(IdentityStoreInvocationContext invocationCtx, String name, + IdentityObjectType identityObjectType) throws IdentityException + { + if( identityObjectType == null ) + throw new IllegalArgumentException( "Identity Object Type is null" ); + + IdentityObject io = null; + + String identityObjectTypeName = identityObjectType.getName(); + + TYPE type = identityObjectType.getType(); + + if( type == TYPE.GROUP ) + { + io = groups.get(identityObjectTypeName); + if( io == null ) + { + io = new SimpleIdentityObject( name, identityObjectType ); + groups.put(name, io); + } + } + else if( type == TYPE.USER ) + { + io = users.get(identityObjectTypeName); + if( io ==null) + { + io = new SimpleIdentityObject( name, identityObjectType ); + users.put( name, io ); + } + } + else + { + io = roles.get(identityObjectTypeName); + if( io == null ) + { + io = new SimpleIdentityObject( name, identityObjectType ); + roles.put(identityObjectTypeName, io); + } + } + /*if( identityObjectTypeName.equals( "ORGANIZATION" ) || identityObjectTypeName.equals( "DIVISION" ) + || identityObjectTypeName.equals( "DEPARTMENT") || identityObjectTypeName.equals( "ORGANIZATION_UNIT") + || identityObjectTypeName.equals( "PROJECT" ) || identityObjectTypeName.equals( "PEOPLE" )) + { + io = generalBucket.get(name); + + if( io == null ) + { + io = new SimpleIdentityObject( name, identityObjectType ); + generalBucket.put(name, io); + } + } + else if( identityObjectTypeName.equals( "USER" )) + { + io = users.get( name ); + if( io == null ) + { + io = new SimpleIdentityObject( name, identityObjectType ); + users.put(name, io ); + } + } + else + throw new RuntimeException( "Unknown type : " + identityObjectTypeName );*/ + return io; + } + + public IdentityObject createIdentityObject(IdentityStoreInvocationContext invocationCtx, String name, + IdentityObjectType identityObjectType, Map<String, String[]> attributes) throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public void removeIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObject identity) + throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public int getIdentityObjectsCount(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityType) + throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationContext, String name, + IdentityObjectType identityObjectType) throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationContext, String id) + throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, + IdentityObjectType identityType, IdentityObjectSearchCriteria criteria) throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCxt, + IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException + { + Collection<IdentityObject> result = new HashSet<IdentityObject>(); + + String relationshipName = relationshipType.getName(); + List<IdentityObjectRelationship> rels = relationships.get(relationshipName); + if( rels != null ) + { + for( IdentityObjectRelationship rel: rels ) + { + String identityName = identity.getName(); + IdentityObject from = rel.getFromIdentityObject(); + IdentityObject to = rel.getToIdentityObject(); + + if( from.getName().equals(identityName) || to.getName().equals(identityName) ) + { + result.add( from ); + result.add( to); + } + } + } + + /*TYPE type = identity.getIdentityType().getType(); + if( type == TYPE.GROUP ) + { + IdentityObject io = groups.get( identity.getName() ); + System.out.println( io ); + + } + throw new RuntimeException( "NYI" );*/ + return result; + } + + public IdentityObjectRelationship createRelationship(IdentityStoreInvocationContext invocationCxt, + IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType, + String relationshipName, boolean createNames) throws IdentityException + { + String relationshipTypeName = relationshipType.getName(); + + List<IdentityObjectRelationship> rels; + + IdentityObjectRelationship ior = new MemoryIdentityObjectRelationship(relationshipName, + relationshipType, fromIdentity, toIdentity); + + if( ! relationships.containsKey(relationshipTypeName) ) + { + rels = new ArrayList<IdentityObjectRelationship>(); + rels.add(ior); + relationships.put(relationshipTypeName, rels ); + } + else + { + rels = relationships.get(relationshipTypeName); + rels.add(ior); + } + return ior; + } + + public void removeRelationship(IdentityStoreInvocationContext invocationCxt, IdentityObject fromIdentity, + IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType, String relationshipName) + throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public void removeRelationships(IdentityStoreInvocationContext invocationCtx, IdentityObject identity1, + IdentityObject identity2, boolean named) throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext invocationCxt, + IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType) + throws IdentityException + { + Set<IdentityObjectRelationship> set = new HashSet<IdentityObjectRelationship>(); + + String relationshipTypeName = relationshipType.getName(); + List<IdentityObjectRelationship> rels = relationships.get(relationshipTypeName); + if( rels != null ) + { + for( IdentityObjectRelationship ior : rels ) + { + IdentityObject iroFrom = ior.getFromIdentityObject(); + IdentityObject iroTo = ior.getToIdentityObject(); + if( iroFrom.getName().equals( fromIdentity.getName() ) && iroTo.getName().equals( toIdentity.getName() ) ) + set.add(ior); + } + } + return set; + } + + public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext invocationCxt, + IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, boolean named, + String name) throws IdentityException + { + throw new RuntimeException( "NYI" ); + } + + public String createRelationshipName(IdentityStoreInvocationContext ctx, String name) throws IdentityException, + OperationNotSupportedException + { + relationshipNames.add(name); + return name; + } + + public String removeRelationshipName(IdentityStoreInvocationContext ctx, String name) throws IdentityException, + OperationNotSupportedException + { + throw new RuntimeException( "NYI" ); + } + + public Map<String, String> getRelationshipNameProperties(IdentityStoreInvocationContext ctx, String name) + throws IdentityException, OperationNotSupportedException + { + throw new RuntimeException( "NYI" ); + } + + public void setRelationshipNameProperties(IdentityStoreInvocationContext ctx, String name, + Map<String, String> properties) throws IdentityException, OperationNotSupportedException + { + throw new RuntimeException( "NYI" ); + } + + public void removeRelationshipNameProperties(IdentityStoreInvocationContext ctx, String name, Set<String> properties) + throws IdentityException, OperationNotSupportedException + { + throw new RuntimeException( "NYI" ); + } + + public Map<String, String> getRelationshipProperties(IdentityStoreInvocationContext ctx, + IdentityObjectRelationship relationship) throws IdentityException, OperationNotSupportedException + { + throw new RuntimeException( "NYI" ); + } + + public void setRelationshipProperties(IdentityStoreInvocationContext ctx, IdentityObjectRelationship relationship, + Map<String, String> properties) throws IdentityException, OperationNotSupportedException + { + throw new RuntimeException( "NYI" ); + } + + public void removeRelationshipProperties(IdentityStoreInvocationContext ctx, + IdentityObjectRelationship relationship, Set<String> properties) throws IdentityException, + OperationNotSupportedException + { + throw new RuntimeException( "NYI" ); + } + + public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObjectSearchCriteria criteria) + throws IdentityException, OperationNotSupportedException + { + return Collections.unmodifiableSet( relationshipNames ); + } + + public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, + IdentityObjectSearchCriteria criteria) throws IdentityException, OperationNotSupportedException + { + Set<String> result = new TreeSet<String>(); + + String identityName = identity.getName(); + + if( identityName == null ) + throw new IllegalStateException( "Identity Name null" ); + + Set<String> keys = relationships.keySet(); + for( String key : keys ) + { + List<IdentityObjectRelationship> iors = relationships.get(key); + for( IdentityObjectRelationship ior: iors ) + { + if( ior.getName() == null ) + continue; + + String fromID = ior.getFromIdentityObject().getName(); + String toID = ior.getToIdentityObject().getName(); + + if( fromID.equals( identityName) || toID.equals( identityName )) + result.add(ior.getName()); + } + } + return result; + } + + public boolean validateCredential(IdentityStoreInvocationContext ctx, IdentityObject identityObject, + IdentityObjectCredential credential) throws IdentityException + { + return false; + } + + public void updateCredential(IdentityStoreInvocationContext ctx, IdentityObject identityObject, + IdentityObjectCredential credential) throws IdentityException + { + throw new RuntimeException( "NYI" ); + } +} \ No newline at end of file Added: idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreRepository.java =================================================================== --- idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreRepository.java (rev 0) +++ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreRepository.java 2011-02-25 19:12:09 UTC (rev 777) @@ -0,0 +1,378 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.idm.impl.store.memory; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.picketlink.idm.common.exception.IdentityException; +import org.picketlink.idm.core.factories.IdentityFactory; +import org.picketlink.idm.spi.configuration.IdentityRepositoryConfigurationContext; +import org.picketlink.idm.spi.configuration.IdentityStoreConfigurationContext; +import org.picketlink.idm.spi.configuration.metadata.IdentityConfigurationMetaData; +import org.picketlink.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData; +import org.picketlink.idm.spi.configuration.metadata.IdentityRepositoryConfigurationMetaData; +import org.picketlink.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData; +import org.picketlink.idm.spi.exception.OperationNotSupportedException; +import org.picketlink.idm.spi.model.IdentityObject; +import org.picketlink.idm.spi.model.IdentityObjectAttribute; +import org.picketlink.idm.spi.model.IdentityObjectCredential; +import org.picketlink.idm.spi.model.IdentityObjectRelationship; +import org.picketlink.idm.spi.model.IdentityObjectRelationshipType; +import org.picketlink.idm.spi.model.IdentityObjectType; +import org.picketlink.idm.spi.repository.IdentityStoreRepository; +import org.picketlink.idm.spi.search.IdentityObjectSearchCriteria; +import org.picketlink.idm.spi.store.AttributeStore; +import org.picketlink.idm.spi.store.FeaturesMetaData; +import org.picketlink.idm.spi.store.IdentityObjectSearchCriteriaType; +import org.picketlink.idm.spi.store.IdentityStore; +import org.picketlink.idm.spi.store.IdentityStoreInvocationContext; +import org.picketlink.idm.spi.store.IdentityStoreSession; + +/** + * A {@link IdentityStoreRepository} that resides in memory + * @author Anil.Saldhana(a)redhat.com + * @since Feb 14, 2011 + */ +public class MemoryIdentityStoreRepository implements IdentityStoreRepository +{ + private static final long serialVersionUID = 1L; + + protected String id = null; + + protected IdentityStore store; + + protected IdentityConfigurationMetaData md; + + protected IdentityRepositoryConfigurationMetaData repoMD = null; + + protected IdentityStoreConfigurationMetaData storeMD = null; + + private static Set<IdentityObjectSearchCriteriaType> supportedIdentityObjectSearchCriteria = + new HashSet<IdentityObjectSearchCriteriaType>(); + + private static Set<String> supportedCredentialTypes = new HashSet<String>(); + + public static final String CREDENTIAL_TYPE_PASSWORD = "PASSWORD"; + + public static final String CREDENTIAL_TYPE_BINARY = "BINARY"; + + static { + // List all supported criteria classes + + supportedIdentityObjectSearchCriteria.add(IdentityObjectSearchCriteriaType.ATTRIBUTE_FILTER); + supportedIdentityObjectSearchCriteria.add(IdentityObjectSearchCriteriaType.NAME_FILTER); + supportedIdentityObjectSearchCriteria.add(IdentityObjectSearchCriteriaType.PAGE); + supportedIdentityObjectSearchCriteria.add(IdentityObjectSearchCriteriaType.SORT); + + // credential types supported by this impl + supportedCredentialTypes.add(CREDENTIAL_TYPE_PASSWORD); + supportedCredentialTypes.add(CREDENTIAL_TYPE_BINARY); + + } + + + public MemoryIdentityStoreRepository( String id ) + { + this.id = id; + store = new MemoryIdentityStore(id); + } + + public String getId() + { + return id; + } + + public FeaturesMetaData getSupportedFeatures() + { + return store.getSupportedFeatures(); + } + + public IdentityObject createIdentityObject(IdentityStoreInvocationContext invocationCtx, String name, + IdentityObjectType identityObjectType) throws IdentityException + { + return store.createIdentityObject(invocationCtx, name, identityObjectType); + } + + public IdentityObject createIdentityObject(IdentityStoreInvocationContext invocationCtx, String name, + IdentityObjectType identityObjectType, Map<String, String[]> attributes) throws IdentityException + { + return store.createIdentityObject(invocationCtx, name, identityObjectType, attributes ); + } + + public void removeIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObject identity) + throws IdentityException + { + store.removeIdentityObject(invocationCtx, identity); + } + + public int getIdentityObjectsCount(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityType) + throws IdentityException + { + return store.getIdentityObjectsCount(invocationCtx, identityType); + } + + public IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationContext, String name, + IdentityObjectType identityObjectType) throws IdentityException + { + return store.findIdentityObject(invocationContext, name, identityObjectType ); + } + + public IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationContext, String id) + throws IdentityException + { + return store.findIdentityObject(invocationContext, id); + } + + public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, + IdentityObjectType identityType, IdentityObjectSearchCriteria criteria) throws IdentityException + { + return store.findIdentityObject(invocationCtx, identityType, criteria); + } + + public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCxt, + IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException + { + return store.findIdentityObject(invocationCxt, identity, relationshipType, parent, criteria); + } + + public IdentityObjectRelationship createRelationship(IdentityStoreInvocationContext invocationCxt, + IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType, + String relationshipName, boolean createNames) throws IdentityException + { + return store.createRelationship(invocationCxt, fromIdentity, toIdentity, relationshipType, relationshipName, createNames); + } + + public void removeRelationship(IdentityStoreInvocationContext invocationCxt, IdentityObject fromIdentity, + IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType, String relationshipName) + throws IdentityException + { + store.removeRelationship(invocationCxt, fromIdentity, toIdentity, relationshipType, relationshipName); + } + + public void removeRelationships(IdentityStoreInvocationContext invocationCtx, IdentityObject identity1, + IdentityObject identity2, boolean named) throws IdentityException + { + store.removeRelationships(invocationCtx, identity1, identity2, named); + } + + public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext invocationCxt, + IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType) + throws IdentityException + { + return store.resolveRelationships(invocationCxt, fromIdentity, toIdentity, relationshipType); + } + + public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext invocationCxt, + IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, boolean named, + String name) throws IdentityException + { + return store.resolveRelationships(invocationCxt, identity, relationshipType, parent, named, name ); + } + + public String createRelationshipName(IdentityStoreInvocationContext ctx, String name) throws IdentityException, + OperationNotSupportedException + { + return store.createRelationshipName(ctx, name); + } + + public String removeRelationshipName(IdentityStoreInvocationContext ctx, String name) throws IdentityException, + OperationNotSupportedException + { + return store.removeRelationshipName(ctx, name); + } + + public Map<String, String> getRelationshipNameProperties(IdentityStoreInvocationContext ctx, String name) + throws IdentityException, OperationNotSupportedException + { + return store.getRelationshipNameProperties(ctx, name); + } + + public void setRelationshipNameProperties(IdentityStoreInvocationContext ctx, String name, + Map<String, String> properties) throws IdentityException, OperationNotSupportedException + { + store.setRelationshipNameProperties(ctx, name, properties); + } + + public void removeRelationshipNameProperties(IdentityStoreInvocationContext ctx, String name, Set<String> properties) + throws IdentityException, OperationNotSupportedException + { + store.removeRelationshipNameProperties(ctx, name, properties); + } + + public Map<String, String> getRelationshipProperties(IdentityStoreInvocationContext ctx, + IdentityObjectRelationship relationship) throws IdentityException, OperationNotSupportedException + { + throw new RuntimeException( "NYI" ); + } + + public void setRelationshipProperties(IdentityStoreInvocationContext ctx, IdentityObjectRelationship relationship, + Map<String, String> properties) throws IdentityException, OperationNotSupportedException + { + + + } + + public void removeRelationshipProperties(IdentityStoreInvocationContext ctx, + IdentityObjectRelationship relationship, Set<String> properties) throws IdentityException, + OperationNotSupportedException + { + } + + public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObjectSearchCriteria criteria) + throws IdentityException, OperationNotSupportedException + { + + throw new RuntimeException( "NYI" ); + } + + public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, + IdentityObjectSearchCriteria criteria) throws IdentityException, OperationNotSupportedException + { + return store.getRelationshipNames(ctx, identity, criteria); + } + + public boolean validateCredential(IdentityStoreInvocationContext ctx, IdentityObject identityObject, + IdentityObjectCredential credential) throws IdentityException + { + return false; + } + + public void updateCredential(IdentityStoreInvocationContext ctx, IdentityObject identityObject, + IdentityObjectCredential credential) throws IdentityException + { + } + + public Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext invocationContext, + IdentityObjectType identityType) throws IdentityException + { + + throw new RuntimeException( "NYI" ); + } + + public Map<String, IdentityObjectAttributeMetaData> getAttributesMetaData( + IdentityStoreInvocationContext invocationContext, IdentityObjectType identityType) + { + + throw new RuntimeException( "NYI" ); + } + + public Map<String, IdentityObjectAttribute> getAttributes(IdentityStoreInvocationContext invocationContext, + IdentityObject identity) throws IdentityException + { + return store.getAttributes( invocationContext, identity); + } + + public IdentityObjectAttribute getAttribute(IdentityStoreInvocationContext invocationContext, + IdentityObject identity, String name) throws IdentityException + { + + throw new RuntimeException( "NYI" ); + } + + public void updateAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, + IdentityObjectAttribute[] attributes) throws IdentityException + { + } + + public void addAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, + IdentityObjectAttribute[] attributes) throws IdentityException + { + store.addAttributes( invocationCtx, identity, attributes); + } + + public void removeAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, + String[] attributeNames) throws IdentityException + { + store.removeAttributes(invocationCtx, identity, attributeNames); + } + + public IdentityObject findIdentityObjectByUniqueAttribute(IdentityStoreInvocationContext invocationCtx, + IdentityObjectType identityObjectType, IdentityObjectAttribute attribute) throws IdentityException + { + return store.findIdentityObjectByUniqueAttribute(invocationCtx, identityObjectType, attribute); + } + + public IdentityStoreSession createIdentityStoreSession() throws IdentityException + { + return store.createIdentityStoreSession(); + } + + public IdentityStoreSession createIdentityStoreSession(Map<String, Object> sessionOptions) throws IdentityException + { + return new MemoryIdentityStoreSession(); + } + + public void bootstrap(IdentityRepositoryConfigurationContext configurationContext, + Map<String, IdentityStore> bootstrappedIdentityStores, Map<String, AttributeStore> bootstrappedAttributeStores) + throws IdentityException + { + repoMD = configurationContext.getRepositoryConfigurationMetaData(); + storeMD = configurationContext.getConfigurationMetaData().getIdentityStores().get(0); + } + + + public void bootstrap(IdentityStoreConfigurationContext configurationContext) throws IdentityException + { + storeMD = configurationContext.getStoreConfigurationMetaData(); + } + + public Set<IdentityStore> getConfiguredIdentityStores() + { + + throw new RuntimeException( "NYI" ); + } + + public Set<AttributeStore> getConfiguredAttributeStores() + { + + throw new RuntimeException( "NYI" ); + } + + public Map<String, IdentityStore> getIdentityStoreMappings() + { + + throw new RuntimeException( "NYI" ); + } + + public Map<String, AttributeStore> getAttributeStoreMappings() + { + + throw new RuntimeException( "NYI" ); + } + + public IdentityStore getIdentityStore(IdentityObjectType identityObjectType) throws IdentityException + { + + throw new RuntimeException( "NYI" ); + } + + public AttributeStore getAttributeStore(IdentityObjectType identityObjectType) throws IdentityException + { + + throw new RuntimeException( "NYI" ); + } +} \ No newline at end of file Added: idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreSession.java =================================================================== --- idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreSession.java (rev 0) +++ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreSession.java 2011-02-25 19:12:09 UTC (rev 777) @@ -0,0 +1,88 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.idm.impl.store.memory; + +import org.picketlink.idm.api.IdentitySession; +import org.picketlink.idm.common.exception.IdentityException; +import org.picketlink.idm.spi.store.IdentityStoreSession; + +/** + * A {@link IdentitySession} for memory + * @author Anil.Saldhana(a)redhat.com + * @since Feb 14, 2011 + */ +public class MemoryIdentityStoreSession implements IdentityStoreSession +{ + + public Object getSessionContext() throws IdentityException + { + return null; + } + + public void close() throws IdentityException + { + } + + public void save() throws IdentityException + { + } + + public void clear() throws IdentityException + { + } + + public boolean isOpen() + { + + return false; + } + + public boolean isTransactionSupported() + { + + return false; + } + + public void startTransaction() + { + + + } + + public void commitTransaction() + { + + + } + + public void rollbackTransaction() + { + + + } + + public boolean isTransactionActive() + { + + return false; + } +} \ No newline at end of file Added: idm/branches/2.0.0/picketlink-idm-memory/src/test/java/org/picketlink/test/idm/api/model/CorporateModelUnitTestCase.java =================================================================== --- idm/branches/2.0.0/picketlink-idm-memory/src/test/java/org/picketlink/test/idm/api/model/CorporateModelUnitTestCase.java (rev 0) +++ idm/branches/2.0.0/picketlink-idm-memory/src/test/java/org/picketlink/test/idm/api/model/CorporateModelUnitTestCase.java 2011-02-25 19:12:09 UTC (rev 777) @@ -0,0 +1,454 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.test.idm.api.model; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.Collection; +import java.util.Map; + +import org.junit.Test; +import org.picketlink.idm.api.Attribute; +import org.picketlink.idm.api.AttributesManager; +import org.picketlink.idm.api.Group; +import org.picketlink.idm.api.IdentitySession; +import org.picketlink.idm.api.IdentitySessionFactory; +import org.picketlink.idm.api.PersistenceManager; +import org.picketlink.idm.api.RelationshipManager; +import org.picketlink.idm.api.RoleManager; +import org.picketlink.idm.api.RoleType; +import org.picketlink.idm.api.User; +import org.picketlink.idm.api.cfg.IdentityConfiguration; +import org.picketlink.idm.common.p3p.P3PConstants; +import org.picketlink.idm.core.factories.IdentityFactory; +import org.picketlink.idm.impl.api.SimpleAttribute; + +/** + * Unit test a typical corporate model + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @author Anil.Saldhana(a)redhat.com + * @since Feb 14, 2011 + */ +public class CorporateModelUnitTestCase +{ + private String sampleOrganizationRealmName = "realm://memory"; + + String configFileName = "configs/memory-config.xml"; + + + @Test + public void testModel() throws Exception + { + IdentityConfiguration config = IdentityFactory.createConfiguration( configFileName ); + assertNotNull( config ); + IdentitySessionFactory sessionFactory = config.buildIdentitySessionFactory(); + assertNotNull( sessionFactory ); + + // GroupType + + String ORGANIZATION = "ORGANIZATION"; + String ORGANIZATION_UNIT = "ORGANIZATION_UNIT"; + String DIVISION = "DIVISION"; + String DEPARTMENT = "DEPARTMENT"; + String PROJECT = "PROJECT"; + String PEOPLE = "PEOPLE"; + + + IdentitySession session = sessionFactory .createIdentitySession( sampleOrganizationRealmName ); + + + begin(); + + // Organization structure + + PersistenceManager persistenceManager = session.getPersistenceManager(); + Group rhOrg = persistenceManager.createGroup("RedHat", ORGANIZATION); + + Group jbossDivision = persistenceManager.createGroup("JBoss", DIVISION); + Group rhelDivision = persistenceManager.createGroup("RHEL", DIVISION); + + RelationshipManager relationshipManager = session.getRelationshipManager(); + relationshipManager.associateGroups(rhOrg, jbossDivision); + relationshipManager.associateGroups(rhOrg, rhelDivision); + + Group itDepartment = persistenceManager.createGroup("IT", DEPARTMENT); + Group hrDepartment = persistenceManager.createGroup("HR", DEPARTMENT); + + relationshipManager.associateGroups(jbossDivision, itDepartment); + relationshipManager.associateGroups(jbossDivision, hrDepartment); + + Group rndDepartment = persistenceManager.createGroup("RnD", DEPARTMENT); + + relationshipManager.associateGroups(itDepartment, rndDepartment); + + Group projectsOU = persistenceManager.createGroup("Projects", ORGANIZATION_UNIT); + Group commonFrameworksOU = persistenceManager.createGroup("Common Frameworks", ORGANIZATION_UNIT); + + relationshipManager.associateGroups(rndDepartment, projectsOU); + + // Projects + + Group portalProject = persistenceManager.createGroup("Portal", PROJECT); + Group soaProject = persistenceManager.createGroup("SOA", PROJECT); + Group jbpmProject = persistenceManager.createGroup("jBPM", PROJECT); + Group seamProject = persistenceManager.createGroup("Seam", PROJECT); + Group asProject = persistenceManager.createGroup("AS", PROJECT); + Group securityProject = persistenceManager.createGroup("Security", PROJECT); + + relationshipManager.associateGroups(projectsOU, portalProject); + relationshipManager.associateGroups(projectsOU, soaProject); + relationshipManager.associateGroups(projectsOU, jbpmProject); + relationshipManager.associateGroups(projectsOU, asProject); + relationshipManager.associateGroups(projectsOU, seamProject); + + // Check... + assertTrue(relationshipManager.isAssociated(projectsOU, portalProject)); + assertTrue(relationshipManager.isAssociated(projectsOU, soaProject)); + assertTrue(relationshipManager.isAssociated(projectsOU, jbpmProject)); + assertTrue(relationshipManager.isAssociated(projectsOU, asProject)); + assertTrue(relationshipManager.isAssociated(projectsOU, seamProject)); + + // Portal is part of common frameworks + relationshipManager.associateGroups(commonFrameworksOU, portalProject); + + // People + + Group employeesGroup = persistenceManager.createGroup("Employees", PEOPLE); + + // Management + + User theuteUser = persistenceManager.createUser("theute"); + User mlittleUser = persistenceManager.createUser("mlittle"); + User bgeorgesUser = persistenceManager.createUser("bgeorges"); + User asaldhanaUser = persistenceManager.createUser("asaldhana"); + User janderseUser = persistenceManager.createUser("janderse"); + + // Portal Team + + User bdawidowUser = persistenceManager.createUser("bdawidow"); + User claprunUser = persistenceManager.createUser("claprun"); + User whalesUser = persistenceManager.createUser("whales"); + User sshahUser = persistenceManager.createUser("sshah"); + User mwringeUser = persistenceManager.createUser("mwringe"); + + // Store as employees + + relationshipManager.associateUser(employeesGroup, theuteUser); + relationshipManager.associateUser(employeesGroup, mlittleUser); + relationshipManager.associateUser(employeesGroup, asaldhanaUser); + relationshipManager.associateUser(employeesGroup, bdawidowUser); + relationshipManager.associateUser(employeesGroup, claprunUser); + relationshipManager.associateUser(employeesGroup, whalesUser); + relationshipManager.associateUser(employeesGroup, sshahUser); + relationshipManager.associateUser(employeesGroup, mwringeUser); + + // Portal team for management purposes + + Group portalTeamGroup = persistenceManager.createGroup("Portal Team", PEOPLE); + relationshipManager.associateUser(portalTeamGroup, bdawidowUser); + relationshipManager.associateUser(portalTeamGroup, claprunUser); + relationshipManager.associateUser(portalTeamGroup, whalesUser); + relationshipManager.associateUser(portalTeamGroup, sshahUser); + relationshipManager.associateUser(portalTeamGroup, mwringeUser); + + // Portal team is under common frameworks + + relationshipManager.associateGroups(commonFrameworksOU, portalTeamGroup); + + // Role Types + + RoleManager roleManager = session.getRoleManager(); + RoleType developerRT = roleManager.createRoleType("Developer"); + RoleType managerRT = roleManager.createRoleType("Manager"); + RoleType leadDeveloperRT = roleManager.createRoleType("Lead Developer"); + RoleType productManagerRT = roleManager.createRoleType("Product Manager"); + + // Assign roles + + // Common frameworks manager + + roleManager.createRole(managerRT, bgeorgesUser, commonFrameworksOU); + + // Portal developers + + roleManager.createRole(developerRT, theuteUser, portalProject); + roleManager.createRole(developerRT, bdawidowUser, portalProject); + roleManager.createRole(developerRT, claprunUser, portalProject); + roleManager.createRole(developerRT, whalesUser, portalProject); + roleManager.createRole(developerRT, sshahUser, portalProject); + roleManager.createRole(developerRT, mwringeUser, portalProject); + + // Portal management + roleManager.createRole(leadDeveloperRT, theuteUser, portalProject); + roleManager.createRole(managerRT, theuteUser, portalTeamGroup); + roleManager.createRole(productManagerRT, janderseUser, portalProject); + + // SOA + + roleManager.createRole(developerRT, mlittleUser, portalProject); + roleManager.createRole(productManagerRT, mlittleUser, portalProject); + + // AS & Security + + roleManager.createRole(developerRT, asaldhanaUser, asProject); + roleManager.createRole(developerRT, asaldhanaUser, securityProject); + roleManager.createRole(leadDeveloperRT, asaldhanaUser, securityProject); + + + // Check what RoleTypes has user theute + Collection<RoleType> roleTypes = roleManager.findUserRoleTypes(theuteUser); + assertEquals(3, roleTypes.size()); + assertTrue(roleTypes.contains(developerRT)); + assertTrue(roleTypes.contains(leadDeveloperRT)); + assertTrue(roleTypes.contains(managerRT)); + assertFalse(roleTypes.contains(productManagerRT)); + + assertTrue(roleManager.hasRole(theuteUser, portalProject, developerRT)); + assertTrue(roleManager.hasRole(theuteUser, portalProject, leadDeveloperRT)); + assertTrue(roleManager.hasRole(theuteUser, portalTeamGroup, managerRT)); + + // Check where anil is Lead Developer and where Developer + + roleTypes = roleManager.findUserRoleTypes(asaldhanaUser); + assertEquals(2, roleTypes.size()); + assertTrue(roleTypes.contains(developerRT)); + assertTrue(roleTypes.contains(leadDeveloperRT)); + + roleTypes = roleManager.findRoleTypes(asaldhanaUser, securityProject); + assertEquals(2, roleTypes.size()); + assertTrue(roleTypes.contains(leadDeveloperRT)); + + roleTypes = roleManager.findRoleTypes(asaldhanaUser, asProject); + assertEquals(1, roleTypes.size()); + assertTrue(roleTypes.contains(developerRT)); + + // and simpler... + assertTrue(roleManager.hasRole(asaldhanaUser, asProject, developerRT)); + + // Assert relationships + + Collection<User> identities = relationshipManager.findAssociatedUsers(portalTeamGroup, false); + assertEquals(5, identities.size()); + assertTrue(identities.contains(claprunUser)); + assertTrue(identities.contains(mwringeUser)); + assertTrue(identities.contains(sshahUser)); + assertTrue(identities.contains(whalesUser)); + assertTrue(identities.contains(bdawidowUser)); + + Collection<Group> groups = relationshipManager.findAssociatedGroups(rndDepartment, PROJECT, true, false); + assertEquals(0, groups.size()); + + // Check to which group Anil belongs + groups = relationshipManager.findAssociatedGroups(asaldhanaUser, PEOPLE); + assertEquals(1, groups.size()); + assertTrue(groups.contains(employeesGroup)); + + // Now check sshah + groups = relationshipManager.findAssociatedGroups(sshahUser, PEOPLE); + assertEquals(2, groups.size()); + assertTrue(groups.contains(employeesGroup)); + assertTrue(groups.contains(portalTeamGroup)); + + + + + // User attributes + Attribute[] userInfo = new Attribute[] + { + new SimpleAttribute(P3PConstants.INFO_USER_NAME_GIVEN, new String[]{"Boleslaw"}), + new SimpleAttribute(P3PConstants.INFO_USER_NAME_FAMILY, new String[]{"Dawidowicz"}), + //new SimpleAttribute("picture", new byte[][]{picture}), + new SimpleAttribute("email", new String[]{"bd(a)example.com"}) + }; + + AttributesManager attributesManager = session.getAttributesManager(); + attributesManager.addAttributes(bdawidowUser, userInfo); + + Map<String, Attribute> attributes = attributesManager.getAttributes(bdawidowUser); + assertEquals(3, attributes.keySet().size()); + assertEquals("Dawidowicz", (attributes.get(P3PConstants.INFO_USER_NAME_FAMILY)).getValue()); + + /* // Check readOnly attribute change + userInfo = new Attribute[] + { + new SimpleAttribute("description", new String[]{"some description"}) + }; + + attributesManager.addAttributes(bdawidowUser, userInfo); + attributesManager.updateAttributes(bdawidowUser, userInfo); + + attributes = attributesManager.getAttributes(bdawidowUser); + assertEquals(3, attributes.keySet().size()); + assertEquals(null, (attributes.get("description"))); + + // Generate random binary data for binary attribute + Random random = new Random(); + + // Check that binary attribute picture is mapped + AttributeDescription attributeDescription = attributesManager.getAttributeDescription(bdawidowUser, "picture"); + + if (attributeDescription != null && attributeDescription.getType().equals("binary")) + { + + // 900 kilobytes + byte[] picture = new byte[921600]; + random.nextBytes(picture); + + userInfo = new Attribute[] + { + new SimpleAttribute("picture", new byte[][]{picture}), + }; + + + attributesManager.addAttributes(bdawidowUser, userInfo); + + attributes = attributesManager.getAttributes(bdawidowUser); + assertEquals(4, attributes.keySet().size()); + assertEquals("Dawidowicz", (attributes.get(P3PConstants.INFO_USER_NAME_FAMILY)).getValue()); + assertTrue(Arrays.equals((byte[])attributes.get("picture").getValue(), picture)); + + // Update + + // 500 kilobytes + picture = new byte[50600]; + random.nextBytes(picture); + + userInfo = new Attribute[] + { + new SimpleAttribute("picture", new byte[][]{picture}), + }; + + + attributesManager.updateAttributes(bdawidowUser, userInfo); + + attributes = attributesManager.getAttributes(bdawidowUser); + assertEquals(4, attributes.keySet().size()); + assertTrue(Arrays.equals((byte[])attributes.get("picture").getValue(), picture)); + } + + + // Find user by email + assertNull(attributesManager.findUserByUniqueAttribute("email", "toto")); + User user = attributesManager.findUserByUniqueAttribute("email", "bd(a)example.com"); + assertEquals(bdawidowUser, user); + + + // If email is configured as unique it should not be possible to set same value for different user + + attributeDescription = attributesManager.getAttributeDescription(bdawidowUser, "email"); + + if (attributeDescription != null && attributeDescription.isUnique()) + { + + + // check if same unique email can be used for other user + try + { + userInfo = new Attribute[] + { + new SimpleAttribute("email", new String[]{"bd(a)example.com"}) + }; + + attributesManager.addAttributes(theuteUser, userInfo); + fail(); + } + catch (IdentityException e) + { + // expected + } + } + + + + // Credential + User anotherOne = bdawidowUser; //session.getPersistenceManager().createUser("blah1"); + + if (attributesManager.isCredentialTypeSupported(PasswordCredential.TYPE)) + { + + // There is a known issue that on some LDAP servers (MSAD at least) old password can + // still be used for some time together with the new one. Because of this testsuite cannot + // assert previously set password values + + // #1 + attributesManager.updatePassword(anotherOne, "Password2000"); + assertTrue(attributesManager.validatePassword(anotherOne, "Password2000")); + assertFalse(attributesManager.validatePassword(anotherOne, "Password2001")); + assertFalse(attributesManager.validatePassword(anotherOne, "Password2002")); + + // #1 + attributesManager.updatePassword(anotherOne, "Password2002"); + assertTrue(attributesManager.validatePassword(anotherOne, "Password2002")); + assertFalse(attributesManager.validatePassword(anotherOne, "Password2001")); + assertFalse(attributesManager.validatePassword(anotherOne, "wirdPasswordValue")); +// assertFalse(session.getAttributesManager().validatePassword(anotherOne, "Password2000")); + assertFalse(attributesManager.validatePassword(anotherOne, "Password2003")); + + + // #1 + attributesManager.updatePassword(anotherOne, "Password2003"); + assertTrue(attributesManager.validatePassword(anotherOne, "Password2003")); +// assertFalse(session.getAttributesManager().validatePassword(anotherOne, "Password2000")); +// assertFalse(session.getAttributesManager().validatePassword(anotherOne, "Password2002")); + assertFalse(attributesManager.validatePassword(anotherOne, "Password2005")); + assertFalse(attributesManager.validatePassword(anotherOne, "Password2006")); + assertFalse(attributesManager.validatePassword(anotherOne, "Password2007")); + + + // #2 + Credential password = new PasswordCredential("SuperPassword2345"); + attributesManager.updateCredential(anotherOne, password); + assertTrue(attributesManager.validateCredentials(anotherOne, new Credential[]{password})); + + // #3 + } + + if (attributesManager.isCredentialTypeSupported(BinaryCredential.TYPE)) + { + // 500 kilobytes + byte[] cert = new byte[512000]; + random.nextBytes(cert); + Credential binaryCredential = new BinaryCredential(cert); + attributesManager.updateCredential(anotherOne, binaryCredential); + assertTrue(attributesManager.validateCredentials(anotherOne, new Credential[]{binaryCredential})); + } + + persistenceManager.createUser("!(06_13_07 Sche) !(0"); + + User u1 = persistenceManager.findUser("!(06_13_07 Sche) !(0"); + + assertNotNull(u1);*/ + + + commit(); + } + + + public void begin() + {} + + public void commit() + {} +} \ No newline at end of file Added: idm/branches/2.0.0/picketlink-idm-memory/src/test/resources/configs/memory-config.xml =================================================================== --- idm/branches/2.0.0/picketlink-idm-memory/src/test/resources/configs/memory-config.xml (rev 0) +++ idm/branches/2.0.0/picketlink-idm-memory/src/test/resources/configs/memory-config.xml 2011-02-25 19:12:09 UTC (rev 777) @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_ga" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd"> + <realms> + <realm> + <id>realm://memory</id> + <repository-id-ref>Memory based repo</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>Memory based repo</id> + <class>org.picketlink.idm.impl.store.memory.MemoryIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>MemoryStore</default-identity-store-id> + <default-attribute-store-id>MemoryStore</default-attribute-store-id> +  +  +  +  +  +  +  + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>MemoryStore</id> + <class>org.picketlink.idm.impl.store.memory.MemoryIdentityStore</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + <credential-type>BINARY</credential-type> + </credentials> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>GROUP</name> + <relationships/> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>ORGANIZATION</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ROLE</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>GROUP</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>ROLE</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> +  +  +  +  + <option> + <name>hibernateSessionFactoryJNDIName</name> + <value>java:/jbossidentity/HibernateStoreSessionFactory</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>false</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> +</jboss-identity> \ No newline at end of file Modified: idm/branches/2.0.0/pom.xml =================================================================== --- idm/branches/2.0.0/pom.xml 2011-02-23 21:23:57 UTC (rev 776) +++ idm/branches/2.0.0/pom.xml 2011-02-25 19:12:09 UTC (rev 777) @@ -33,6 +33,7 @@ <module>picketlink-idm-spi</module> <module>picketlink-idm-api</module> <module>picketlink-idm-core</module> + <module>picketlink-idm-memory</module> <module>picketlink-idm-docs</module> </modules> </profile>

13 years, 2 months

1
0
0 / 0

Picketlink SVN: r776 - federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-23 16:23:57 -0500 (Wed, 23 Feb 2011) New Revision: 776 Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntityDescriptorType.java Log: correct the ctr chain Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntityDescriptorType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntityDescriptorType.java 2011-02-23 21:00:29 UTC (rev 775) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntityDescriptorType.java 2011-02-23 21:23:57 UTC (rev 776) @@ -89,30 +89,37 @@ private AttributeAuthorityDescriptorType attribDescriptor; private PDPDescriptorType pdpDescriptor; - public EDTDescriptorChoiceType(RoleDescriptorType roleDescriptor) - { - if( roleDescriptor instanceof IDPSSODescriptorType ) + public EDTDescriptorChoiceType(AuthnAuthorityDescriptorType authnDescriptor) + { + this.authnDescriptor = authnDescriptor; + } + + public EDTDescriptorChoiceType(AttributeAuthorityDescriptorType attribDescriptor) + { + this.attribDescriptor = attribDescriptor; + } + + public EDTDescriptorChoiceType(PDPDescriptorType pdpDescriptor) + { + this.pdpDescriptor = pdpDescriptor; + } + + public EDTDescriptorChoiceType( SSODescriptorType sso ) + { + if(sso instanceof IDPSSODescriptorType ) { - this.idpDescriptor = (IDPSSODescriptorType) roleDescriptor; + this.idpDescriptor = (IDPSSODescriptorType) sso; } - else if( roleDescriptor instanceof SPSSODescriptorType ) - { - this.spDescriptor = (SPSSODescriptorType) roleDescriptor; - } - else if( roleDescriptor instanceof AuthnAuthorityDescriptorType ) - { - this.authnDescriptor = (AuthnAuthorityDescriptorType) roleDescriptor; - } - else if( roleDescriptor instanceof AttributeAuthorityDescriptorType ) - { - this.attribDescriptor = (AttributeAuthorityDescriptorType) roleDescriptor; - } - else if( roleDescriptor instanceof PDPDescriptorType ) - { - this.pdpDescriptor = (PDPDescriptorType) roleDescriptor; - } - else this.roleDescriptor = roleDescriptor; + else + this.spDescriptor = (SPSSODescriptorType) sso; } + + public EDTDescriptorChoiceType(RoleDescriptorType roleDescriptor) + { + this.roleDescriptor = roleDescriptor; + } + + public RoleDescriptorType getRoleDescriptor() { return roleDescriptor;

13 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

picketlink-commits February 2011