From c558db35119184579f33f2281f1604a85a3d9534 Mon Sep 17 00:00:00 2001 From: edwardsmj Date: Fri, 5 Dec 2008 17:34:16 +0000 Subject: Changes to make policy-security work in 2.0. SecurityUtil.java moved to org.apache.tuscany.policy.security to avoid a clash with a package name used in the policy module git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723800 13f79535-47bb-0310-9956-ffa450edef68 --- .../modules/policy-security/META-INF/MANIFEST.MF | 3 +- .../apache/tuscany/sca/policy/SecurityUtil.java | 76 ---------------------- ...icAuthenticationReferencePolicyInterceptor.java | 2 +- ...asicAuthenticationServicePolicyInterceptor.java | 2 +- ...ityIdentityImplementationPolicyInterceptor.java | 2 +- .../tuscany/sca/policy/security/SecurityUtil.java | 76 ++++++++++++++++++++++ 6 files changed, 81 insertions(+), 80 deletions(-) delete mode 100644 java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java create mode 100644 java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java (limited to 'java/sca') diff --git a/java/sca/modules/policy-security/META-INF/MANIFEST.MF b/java/sca/modules/policy-security/META-INF/MANIFEST.MF index 7fa44bee8c..d36fe873a1 100644 --- a/java/sca/modules/policy-security/META-INF/MANIFEST.MF +++ b/java/sca/modules/policy-security/META-INF/MANIFEST.MF @@ -25,7 +25,8 @@ Export-Package: org.apache.tuscany.sca.policy.authorization;uses:="jav es:="javax.xml.stream,org.apache.tuscany.sca.contribution.resolver,or g.apache.tuscany.sca.contribution.processor,org.apache.tuscany.sca.co re,org.apache.tuscany.sca.monitor,org.apache.tuscany.sca.policy,javax - .xml.namespace";version="1.4" + .xml.namespace";version="1.4",org.apache.tuscany.sca.policy.authentic + ation.token;version="1.4" Tool: Bnd-0.0.255 Bundle-Name: Apache Tuscany Security Policy Model Created-By: 1.6.0_07 (Sun Microsystems Inc.) diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java deleted file mode 100644 index 81bc3271c6..0000000000 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.policy; - -import java.security.Principal; - -import javax.security.auth.Subject; - -import org.apache.tuscany.sca.invocation.Message; - - -/** - * - * @version $Rev$ $Date$ - */ -public class SecurityUtil { - - public static Subject getSubject(Message msg){ - - Subject subject = null; - - for (Object header : msg.getHeaders()){ - if (header instanceof Subject){ - subject = (Subject)header; - break; - } - } - - if (subject == null){ - subject = new Subject(); - msg.getHeaders().add(subject); - } - - return subject; - } - - public static T getPrincipal(Subject subject, Class clazz){ - for (Principal msgPrincipal : subject.getPrincipals() ){ - if (clazz.isInstance(msgPrincipal)){ - return clazz.cast(msgPrincipal); - } - } - - return null; - } - - public static Principal getPrincipal(Message msg){ - - Principal principal = null; - - for (Object header : msg.getHeaders()){ - if (header instanceof Principal){ - principal = (Principal)header; - break; - } - } - - return principal; - } -} diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java index 8c06f0e6a5..9d3b6e75f8 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.policy.PolicySet; -import org.apache.tuscany.sca.policy.SecurityUtil; +import org.apache.tuscany.sca.policy.security.SecurityUtil; /** * diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java index 3ea3381616..0d11825186 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.policy.PolicySet; -import org.apache.tuscany.sca.policy.SecurityUtil; +import org.apache.tuscany.sca.policy.security.SecurityUtil; /** diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java index df7a9c307b..4a711fac45 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java @@ -26,7 +26,7 @@ import javax.security.auth.Subject; import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; -import org.apache.tuscany.sca.policy.SecurityUtil; +import org.apache.tuscany.sca.policy.security.SecurityUtil; import org.osoa.sca.ServiceRuntimeException; /** diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java new file mode 100644 index 0000000000..1297b44b93 --- /dev/null +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java @@ -0,0 +1,76 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tuscany.sca.policy.security; + +import java.security.Principal; + +import javax.security.auth.Subject; + +import org.apache.tuscany.sca.invocation.Message; + + +/** + * + * @version $Rev$ $Date$ + */ +public class SecurityUtil { + + public static Subject getSubject(Message msg){ + + Subject subject = null; + + for (Object header : msg.getHeaders()){ + if (header instanceof Subject){ + subject = (Subject)header; + break; + } + } + + if (subject == null){ + subject = new Subject(); + msg.getHeaders().add(subject); + } + + return subject; + } + + public static T getPrincipal(Subject subject, Class clazz){ + for (Principal msgPrincipal : subject.getPrincipals() ){ + if (clazz.isInstance(msgPrincipal)){ + return clazz.cast(msgPrincipal); + } + } + + return null; + } + + public static Principal getPrincipal(Message msg){ + + Principal principal = null; + + for (Object header : msg.getHeaders()){ + if (header instanceof Principal){ + principal = (Principal)header; + break; + } + } + + return principal; + } +} -- cgit v1.2.3