JBossWS SVN: r9024 - stack/native/branches/dlofthouse.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-13 12:31:35 -0500 (Tue, 13 Jan 2009)
New Revision: 9024
Removed:
stack/native/branches/dlofthouse/JBWS-1999/
Log:
No longer required.
15 years, 11 months
JBossWS SVN: r9023 - in stack/native/trunk: modules/core/src/main/java/org/jboss/ws/extensions/security/operation and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-13 11:39:48 -0500 (Tue, 13 Jan 2009)
New Revision: 9023
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/AuthorizeOperation.java
stack/native/trunk/pom.xml
Log:
[JBWS-1999] WS-Security, authentication and authorization for POJO endpoints - Testsuite fixes.
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/AuthorizeOperation.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/AuthorizeOperation.java 2009-01-13 16:39:25 UTC (rev 9022)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/AuthorizeOperation.java 2009-01-13 16:39:48 UTC (rev 9023)
@@ -36,6 +36,7 @@
import org.jboss.logging.Logger;
import org.jboss.security.AuthenticationManager;
import org.jboss.security.RealmMapping;
+import org.jboss.security.SecurityAssociation;
import org.jboss.security.SecurityContext;
import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.SimplePrincipal;
@@ -110,7 +111,8 @@
SecurityException e = new SecurityException(msg);
throw new FailedAuthenticationException(e);
}
- pushSubjectContext(principal, credential, subject);
+ securityAdaptor.pushSubjectContext(subject, principal, credential);
+
if (TRACE)
log.trace("Authenticated, principal=" + principal);
@@ -158,29 +160,4 @@
return expectedRoles;
}
- private static SecurityContext getSecurityContext()
- {
- return (SecurityContext)AccessController.doPrivileged(new PrivilegedAction() {
- public Object run()
- {
- return SecurityContextAssociation.getSecurityContext();
- }
- });
- }
-
- private static void pushSubjectContext(final Principal p, final Object cred, final Subject s)
- {
- AccessController.doPrivileged(new PrivilegedAction() {
-
- public Object run()
- {
- SecurityContext sc = getSecurityContext();
- if (sc == null)
- throw new IllegalStateException("Security Context is null");
- sc.getUtil().createSubjectInfo(p, cred, s);
- return null;
- }
- });
- }
-
}
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-01-13 16:39:25 UTC (rev 9022)
+++ stack/native/trunk/pom.xml 2009-01-13 16:39:48 UTC (rev 9023)
@@ -50,14 +50,14 @@
<properties>
<jbossws.common.version>1.0.9-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.0.6-SNAPSHOT</jbossws.framework.version>
- <jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
- <jbossws.jboss422.version>3.0.5.GA</jbossws.jboss422.version>
- <jbossws.jboss423.version>3.0.5.GA</jbossws.jboss423.version>
- <jbossws.jboss424.version>3.0.5.GA</jbossws.jboss424.version>
- <jbossws.jboss500.version>3.0.5.GA</jbossws.jboss500.version>
+ <jbossws.spi.version>1.0.8-SNAPSHOT</jbossws.spi.version>
+ <jbossws.jboss422.version>3.0.6-SNAPSHOT</jbossws.jboss422.version>
+ <jbossws.jboss423.version>3.0.6-SNAPSHOT</jbossws.jboss423.version>
+ <jbossws.jboss424.version>3.0.6-SNAPSHOT</jbossws.jboss424.version>
+ <jbossws.jboss500.version>3.0.6-SNAPSHOT</jbossws.jboss500.version>
<!-- [JBWS-2263] -->
<!-- START -->
- <jbossws.jboss510.version>3.0.5.GA</jbossws.jboss510.version>
+ <jbossws.jboss510.version>3.0.6-SNAPSHOT</jbossws.jboss510.version>
<jbossws.jboss600.version>3.0.6-SNAPSHOT</jbossws.jboss600.version>
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
15 years, 11 months
JBossWS SVN: r9022 - spi/trunk/src/main/java/org/jboss/wsf/spi/invocation.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-13 11:39:25 -0500 (Tue, 13 Jan 2009)
New Revision: 9022
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptor.java
Log:
[JBWS-1999] WS-Security, authentication and authorization for POJO endpoints - Testsuite fixes.
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptor.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptor.java 2009-01-13 16:39:11 UTC (rev 9021)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptor.java 2009-01-13 16:39:25 UTC (rev 9022)
@@ -23,8 +23,10 @@
import java.security.Principal;
+import javax.security.auth.Subject;
+
/**
- * A container idependent security adaptor
+ * A container independent security adaptor
*
* @author Thomas.Diesler(a)jboss.org
* @since 10-May-2005
@@ -36,4 +38,6 @@
Object getCredential();
void setCredential(Object credential);
+
+ void pushSubjectContext(Subject subject, Principal principal, Object credential);
}
15 years, 11 months
JBossWS SVN: r9021 - in container/jboss60/trunk: src/main/java/org/jboss/wsf/container/jboss60/invocation and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-13 11:39:11 -0500 (Tue, 13 Jan 2009)
New Revision: 9021
Modified:
container/jboss60/trunk/pom.xml
container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/invocation/SecurityAdaptorImpl.java
Log:
[JBWS-1999] WS-Security, authentication and authorization for POJO endpoints - Testsuite fixes.
Modified: container/jboss60/trunk/pom.xml
===================================================================
--- container/jboss60/trunk/pom.xml 2009-01-13 16:38:55 UTC (rev 9020)
+++ container/jboss60/trunk/pom.xml 2009-01-13 16:39:11 UTC (rev 9021)
@@ -25,7 +25,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8.GA</jbossws.common.version>
- <jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.0.8-SNAPSHOT</jbossws.spi.version>
<jboss.version>6.0.0-SNAPSHOT</jboss.version>
<jboss.ejb3.version>1.0.0-Beta11</jboss.ejb3.version>
Modified: container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/invocation/SecurityAdaptorImpl.java
===================================================================
--- container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/invocation/SecurityAdaptorImpl.java 2009-01-13 16:38:55 UTC (rev 9020)
+++ container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/invocation/SecurityAdaptorImpl.java 2009-01-13 16:39:11 UTC (rev 9021)
@@ -22,10 +22,16 @@
package org.jboss.wsf.container.jboss60.invocation;
import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+import java.security.AccessController;
import java.security.Principal;
+import java.security.PrivilegedAction;
+import javax.security.auth.Subject;
+
/**
* A JBoss specific SecurityAssociationAdaptor
*
@@ -57,4 +63,34 @@
{
SecurityAssociation.setCredential(credential);
}
+
+ public void pushSubjectContext(Subject subject, Principal principal, Object credential)
+ {
+ SecurityAdaptorImpl.pushSubjectContext(principal, credential, subject);
+ }
+
+ private static SecurityContext getSecurityContext()
+ {
+ return (SecurityContext)AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run()
+ {
+ return SecurityContextAssociation.getSecurityContext();
+ }
+ });
+ }
+
+ private static void pushSubjectContext(final Principal p, final Object cred, final Subject s)
+ {
+ AccessController.doPrivileged(new PrivilegedAction() {
+
+ public Object run()
+ {
+ SecurityContext sc = getSecurityContext();
+ if (sc == null)
+ throw new IllegalStateException("Security Context is null");
+ sc.getUtil().createSubjectInfo(p, cred, s);
+ return null;
+ }
+ });
+ }
}
15 years, 11 months
JBossWS SVN: r9020 - in container/jboss50/trunk: src/main/java/org/jboss/wsf/container/jboss50/invocation and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-13 11:38:55 -0500 (Tue, 13 Jan 2009)
New Revision: 9020
Modified:
container/jboss50/trunk/.project
container/jboss50/trunk/pom.xml
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java
Log:
[JBWS-1999] WS-Security, authentication and authorization for POJO endpoints - Testsuite fixes.
Modified: container/jboss50/trunk/.project
===================================================================
--- container/jboss50/trunk/.project 2009-01-13 16:38:40 UTC (rev 9019)
+++ container/jboss50/trunk/.project 2009-01-13 16:38:55 UTC (rev 9020)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbossws-jboss501</name>
+ <name>jbossws-jboss510</name>
<comment></comment>
<projects>
</projects>
Modified: container/jboss50/trunk/pom.xml
===================================================================
--- container/jboss50/trunk/pom.xml 2009-01-13 16:38:40 UTC (rev 9019)
+++ container/jboss50/trunk/pom.xml 2009-01-13 16:38:55 UTC (rev 9020)
@@ -25,7 +25,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8.GA</jbossws.common.version>
- <jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.0.8-SNAPSHOT</jbossws.spi.version>
<!--
JBoss component versions taken from
Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java 2009-01-13 16:38:40 UTC (rev 9019)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java 2009-01-13 16:38:55 UTC (rev 9020)
@@ -22,10 +22,16 @@
package org.jboss.wsf.container.jboss50.invocation;
import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+import java.security.AccessController;
import java.security.Principal;
+import java.security.PrivilegedAction;
+import javax.security.auth.Subject;
+
/**
* A JBoss specific SecurityAssociationAdaptor
*
@@ -57,4 +63,34 @@
{
SecurityAssociation.setCredential(credential);
}
+
+ public void pushSubjectContext(Subject subject, Principal principal, Object credential)
+ {
+ SecurityAdaptorImpl.pushSubjectContext(principal, credential, subject);
+ }
+
+ private static SecurityContext getSecurityContext()
+ {
+ return (SecurityContext)AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run()
+ {
+ return SecurityContextAssociation.getSecurityContext();
+ }
+ });
+ }
+
+ private static void pushSubjectContext(final Principal p, final Object cred, final Subject s)
+ {
+ AccessController.doPrivileged(new PrivilegedAction() {
+
+ public Object run()
+ {
+ SecurityContext sc = getSecurityContext();
+ if (sc == null)
+ throw new IllegalStateException("Security Context is null");
+ sc.getUtil().createSubjectInfo(p, cred, s);
+ return null;
+ }
+ });
+ }
}
15 years, 11 months
JBossWS SVN: r9019 - in container/jboss50/branches/jboss500GA: src/main/java/org/jboss/wsf/container/jboss50/invocation and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-13 11:38:40 -0500 (Tue, 13 Jan 2009)
New Revision: 9019
Modified:
container/jboss50/branches/jboss500GA/.project
container/jboss50/branches/jboss500GA/pom.xml
container/jboss50/branches/jboss500GA/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java
Log:
[JBWS-1999] WS-Security, authentication and authorization for POJO endpoints - Testsuite fixes.
Modified: container/jboss50/branches/jboss500GA/.project
===================================================================
--- container/jboss50/branches/jboss500GA/.project 2009-01-13 16:38:23 UTC (rev 9018)
+++ container/jboss50/branches/jboss500GA/.project 2009-01-13 16:38:40 UTC (rev 9019)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbossws-jboss501</name>
+ <name>jbossws-jboss500</name>
<comment></comment>
<projects>
</projects>
Modified: container/jboss50/branches/jboss500GA/pom.xml
===================================================================
--- container/jboss50/branches/jboss500GA/pom.xml 2009-01-13 16:38:23 UTC (rev 9018)
+++ container/jboss50/branches/jboss500GA/pom.xml 2009-01-13 16:38:40 UTC (rev 9019)
@@ -25,7 +25,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8.GA</jbossws.common.version>
- <jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.0.8-SNAPSHOT</jbossws.spi.version>
<!--
JBoss component versions taken from
http://repository.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-m...
Modified: container/jboss50/branches/jboss500GA/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java
===================================================================
--- container/jboss50/branches/jboss500GA/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java 2009-01-13 16:38:23 UTC (rev 9018)
+++ container/jboss50/branches/jboss500GA/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java 2009-01-13 16:38:40 UTC (rev 9019)
@@ -22,10 +22,16 @@
package org.jboss.wsf.container.jboss50.invocation;
import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+import java.security.AccessController;
import java.security.Principal;
+import java.security.PrivilegedAction;
+import javax.security.auth.Subject;
+
/**
* A JBoss specific SecurityAssociationAdaptor
*
@@ -57,4 +63,34 @@
{
SecurityAssociation.setCredential(credential);
}
+
+ public void pushSubjectContext(Subject subject, Principal principal, Object credential)
+ {
+ SecurityAdaptorImpl.pushSubjectContext(principal, credential, subject);
+ }
+
+ private static SecurityContext getSecurityContext()
+ {
+ return (SecurityContext)AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run()
+ {
+ return SecurityContextAssociation.getSecurityContext();
+ }
+ });
+ }
+
+ private static void pushSubjectContext(final Principal p, final Object cred, final Subject s)
+ {
+ AccessController.doPrivileged(new PrivilegedAction() {
+
+ public Object run()
+ {
+ SecurityContext sc = getSecurityContext();
+ if (sc == null)
+ throw new IllegalStateException("Security Context is null");
+ sc.getUtil().createSubjectInfo(p, cred, s);
+ return null;
+ }
+ });
+ }
}
15 years, 11 months
JBossWS SVN: r9018 - in container/jboss42/trunk: src/main/java/org/jboss/wsf/container/jboss42 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-13 11:38:23 -0500 (Tue, 13 Jan 2009)
New Revision: 9018
Modified:
container/jboss42/trunk/pom.xml
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java
Log:
[JBWS-1999] WS-Security, authentication and authorization for POJO endpoints - Testsuite fixes.
Modified: container/jboss42/trunk/pom.xml
===================================================================
--- container/jboss42/trunk/pom.xml 2009-01-13 16:38:08 UTC (rev 9017)
+++ container/jboss42/trunk/pom.xml 2009-01-13 16:38:23 UTC (rev 9018)
@@ -25,7 +25,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8.GA</jbossws.common.version>
- <jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.0.8-SNAPSHOT</jbossws.spi.version>
<!--
To deploy-file to snapshot repo do:
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java 2009-01-13 16:38:08 UTC (rev 9017)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java 2009-01-13 16:38:23 UTC (rev 9018)
@@ -23,6 +23,8 @@
import java.security.Principal;
+import javax.security.auth.Subject;
+
import org.jboss.security.SecurityAssociation;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
@@ -57,4 +59,9 @@
{
SecurityAssociation.setCredential(credential);
}
+
+ public void pushSubjectContext(Subject subject, Principal principal, Object credential)
+ {
+ SecurityAssociation.pushSubjectContext(subject, principal, credential);
+ }
}
15 years, 11 months
JBossWS SVN: r9017 - in container/jboss42/branches/jboss423: src/main/java/org/jboss/wsf/container/jboss42 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-13 11:38:08 -0500 (Tue, 13 Jan 2009)
New Revision: 9017
Modified:
container/jboss42/branches/jboss423/pom.xml
container/jboss42/branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java
Log:
[JBWS-1999] WS-Security, authentication and authorization for POJO endpoints - Testsuite fixes.
Modified: container/jboss42/branches/jboss423/pom.xml
===================================================================
--- container/jboss42/branches/jboss423/pom.xml 2009-01-13 16:37:46 UTC (rev 9016)
+++ container/jboss42/branches/jboss423/pom.xml 2009-01-13 16:38:08 UTC (rev 9017)
@@ -25,7 +25,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8.GA</jbossws.common.version>
- <jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.0.8-SNAPSHOT</jbossws.spi.version>
<!--
To deploy-file to snapshot repo do:
Modified: container/jboss42/branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java
===================================================================
--- container/jboss42/branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java 2009-01-13 16:37:46 UTC (rev 9016)
+++ container/jboss42/branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java 2009-01-13 16:38:08 UTC (rev 9017)
@@ -23,6 +23,8 @@
import java.security.Principal;
+import javax.security.auth.Subject;
+
import org.jboss.security.SecurityAssociation;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
@@ -57,4 +59,9 @@
{
SecurityAssociation.setCredential(credential);
}
+
+ public void pushSubjectContext(Subject subject, Principal principal, Object credential)
+ {
+ SecurityAssociation.pushSubjectContext(subject, principal, credential);
+ }
}
15 years, 11 months
JBossWS SVN: r9016 - in container/jboss42/branches/jboss422: src/main/java/org/jboss/wsf/container/jboss42 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-13 11:37:46 -0500 (Tue, 13 Jan 2009)
New Revision: 9016
Modified:
container/jboss42/branches/jboss422/pom.xml
container/jboss42/branches/jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java
Log:
[JBWS-1999] WS-Security, authentication and authorization for POJO endpoints - Testsuite fixes.
Modified: container/jboss42/branches/jboss422/pom.xml
===================================================================
--- container/jboss42/branches/jboss422/pom.xml 2009-01-13 10:19:01 UTC (rev 9015)
+++ container/jboss42/branches/jboss422/pom.xml 2009-01-13 16:37:46 UTC (rev 9016)
@@ -26,7 +26,7 @@
<properties>
<jboss.version>4.2.2.GA</jboss.version>
<jbossws.common.version>1.0.8.GA</jbossws.common.version>
- <jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.0.8-SNAPSHOT</jbossws.spi.version>
<!-- versions defined in build/build-thirdparty.xml -->
<dom4j.version>1.6.1</dom4j.version>
<jboss.aop.version>1.5.6.GA</jboss.aop.version>
Modified: container/jboss42/branches/jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java
===================================================================
--- container/jboss42/branches/jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java 2009-01-13 10:19:01 UTC (rev 9015)
+++ container/jboss42/branches/jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java 2009-01-13 16:37:46 UTC (rev 9016)
@@ -25,6 +25,8 @@
import java.security.Principal;
+import javax.security.auth.Subject;
+
import org.jboss.security.SecurityAssociation;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
@@ -59,4 +61,9 @@
{
SecurityAssociation.setCredential(credential);
}
+
+ public void pushSubjectContext(Subject subject, Principal principal, Object credential)
+ {
+ SecurityAssociation.pushSubjectContext(subject, principal, credential);
+ }
}
15 years, 11 months