jboss-identity-commits
October 2009
jboss-identity-commits@lists.jboss.org
- 1 participants
- 83 discussions
JBoss Identity SVN: r845 - authz.
by jboss-identity-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-10-12 11:50:24 -0400 (Mon, 12 Oct 2009)
New Revision: 845
Added:
authz/downloads/
Log:
directory for release downloads
14 years, 6 months
- 1
- 0
JBoss Identity SVN: r844 - in identity-federation/trunk: jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces and 4 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-10-12 11:21:50 -0400 (Mon, 12 Oct 2009)
New Revision: 844
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/BaseHandlerConfig.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerChainConfig.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerConfig.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2MapBasedConfig.java
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerConfig.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2Handler.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerChainConfig.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/HandlerUtil.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/BaseSAML2Handler.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/RolesGenerationHandler.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2IssuerTrustHandler.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java
Log:
JBID-198: saml2 handler arch
Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/BaseHandlerConfig.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/BaseHandlerConfig.java (rev 0)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/BaseHandlerConfig.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -0,0 +1,60 @@
+/*
+ * 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.jboss.identity.federation.core.saml.v2.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChainConfig;
+
+/**
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 12, 2009
+ */
+public class BaseHandlerConfig
+{
+ protected Map<String, Object> params = new HashMap<String, Object>();
+
+ /**
+ * Does the config contain the key?
+ * @param key
+ * @return
+ */
+ public boolean containsKey(String key)
+ {
+ return params.containsKey(key);
+ }
+
+ /**
+ * @see SAML2HandlerChainConfig#getParameter(String)
+ */
+ public Object getParameter(String parameterName)
+ {
+ return params.get(parameterName);
+ }
+
+
+ public void set(Map<String, Object> options)
+ {
+ this.params.putAll(options);
+ }
+}
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerChainConfig.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerChainConfig.java (rev 0)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerChainConfig.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -0,0 +1,40 @@
+/*
+ * 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.jboss.identity.federation.core.saml.v2.impl;
+
+import java.util.Map;
+
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChainConfig;
+
+/**
+ * Default implementation of the handler config
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 10, 2009
+ */
+public class DefaultSAML2HandlerChainConfig extends BaseHandlerConfig
+implements SAML2HandlerChainConfig
+{
+ public DefaultSAML2HandlerChainConfig(Map<String,Object> map)
+ {
+ this.params = map;
+ }
+}
\ No newline at end of file
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerConfig.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerConfig.java 2009-10-11 14:08:59 UTC (rev 843)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerConfig.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -21,30 +21,14 @@
*/
package org.jboss.identity.federation.core.saml.v2.impl;
-import java.util.HashMap;
-import java.util.Map;
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerConfig;
-import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChainConfig;
-
/**
- * Default implementation of the handler config
+ * Default implementation of the {@code SAML2HandlerConfig}
* @author Anil.Saldhana(a)redhat.com
- * @since Oct 10, 2009
+ * @since Oct 12, 2009
*/
-public class DefaultSAML2HandlerConfig implements SAML2HandlerChainConfig
-{
- private Map<String, Object> params = new HashMap<String, Object>();
-
- public DefaultSAML2HandlerConfig(Map<String,Object> map)
- {
- this.params = map;
- }
-
- /**
- * @see SAML2HandlerChainConfig#getParameter(String)
- */
- public Object getParameter(String parameterName)
- {
- return params.get(parameterName);
- }
-}
\ No newline at end of file
+public class DefaultSAML2HandlerConfig extends BaseHandlerConfig
+implements SAML2HandlerConfig
+{
+}
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2Handler.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2Handler.java 2009-10-11 14:08:59 UTC (rev 843)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2Handler.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -21,8 +21,6 @@
*/
package org.jboss.identity.federation.core.saml.v2.interfaces;
-import java.util.Map;
-
import org.jboss.identity.federation.core.exceptions.ProcessingException;
/**
@@ -36,13 +34,13 @@
* Initialize the handler
* @param handlerConfig Handler Config
*/
- void init(SAML2HandlerChainConfig handlerConfig);
+ void initChainConfig(SAML2HandlerChainConfig handlerChainConfig);
/**
* Initialize the handler from configuration
* @param options
*/
- void init(Map<String,Object> options);
+ void initHandlerConfig(SAML2HandlerConfig handlerConfig);
/**
* Generate a SAML Request to be sent to the IDP
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerChainConfig.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerChainConfig.java 2009-10-11 14:08:59 UTC (rev 843)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerChainConfig.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -21,17 +21,12 @@
*/
package org.jboss.identity.federation.core.saml.v2.interfaces;
+
/**
* Configuration passed to the handler chain
* @author Anil.Saldhana(a)redhat.com
* @since Oct 10, 2009
*/
-public interface SAML2HandlerChainConfig
+public interface SAML2HandlerChainConfig extends SAML2MapBasedConfig
{
- /**
- * Get a parameter from the chain config
- * @param parameterName
- * @return
- */
- public Object getParameter(String parameterName);
}
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerConfig.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerConfig.java (rev 0)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerConfig.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -0,0 +1,32 @@
+/*
+ * 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.jboss.identity.federation.core.saml.v2.interfaces;
+
+
+/**
+ * Configuration passed to the handler
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 10, 2009
+ */
+public interface SAML2HandlerConfig extends SAML2MapBasedConfig
+{
+}
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2MapBasedConfig.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2MapBasedConfig.java (rev 0)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2MapBasedConfig.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -0,0 +1,51 @@
+/*
+ * 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.jboss.identity.federation.core.saml.v2.interfaces;
+
+import java.util.Map;
+
+/**
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 12, 2009
+ */
+public interface SAML2MapBasedConfig
+{
+ /**
+ * Does the config contain the key?
+ * @param key
+ * @return
+ */
+ boolean containsKey(String key);
+
+ /**
+ * Get a parameter from the chain config
+ * @param parameterName
+ * @return
+ */
+ public Object getParameter(String parameterName);
+
+ /**
+ * Set the options
+ * @param options
+ */
+ void set(Map<String,Object> options);
+}
\ No newline at end of file
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/HandlerUtil.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/HandlerUtil.java 2009-10-11 14:08:59 UTC (rev 843)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/HandlerUtil.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -31,7 +31,9 @@
import org.jboss.identity.federation.core.exceptions.ConfigurationException;
import org.jboss.identity.federation.core.handler.config.Handler;
import org.jboss.identity.federation.core.handler.config.Handlers;
+import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerConfig;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2Handler;
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerConfig;
/**
* Deals with SAML2 Handlers
@@ -67,7 +69,10 @@
{
mapOptions.put(kvtype.getKey(), kvtype.getValue());
}
- samlhandler.init(mapOptions);
+ SAML2HandlerConfig handlerConfig = new DefaultSAML2HandlerConfig();
+ handlerConfig.set(mapOptions);
+
+ samlhandler.initHandlerConfig(handlerConfig);
handlerSet.add(samlhandler);
}
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-10-11 14:08:59 UTC (rev 843)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -74,7 +74,7 @@
import org.jboss.identity.federation.core.saml.v2.holders.DestinationInfoHolder;
import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChain;
-import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerConfig;
+import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChainConfig;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerRequest;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerResponse;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2Handler;
@@ -392,12 +392,12 @@
Map<String, Object> configOptions = new HashMap<String, Object>();
configOptions.put(GeneralConstants.CONFIGURATION, spConfiguration);
- SAML2HandlerChainConfig handlerConfig = new DefaultSAML2HandlerConfig(configOptions);
+ SAML2HandlerChainConfig handlerConfig = new DefaultSAML2HandlerChainConfig(configOptions);
Set<SAML2Handler> samlHandlers = chain.handlers();
for(SAML2Handler handler: samlHandlers)
{
- handler.init(handlerConfig);
+ handler.initChainConfig(handlerConfig);
}
}
catch(Exception e)
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/BaseSAML2Handler.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/BaseSAML2Handler.java 2009-10-11 14:08:59 UTC (rev 843)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/BaseSAML2Handler.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -21,15 +21,15 @@
*/
package org.jboss.identity.federation.web.handlers.saml2;
-import java.util.Map;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.jboss.identity.federation.core.exceptions.ProcessingException;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2Handler;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChainConfig;
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerConfig;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest;
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse;
import org.jboss.identity.federation.web.core.HTTPContext;
/**
@@ -39,25 +39,35 @@
*/
public abstract class BaseSAML2Handler implements SAML2Handler
{
- protected Map<String, Object> options;
+ protected SAML2HandlerConfig handlerConfig = null;
+ protected SAML2HandlerChainConfig handlerChainConfig = null;
/**
* Initialize the handler
* @param options
*/
- public void init(Map<String, Object> options)
+ public void initHandlerConfig(SAML2HandlerConfig handlerConfig)
{
- this.options = options;
+ this.handlerConfig = handlerConfig;
}
- public void init(SAML2HandlerChainConfig handlerConfig)
- {
+ public void initChainConfig(SAML2HandlerChainConfig handlerChainConfig)
+ {
+ this.handlerChainConfig = handlerChainConfig;
}
public void reset() throws ProcessingException
{
}
+ /**
+ * @see SAML2Handler#generateSAMLRequest(SAML2HandlerRequest, SAML2HandlerResponse)
+ */
+ public void generateSAMLRequest(SAML2HandlerRequest request, SAML2HandlerResponse response)
+ throws ProcessingException
+ {
+ }
+
public static HttpServletRequest getHttpRequest(SAML2HandlerRequest request)
{
HTTPContext context = (HTTPContext) request.getContext();
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/RolesGenerationHandler.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/RolesGenerationHandler.java 2009-10-11 14:08:59 UTC (rev 843)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/RolesGenerationHandler.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -23,12 +23,12 @@
import java.security.Principal;
import java.util.List;
-import java.util.Map;
import javax.servlet.http.HttpSession;
import org.jboss.identity.federation.core.exceptions.ProcessingException;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChainConfig;
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerConfig;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse;
import org.jboss.identity.federation.saml.v2.protocol.LogoutRequestType;
@@ -43,21 +43,23 @@
*/
public class RolesGenerationHandler extends BaseSAML2Handler
{
+
@SuppressWarnings("unused")
private transient RoleGenerator rg = null;
- public void init(SAML2HandlerChainConfig handlerConfig)
+ public void initChainConfig(SAML2HandlerChainConfig handlerConfig)
{
rg = (RoleGenerator) handlerConfig.getParameter(GeneralConstants.ROLE_GENERATOR);
}
@Override
- public void init(Map<String, Object> options)
+ public void initHandlerConfig(SAML2HandlerConfig handlerConfig)
{
- super.init(options);
- if(options.containsKey(GeneralConstants.ROLE_GENERATOR))
+ super.initHandlerConfig(handlerConfig);
+
+ if(this.handlerConfig.containsKey(GeneralConstants.ROLE_GENERATOR))
{
- String clazzName = (String) options.get(GeneralConstants.ROLE_GENERATOR);
+ String clazzName = (String) this.handlerConfig.getParameter(GeneralConstants.ROLE_GENERATOR);
ClassLoader tcl = SecurityActions.getContextClassLoader();
try
{
@@ -102,9 +104,4 @@
throws ProcessingException
{
}
-
- public void generateSAMLRequest(SAML2HandlerRequest request, SAML2HandlerResponse response)
- throws ProcessingException
- {
- }
-}
+}
\ No newline at end of file
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2009-10-11 14:08:59 UTC (rev 843)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -359,9 +359,12 @@
return userName;
}
};
+ //Validate the roles
+ IRoleValidator roleValidator =
+ (IRoleValidator) handlerChainConfig.getParameter(GeneralConstants.ROLE_VALIDATOR);
+ if(roleValidator == null)
+ throw new ProcessingException("Role Validator not provided");
- //Validate the roles
- IRoleValidator roleValidator = (IRoleValidator) options.get(GeneralConstants.ROLE_VALIDATOR);
boolean validRole = roleValidator.userInRole(principal, roles);
if(!validRole)
{
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2IssuerTrustHandler.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2IssuerTrustHandler.java 2009-10-11 14:08:59 UTC (rev 843)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2IssuerTrustHandler.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -48,12 +48,6 @@
private boolean trace = log.isTraceEnabled();
private IDPTrustHandler idp = new IDPTrustHandler();
private SPTrustHandler sp = new SPTrustHandler();
-
- public void generateSAMLRequest(SAML2HandlerRequest request, SAML2HandlerResponse response)
- throws ProcessingException
- {
- //Nothing to do here
- }
public void handleRequestType(SAML2HandlerRequest request, SAML2HandlerResponse response) throws ProcessingException
{
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-11 14:08:59 UTC (rev 843)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-12 15:21:50 UTC (rev 844)
@@ -58,7 +58,7 @@
import org.jboss.identity.federation.core.saml.v2.exceptions.IssuerNotTrustedException;
import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChain;
-import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerConfig;
+import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChainConfig;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerRequest;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerResponse;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2Handler;
@@ -155,12 +155,12 @@
Map<String, Object> configOptions = new HashMap<String, Object>();
configOptions.put(GeneralConstants.ROLE_GENERATOR, rg);
- SAML2HandlerChainConfig handlerConfig = new DefaultSAML2HandlerConfig(configOptions);
+ SAML2HandlerChainConfig handlerConfig = new DefaultSAML2HandlerChainConfig(configOptions);
Set<SAML2Handler> samlHandlers = chain.handlers();
for(SAML2Handler handler: samlHandlers)
{
- handler.init(handlerConfig);
+ handler.initChainConfig(handlerConfig);
}
}
14 years, 6 months
- 1
- 0
JBoss Identity SVN: r843 - in authz/tags/1.0.alpha1: agent and 10 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-10-11 10:08:59 -0400 (Sun, 11 Oct 2009)
New Revision: 843
Modified:
authz/tags/1.0.alpha1/agent/pom.xml
authz/tags/1.0.alpha1/common/pom.xml
authz/tags/1.0.alpha1/component-spec/pom.xml
authz/tags/1.0.alpha1/core-components/pom.xml
authz/tags/1.0.alpha1/documentation/pom.xml
authz/tags/1.0.alpha1/documentation/reference-guide/pom.xml
authz/tags/1.0.alpha1/http-profile/pom.xml
authz/tags/1.0.alpha1/policy-server/pom.xml
authz/tags/1.0.alpha1/pom.xml
authz/tags/1.0.alpha1/portal-profile/pom.xml
authz/tags/1.0.alpha1/samples/pom.xml
authz/tags/1.0.alpha1/samples/secure-pojo/pom.xml
Log:
tagging maven version from trunk-SNAPSHOT to 1.0.alpha1
Modified: authz/tags/1.0.alpha1/agent/pom.xml
===================================================================
--- authz/tags/1.0.alpha1/agent/pom.xml 2009-10-11 13:37:23 UTC (rev 842)
+++ authz/tags/1.0.alpha1/agent/pom.xml 2009-10-11 14:08:59 UTC (rev 843)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.security.authz</groupId>
<artifactId>jboss-authz-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: authz/tags/1.0.alpha1/common/pom.xml
===================================================================
--- authz/tags/1.0.alpha1/common/pom.xml 2009-10-11 13:37:23 UTC (rev 842)
+++ authz/tags/1.0.alpha1/common/pom.xml 2009-10-11 14:08:59 UTC (rev 843)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.security.authz</groupId>
<artifactId>jboss-authz-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: authz/tags/1.0.alpha1/component-spec/pom.xml
===================================================================
--- authz/tags/1.0.alpha1/component-spec/pom.xml 2009-10-11 13:37:23 UTC (rev 842)
+++ authz/tags/1.0.alpha1/component-spec/pom.xml 2009-10-11 14:08:59 UTC (rev 843)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.security.authz</groupId>
<artifactId>jboss-authz-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: authz/tags/1.0.alpha1/core-components/pom.xml
===================================================================
--- authz/tags/1.0.alpha1/core-components/pom.xml 2009-10-11 13:37:23 UTC (rev 842)
+++ authz/tags/1.0.alpha1/core-components/pom.xml 2009-10-11 14:08:59 UTC (rev 843)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.security.authz</groupId>
<artifactId>jboss-authz-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: authz/tags/1.0.alpha1/documentation/pom.xml
===================================================================
--- authz/tags/1.0.alpha1/documentation/pom.xml 2009-10-11 13:37:23 UTC (rev 842)
+++ authz/tags/1.0.alpha1/documentation/pom.xml 2009-10-11 14:08:59 UTC (rev 843)
@@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.security.authz</groupId>
<artifactId>jboss-authz-documentation-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<packaging>pom</packaging>
<name>JBoss Authorization Documentation</name>
<url>http://www.jboss.org</url>
Modified: authz/tags/1.0.alpha1/documentation/reference-guide/pom.xml
===================================================================
--- authz/tags/1.0.alpha1/documentation/reference-guide/pom.xml 2009-10-11 13:37:23 UTC (rev 842)
+++ authz/tags/1.0.alpha1/documentation/reference-guide/pom.xml 2009-10-11 14:08:59 UTC (rev 843)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.security.authz</groupId>
<artifactId>jboss-authz-documentation-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -12,7 +12,7 @@
<groupId>org.jboss.security.authz</groupId>
<artifactId>reference-guide</artifactId>
<name>Reference_Guide</name>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<packaging>jdocbook</packaging>
<build>
Modified: authz/tags/1.0.alpha1/http-profile/pom.xml
===================================================================
--- authz/tags/1.0.alpha1/http-profile/pom.xml 2009-10-11 13:37:23 UTC (rev 842)
+++ authz/tags/1.0.alpha1/http-profile/pom.xml 2009-10-11 14:08:59 UTC (rev 843)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.security.authz</groupId>
<artifactId>jboss-authz-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: authz/tags/1.0.alpha1/policy-server/pom.xml
===================================================================
--- authz/tags/1.0.alpha1/policy-server/pom.xml 2009-10-11 13:37:23 UTC (rev 842)
+++ authz/tags/1.0.alpha1/policy-server/pom.xml 2009-10-11 14:08:59 UTC (rev 843)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.security.authz</groupId>
<artifactId>jboss-authz-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: authz/tags/1.0.alpha1/pom.xml
===================================================================
--- authz/tags/1.0.alpha1/pom.xml 2009-10-11 13:37:23 UTC (rev 842)
+++ authz/tags/1.0.alpha1/pom.xml 2009-10-11 14:08:59 UTC (rev 843)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.security.authz</groupId>
<artifactId>jboss-authz-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<packaging>pom</packaging>
<name>JBoss Authorization</name>
<url>http://www.jboss.org</url>
Modified: authz/tags/1.0.alpha1/portal-profile/pom.xml
===================================================================
--- authz/tags/1.0.alpha1/portal-profile/pom.xml 2009-10-11 13:37:23 UTC (rev 842)
+++ authz/tags/1.0.alpha1/portal-profile/pom.xml 2009-10-11 14:08:59 UTC (rev 843)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.security.authz</groupId>
<artifactId>jboss-authz-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: authz/tags/1.0.alpha1/samples/pom.xml
===================================================================
--- authz/tags/1.0.alpha1/samples/pom.xml 2009-10-11 13:37:23 UTC (rev 842)
+++ authz/tags/1.0.alpha1/samples/pom.xml 2009-10-11 14:08:59 UTC (rev 843)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.security.authz</groupId>
<artifactId>jboss-authz-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: authz/tags/1.0.alpha1/samples/secure-pojo/pom.xml
===================================================================
--- authz/tags/1.0.alpha1/samples/secure-pojo/pom.xml 2009-10-11 13:37:23 UTC (rev 842)
+++ authz/tags/1.0.alpha1/samples/secure-pojo/pom.xml 2009-10-11 14:08:59 UTC (rev 843)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.security.authz</groupId>
<artifactId>samples</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.alpha1</version>
<relativePath>../pom.xml</relativePath>
</parent>
14 years, 6 months
- 1
- 0
JBoss Identity SVN: r842 - authz/tags.
by jboss-identity-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-10-11 09:37:23 -0400 (Sun, 11 Oct 2009)
New Revision: 842
Added:
authz/tags/1.0.alpha1/
Log:
tagging alpha1 release
Copied: authz/tags/1.0.alpha1 (from rev 841, authz/trunk)
14 years, 6 months
- 1
- 0
JBoss Identity SVN: r841 - authz.
by jboss-identity-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-10-11 09:35:25 -0400 (Sun, 11 Oct 2009)
New Revision: 841
Added:
authz/branches/
Log:
14 years, 6 months
- 1
- 0
JBoss Identity SVN: r840 - authz.
by jboss-identity-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-10-11 09:34:56 -0400 (Sun, 11 Oct 2009)
New Revision: 840
Added:
authz/tags/
Log:
14 years, 6 months
- 1
- 0
JBoss Identity SVN: r839 - authz/trunk/assemble.
by jboss-identity-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-10-11 09:22:15 -0400 (Sun, 11 Oct 2009)
New Revision: 839
Added:
authz/trunk/assemble/lgpl.txt
authz/trunk/assemble/project.info
authz/trunk/assemble/readme.txt
Log:
build stuff to get alpha ready to ship
Added: authz/trunk/assemble/lgpl.txt
===================================================================
--- authz/trunk/assemble/lgpl.txt (rev 0)
+++ authz/trunk/assemble/lgpl.txt 2009-10-11 13:22:15 UTC (rev 839)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library 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 library 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 library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
Added: authz/trunk/assemble/project.info
===================================================================
--- authz/trunk/assemble/project.info (rev 0)
+++ authz/trunk/assemble/project.info 2009-10-11 13:22:15 UTC (rev 839)
@@ -0,0 +1,15 @@
+Website: http://jboss.org/jbossidentity/
+
+Wiki: http://www.jboss.org/community/wiki/JBossIdentity
+
+User Forum: http://www.jboss.org/index.html?module=bb&op=viewforum&f=305
+
+Developer Forum: http://www.jboss.org/index.html?module=bb&op=viewforum&f=284
+
+Issue Tracker: https://jira.jboss.org/jira/browse/JBID
+
+Anonymous SVN: http://anonsvn.jboss.org/repos/jbossidentity/authz/
+
+Committer SVN: https://svn.jboss.org/repos/jbossidentity/authz/
+
+Blog: http://authz.blogspot.com/
\ No newline at end of file
Added: authz/trunk/assemble/readme.txt
===================================================================
--- authz/trunk/assemble/readme.txt (rev 0)
+++ authz/trunk/assemble/readme.txt 2009-10-11 13:22:15 UTC (rev 839)
@@ -0,0 +1,28 @@
+
+JBoss Authz - Rule based Authorization for Java Security
+=================================================================
+version 1.0.alpha1, Oct 2009
+
+This software is distributed under the terms of the FSF Lesser Gnu
+Public License (see lgpl.txt).
+
+Get Up And Running Quick
+------------------------
+
+1. Go to src/samples/secure-pojo
+
+2. Run: mvn -Prun-application test
+
+
+Learn more
+----------
+
+* Read the documentation in the "doc/reference" directory
+
+
+Running the samples
+--------------------
+
+* Samples are located under src/samples module
+
+* Command to run each sample under its respective directory: mvn -Prun-application test
\ No newline at end of file
14 years, 6 months
- 1
- 0
JBoss Identity SVN: r838 - in identity-federation/trunk: jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces and 3 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-10-11 00:52:57 -0400 (Sun, 11 Oct 2009)
New Revision: 838
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerConfig.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerChainConfig.java
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2Handler.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/BaseSAML2Handler.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/RolesGenerationHandler.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2IssuerTrustHandler.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java
Log:
JBID-198: saml2 handler arch
Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerConfig.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerConfig.java (rev 0)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerConfig.java 2009-10-11 04:52:57 UTC (rev 838)
@@ -0,0 +1,50 @@
+/*
+ * 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.jboss.identity.federation.core.saml.v2.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChainConfig;
+
+/**
+ * Default implementation of the handler config
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 10, 2009
+ */
+public class DefaultSAML2HandlerConfig implements SAML2HandlerChainConfig
+{
+ private Map<String, Object> params = new HashMap<String, Object>();
+
+ public DefaultSAML2HandlerConfig(Map<String,Object> map)
+ {
+ this.params = map;
+ }
+
+ /**
+ * @see SAML2HandlerChainConfig#getParameter(String)
+ */
+ public Object getParameter(String parameterName)
+ {
+ return params.get(parameterName);
+ }
+}
\ No newline at end of file
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2Handler.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2Handler.java 2009-10-10 20:59:55 UTC (rev 837)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2Handler.java 2009-10-11 04:52:57 UTC (rev 838)
@@ -34,6 +34,12 @@
{
/**
* Initialize the handler
+ * @param handlerConfig Handler Config
+ */
+ void init(SAML2HandlerChainConfig handlerConfig);
+
+ /**
+ * Initialize the handler from configuration
* @param options
*/
void init(Map<String,Object> options);
Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerChainConfig.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerChainConfig.java (rev 0)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerChainConfig.java 2009-10-11 04:52:57 UTC (rev 838)
@@ -0,0 +1,37 @@
+/*
+ * 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.jboss.identity.federation.core.saml.v2.interfaces;
+
+/**
+ * Configuration passed to the handler chain
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 10, 2009
+ */
+public interface SAML2HandlerChainConfig
+{
+ /**
+ * Get a parameter from the chain config
+ * @param parameterName
+ * @return
+ */
+ public Object getParameter(String parameterName);
+}
\ No newline at end of file
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-10-10 20:59:55 UTC (rev 837)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-10-11 04:52:57 UTC (rev 838)
@@ -74,10 +74,12 @@
import org.jboss.identity.federation.core.saml.v2.holders.DestinationInfoHolder;
import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChain;
+import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerConfig;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerRequest;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerResponse;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2Handler;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChain;
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChainConfig;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest.GENERATE_REQUEST_TYPE;
@@ -278,10 +280,6 @@
holder.getIssuer(), samlObject,
HANDLER_TYPE.SP);
- Map<String,Object> requestOptions = new HashMap<String,Object>();
- requestOptions.put(GeneralConstants.CONFIGURATION, this.spConfiguration);
- saml2HandlerRequest.setOptions(requestOptions);
-
SAML2HandlerResponse saml2HandlerResponse = new DefaultSAML2HandlerResponse();
//Deal with handler chains
@@ -390,6 +388,17 @@
//Get the handlers
Handlers handlers = ConfigurationUtil.getHandlers(context.getResourceAsStream("/WEB-INF/jbid-handlers.xml"));
chain.addAll(HandlerUtil.getHandlers(handlers));
+
+ Map<String, Object> configOptions = new HashMap<String, Object>();
+ configOptions.put(GeneralConstants.CONFIGURATION, spConfiguration);
+
+ SAML2HandlerChainConfig handlerConfig = new DefaultSAML2HandlerConfig(configOptions);
+ Set<SAML2Handler> samlHandlers = chain.handlers();
+
+ for(SAML2Handler handler: samlHandlers)
+ {
+ handler.init(handlerConfig);
+ }
}
catch(Exception e)
{
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/BaseSAML2Handler.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/BaseSAML2Handler.java 2009-10-10 20:59:55 UTC (rev 837)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/BaseSAML2Handler.java 2009-10-11 04:52:57 UTC (rev 838)
@@ -26,7 +26,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.jboss.identity.federation.core.exceptions.ProcessingException;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2Handler;
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChainConfig;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest;
import org.jboss.identity.federation.web.core.HTTPContext;
@@ -48,7 +50,14 @@
this.options = options;
}
-
+ public void init(SAML2HandlerChainConfig handlerConfig)
+ {
+ }
+
+ public void reset() throws ProcessingException
+ {
+ }
+
public static HttpServletRequest getHttpRequest(SAML2HandlerRequest request)
{
HTTPContext context = (HTTPContext) request.getContext();
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/RolesGenerationHandler.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/RolesGenerationHandler.java 2009-10-10 20:59:55 UTC (rev 837)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/RolesGenerationHandler.java 2009-10-11 04:52:57 UTC (rev 838)
@@ -28,13 +28,13 @@
import javax.servlet.http.HttpSession;
import org.jboss.identity.federation.core.exceptions.ProcessingException;
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChainConfig;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse;
import org.jboss.identity.federation.saml.v2.protocol.LogoutRequestType;
import org.jboss.identity.federation.web.constants.GeneralConstants;
import org.jboss.identity.federation.web.core.HTTPContext;
import org.jboss.identity.federation.web.interfaces.RoleGenerator;
-import org.jboss.identity.federation.web.roles.DefaultRoleGenerator;
/**
* Handles the generation of roles
@@ -43,13 +43,19 @@
*/
public class RolesGenerationHandler extends BaseSAML2Handler
{
- private transient RoleGenerator rg = new DefaultRoleGenerator();
+ @SuppressWarnings("unused")
+ private transient RoleGenerator rg = null;
+
+ public void init(SAML2HandlerChainConfig handlerConfig)
+ {
+ rg = (RoleGenerator) handlerConfig.getParameter(GeneralConstants.ROLE_GENERATOR);
+ }
@Override
public void init(Map<String, Object> options)
{
super.init(options);
- if(options.containsKey("ROLE_GENERATOR"))
+ if(options.containsKey(GeneralConstants.ROLE_GENERATOR))
{
String clazzName = (String) options.get(GeneralConstants.ROLE_GENERATOR);
ClassLoader tcl = SecurityActions.getContextClassLoader();
@@ -99,13 +105,6 @@
public void generateSAMLRequest(SAML2HandlerRequest request, SAML2HandlerResponse response)
throws ProcessingException
- {
- return;
+ {
}
-
- public void reset() throws ProcessingException
- {
- // TODO Auto-generated method stub
-
- }
}
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2009-10-10 20:59:55 UTC (rev 837)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2009-10-11 04:52:57 UTC (rev 838)
@@ -372,10 +372,4 @@
return principal;
}
}
-
- public void reset() throws ProcessingException
- {
- // TODO Auto-generated method stub
-
- }
}
\ No newline at end of file
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2IssuerTrustHandler.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2IssuerTrustHandler.java 2009-10-10 20:59:55 UTC (rev 837)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2IssuerTrustHandler.java 2009-10-11 04:52:57 UTC (rev 838)
@@ -78,11 +78,7 @@
{
sp.handleStatusResponseType(request, response);
}
- }
-
- public void reset() throws ProcessingException
- {
- }
+ }
private class IDPTrustHandler
{
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2009-10-10 20:59:55 UTC (rev 837)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2009-10-11 04:52:57 UTC (rev 838)
@@ -451,11 +451,5 @@
response.setRelayState(relayState);
response.setDestination(logOutRequest.getIssuer().getValue());
}
- }
-
- public void reset() throws ProcessingException
- {
- // TODO Auto-generated method stub
-
- }
+ }
}
\ No newline at end of file
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-10 20:59:55 UTC (rev 837)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-11 04:52:57 UTC (rev 838)
@@ -58,10 +58,12 @@
import org.jboss.identity.federation.core.saml.v2.exceptions.IssuerNotTrustedException;
import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChain;
+import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerConfig;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerRequest;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerResponse;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2Handler;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChain;
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChainConfig;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest.HANDLER_TYPE;
@@ -149,6 +151,18 @@
//Get the handlers
handlers = ConfigurationUtil.getHandlers(context.getResourceAsStream("/WEB-INF/jbid-handlers.xml"));
chain.addAll(HandlerUtil.getHandlers(handlers));
+
+ Map<String, Object> configOptions = new HashMap<String, Object>();
+ configOptions.put(GeneralConstants.ROLE_GENERATOR, rg);
+
+ SAML2HandlerChainConfig handlerConfig = new DefaultSAML2HandlerConfig(configOptions);
+ Set<SAML2Handler> samlHandlers = chain.handlers();
+
+ for(SAML2Handler handler: samlHandlers)
+ {
+ handler.init(handlerConfig);
+ }
+
}
catch (Exception e)
{
@@ -278,10 +292,6 @@
HANDLER_TYPE.IDP);
saml2HandlerRequest.setRelayState(relayState);
- Map<String, Object> requestOptions = new HashMap<String, Object>();
- requestOptions.put("ROLE_GENERATOR", rg);
- saml2HandlerRequest.setOptions(requestOptions);
-
SAML2HandlerResponse saml2HandlerResponse = new DefaultSAML2HandlerResponse();
Set<SAML2Handler> handlers = chain.handlers();
@@ -296,6 +306,7 @@
{
for(SAML2Handler handler: handlers)
{
+ handler.reset();
handler.handleStatusResponseType(saml2HandlerRequest, saml2HandlerResponse);
}
}
14 years, 6 months
- 1
- 0
JBoss Identity SVN: r837 - in authz/trunk: assemble and 1 other directory.
by jboss-identity-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-10-10 16:59:55 -0400 (Sat, 10 Oct 2009)
New Revision: 837
Modified:
authz/trunk/assemble/bin.xml
authz/trunk/assemble/doc.xml
authz/trunk/pom.xml
Log:
build stuff to get alpha ready to ship
Modified: authz/trunk/assemble/bin.xml
===================================================================
--- authz/trunk/assemble/bin.xml 2009-10-10 19:58:52 UTC (rev 836)
+++ authz/trunk/assemble/bin.xml 2009-10-10 20:59:55 UTC (rev 837)
@@ -1,14 +1,10 @@
<assembly>
<id>bin</id>
<formats>
- <format>dir</format>
- <!--
- <format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
- -->
+ <format>dir</format>
</formats>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>lib</baseDirectory>
<moduleSets>
<moduleSet>
<includes>
@@ -18,8 +14,7 @@
<include>org.jboss.security.authz:agent</include>
<include>org.jboss.security.authz:policy-server</include>
</includes>
- <binaries>
- <outputDirectory>/lib</outputDirectory>
+ <binaries>
<unpack>false</unpack>
</binaries>
</moduleSet>
Modified: authz/trunk/assemble/doc.xml
===================================================================
--- authz/trunk/assemble/doc.xml 2009-10-10 19:58:52 UTC (rev 836)
+++ authz/trunk/assemble/doc.xml 2009-10-10 20:59:55 UTC (rev 837)
@@ -3,16 +3,16 @@
<formats>
<format>dir</format>
</formats>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>doc</baseDirectory>
<moduleSets>
<moduleSet>
<includes>
<include>org.jboss.security.authz:reference-guide</include>
</includes>
- <binaries>
- <outputDirectory>/doc</outputDirectory>
+ <binaries>
<unpack>true</unpack>
</binaries>
</moduleSet>
- </moduleSets>
+ </moduleSets>
</assembly>
\ No newline at end of file
Modified: authz/trunk/pom.xml
===================================================================
--- authz/trunk/pom.xml 2009-10-10 19:58:52 UTC (rev 836)
+++ authz/trunk/pom.xml 2009-10-10 20:59:55 UTC (rev 837)
@@ -285,33 +285,10 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>assemble/src.xml</descriptor>
- <!--
- <descriptor>assemble/bin.xml</descriptor>
- <descriptor>assemble/doc.xml</descriptor>
- -->
- </descriptors>
- </configuration>
- </plugin>
+
</plugins>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
+
<!-- Build Profiles -->
<profiles>
<profile>
@@ -323,6 +300,37 @@
<jboss.home>/home/soshah/projects/jboss-portal/jboss-5.0.1.GA</jboss.home>
</properties>
</profile>
+ <profile>
+ <id>release</id>
+ <modules>
+ <module>documentation</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>assemble/src.xml</descriptor>
+ <descriptor>assemble/bin.xml</descriptor>
+ <descriptor>assemble/doc.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
</profiles>
<repositories>
14 years, 6 months
- 1
- 0
JBoss Identity SVN: r836 - in authz/trunk: assemble and 4 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-10-10 15:58:52 -0400 (Sat, 10 Oct 2009)
New Revision: 836
Added:
authz/trunk/assemble/src.xml
authz/trunk/samples/secure-pojo/src/test/java/org/jboss/security/authz/samples/pojo/Application.java
Modified:
authz/trunk/.classpath
authz/trunk/documentation/reference-guide/pom.xml
authz/trunk/policy-server/src/main/resources/META-INF/authz-config.xml
authz/trunk/pom.xml
authz/trunk/samples/secure-pojo/pom.xml
Log:
build stuff to get alpha ready to ship
Modified: authz/trunk/.classpath
===================================================================
--- authz/trunk/.classpath 2009-10-09 22:54:35 UTC (rev 835)
+++ authz/trunk/.classpath 2009-10-10 19:58:52 UTC (rev 836)
@@ -37,8 +37,8 @@
<classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.4/jaxb-impl-2.1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-xjc/2.1.4/jaxb-xjc-2.1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-sunxacml/2.0.3.SP2-SNAPSHOT/jboss-sunxacml-2.0.3.SP2-SNAPSHOT.jar" sourcepath="/M2_REPO/org/jboss/security/jboss-sunxacml/2.0.3.SP2-SNAPSHOT/jboss-sunxacml-2.0.3.SP2-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-xacml/2.0.3.SP2-SNAPSHOT/jboss-xacml-2.0.3.SP2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/jboss-xacml/2.0.3.SP2-SNAPSHOT/jboss-xacml-2.0.3.SP2-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-sunxacml/2.0.5-SNAPSHOT/jboss-sunxacml-2.0.5-SNAPSHOT.jar" sourcepath="/M2_REPO/org/jboss/security/jboss-sunxacml/2.0.5-SNAPSHOT/jboss-sunxacml-2.0.5-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-xacml/2.0.5-SNAPSHOT/jboss-xacml-2.0.5-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/jboss-xacml/2.0.5-SNAPSHOT/jboss-xacml-2.0.5-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
<classpathentry kind="var" path="M2_REPO/org/drools/drools-core/4.0.7/drools-core-4.0.7.jar"/>
<classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/4.0.7/drools-compiler-4.0.7.jar"/>
Added: authz/trunk/assemble/src.xml
===================================================================
--- authz/trunk/assemble/src.xml (rev 0)
+++ authz/trunk/assemble/src.xml 2009-10-10 19:58:52 UTC (rev 836)
@@ -0,0 +1,36 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>src</baseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.security.authz:common</include>
+ <include>org.jboss.security.authz:component-spec</include>
+ <include>org.jboss.security.authz:core-components</include>
+ <include>org.jboss.security.authz:agent</include>
+ <include>org.jboss.security.authz:policy-server</include>
+ <include>org.jboss.security.authz:samples</include>
+ </includes>
+ <sources>
+ <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
+ <fileSets>
+ <fileSet>
+ <excludes>
+ <exclude>target/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
+ </moduleSets>
+ <files>
+ <file>
+ <source>pom.xml</source>
+ </file>
+ </files>
+</assembly>
\ No newline at end of file
Modified: authz/trunk/documentation/reference-guide/pom.xml
===================================================================
--- authz/trunk/documentation/reference-guide/pom.xml 2009-10-09 22:54:35 UTC (rev 835)
+++ authz/trunk/documentation/reference-guide/pom.xml 2009-10-10 19:58:52 UTC (rev 836)
@@ -1,9 +1,6 @@
<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/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.jboss.security.authz</groupId>
<artifactId>jboss-authz-documentation-parent</artifactId>
@@ -11,6 +8,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.security.authz</groupId>
<artifactId>reference-guide</artifactId>
<name>Reference_Guide</name>
Modified: authz/trunk/policy-server/src/main/resources/META-INF/authz-config.xml
===================================================================
--- authz/trunk/policy-server/src/main/resources/META-INF/authz-config.xml 2009-10-09 22:54:35 UTC (rev 835)
+++ authz/trunk/policy-server/src/main/resources/META-INF/authz-config.xml 2009-10-10 19:58:52 UTC (rev 836)
@@ -22,7 +22,7 @@
</bean>
<bean name="/policy-server/PolicyDecisionPoint" class="org.jboss.security.authz.policy.server.decision.PolicyDecisionPoint">
- <property name="debug">true</property>
+ <property name="debug">false</property>
</bean>
<bean name="/policy-server/PolicyStore" class="org.jboss.security.authz.policy.server.provisioning.RelationalDBPolicyStore">
Modified: authz/trunk/pom.xml
===================================================================
--- authz/trunk/pom.xml 2009-10-09 22:54:35 UTC (rev 835)
+++ authz/trunk/pom.xml 2009-10-10 19:58:52 UTC (rev 836)
@@ -15,8 +15,7 @@
<module>core-components</module>
<module>agent</module>
<module>policy-server</module>
- <module>samples</module>
- <module>documentation</module>
+ <module>samples</module>
<!--
<module>http-profile</module>
<module>portal-profile</module>
@@ -290,8 +289,11 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
+ <descriptor>assemble/src.xml</descriptor>
+ <!--
<descriptor>assemble/bin.xml</descriptor>
<descriptor>assemble/doc.xml</descriptor>
+ -->
</descriptors>
</configuration>
</plugin>
Modified: authz/trunk/samples/secure-pojo/pom.xml
===================================================================
--- authz/trunk/samples/secure-pojo/pom.xml 2009-10-09 22:54:35 UTC (rev 835)
+++ authz/trunk/samples/secure-pojo/pom.xml 2009-10-10 19:58:52 UTC (rev 836)
@@ -36,32 +36,7 @@
<groupId>org.jboss.security.authz</groupId>
<artifactId>policy-server</artifactId>
<version>${project.version}</version>
- </dependency>
-
- <!-- test dependencies -->
- <!-- jboss xacml -->
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-xacml</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- jboss microcontainer -->
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- Drools -->
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-compiler</artifactId>
- <scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -90,7 +65,7 @@
</executions>
</plugin>
- <!-- running the tests in AOP environment -->
+ <!-- running the unit tests in AOP environment -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -100,7 +75,31 @@
<useSystemClassLoader>true</useSystemClassLoader>
<argLine>-Djboss.aop.path=src/main/resources/jboss-aop.xml</argLine>
</configuration>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>run-application</id>
+ <build>
+ <!-- running the fully integrated sample pojo application -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <forkMode>always</forkMode>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ <argLine>-Djboss.aop.path=src/main/resources/jboss-aop.xml</argLine>
+ <includes>
+ <include>**/Application.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Added: authz/trunk/samples/secure-pojo/src/test/java/org/jboss/security/authz/samples/pojo/Application.java
===================================================================
--- authz/trunk/samples/secure-pojo/src/test/java/org/jboss/security/authz/samples/pojo/Application.java (rev 0)
+++ authz/trunk/samples/secure-pojo/src/test/java/org/jboss/security/authz/samples/pojo/Application.java 2009-10-10 19:58:52 UTC (rev 836)
@@ -0,0 +1,221 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.security.authz.samples.pojo;
+
+import java.util.Calendar;
+
+import org.apache.log4j.Logger;
+
+import org.jboss.security.authz.samples.pojo.provisioning.SecurityProvisioning;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class Application extends AbstractPOJOTestCase
+{
+ private static Logger log = Logger.getLogger(Application.class);
+
+ private SecurityProvisioning provisioning;
+
+ private Pojo protectedAsset;
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ // Bootup the system with the appropriate Policies
+ provisioning = new SecurityProvisioning();
+ provisioning.bootup(SecurityProvisioning.rbac);
+ }
+
+ public void testRunApp() throws Exception
+ {
+ log.info("Starting Secure POJO Application...............");
+
+ log.info("");
+ log.info("");
+ log.info("");
+
+ //Administrator
+ this.runAsAdmin();
+
+ log.info("");
+ log.info("");
+ log.info("");
+
+ //Subscribed User
+ this.runAsTrustedUser();
+
+ log.info("");
+ log.info("");
+ log.info("");
+
+ this.runAsAnonymous();
+
+ log.info("");
+ log.info("");
+ log.info("");
+
+ log.info("Closing Secure POJO Application...................");
+ }
+
+ private void runAsAdmin()
+ {
+ //Administrator
+ log.info("Logging in as Administrator..............");
+ this.loginAsAdmin();
+
+ //Post the secret
+ this.writeToProtectedAsset("Barack Obama will be given Nobel Peace Prize!!!");
+
+ //Read the secret
+ log.info("Secret of the day is: "+this.readProtectedAsset());
+
+ this.logout();
+ log.info("Logging Out..............................");
+ }
+
+ private void runAsTrustedUser()
+ {
+ //Subscribed User
+ log.info("Logging in as Trusted User..............");
+ this.loginAsUser();
+
+ //Read the secret
+ log.info("Secret of the day is: "+this.readProtectedAsset());
+
+ //Try to update the secret
+ String newSecret = "Wait...I vote for Sarah Palin";
+ log.info("Trying to *modify* the secret.........["+newSecret+"]");
+ try
+ {
+ this.writeToProtectedAsset(newSecret);
+ }
+ catch(Exception e)
+ {
+ if(e instanceof IllegalAccessException)
+ {
+ log.info("Sorry. You cannot *modify* the secret!!!!!");
+ }
+ else
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ this.logout();
+ log.info("Logging Out..............................");
+ }
+
+ private void runAsAnonymous()
+ {
+ //Subscribed User
+ log.info("Anonymous Mode.........................");
+
+ //Read the secret
+ log.info("Trying to *read* the secret.........");
+ try
+ {
+ log.info("Secret of the day is: "+this.readProtectedAsset());
+ }
+ catch(Exception e)
+ {
+ if(e instanceof IllegalAccessException)
+ {
+ log.info("Sorry. You cannot *read* the secret!!!!!");
+ }
+ else
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ //Try to update the secret
+ String hackedSecret = "It must be given to Bush";
+ log.info("Trying to *hack* the secret.........["+hackedSecret+"]");
+ try
+ {
+ this.writeToProtectedAsset(hackedSecret);
+ }
+ catch(Exception e)
+ {
+ if(e instanceof IllegalAccessException)
+ {
+ log.info("Sorry. You cannot *modify* the secret!!!!!");
+ }
+ else
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ // ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ private String readProtectedAsset()
+ {
+ return this.protectedAsset.getSensitiveData();
+ }
+
+ private void writeToProtectedAsset(String sensitiveInfo)
+ {
+ if(this.protectedAsset == null)
+ {
+ this.protectedAsset = new Pojo();
+ }
+ this.protectedAsset.setSensitiveData(sensitiveInfo);
+ }
+
+ private void loginAsAdmin()
+ {
+ AuthenticatedSession session = new AuthenticatedSession();
+
+ session.setUsername("admin");
+ session.addRole("admin");
+ // session.addRole("/system/admin/badassdude/blah/blah");
+
+ Calendar accessTime = Calendar.getInstance();
+ accessTime.set(Calendar.HOUR_OF_DAY, 8);
+ accessTime.set(Calendar.MINUTE, 0);
+ session.setAccessTime(accessTime.getTime());
+
+ AuthenticatedSession.activeSession.set(session);
+ }
+
+ private void loginAsUser()
+ {
+ AuthenticatedSession session = new AuthenticatedSession();
+
+ session.setUsername("user");
+ session.addRole("regular");
+
+ Calendar accessTime = Calendar.getInstance();
+ accessTime.set(Calendar.HOUR_OF_DAY, 8);
+ accessTime.set(Calendar.MINUTE, 0);
+ session.setAccessTime(accessTime.getTime());
+
+ AuthenticatedSession.activeSession.set(session);
+ }
+
+ private void logout()
+ {
+ AuthenticatedSession.activeSession.set(null);
+ }
+}
14 years, 6 months
- 1
- 0