tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1491387 - in /tomee/tomee/trunk/container/openejb-core/src: main/java/org/apache/openejb/core/security/AbstractSecurityService.java test/java/org/apache/openejb/core/security/RunAsTest.java
Date Mon, 10 Jun 2013 09:37:51 GMT
Author: rmannibucau
Date: Mon Jun 10 09:37:51 2013
New Revision: 1491387

URL: http://svn.apache.org/r1491387
Log:
TOMEE-969 @RunAs does not override calling context

Added:
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/security/RunAsTest.java
Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java?rev=1491387&r1=1491386&r2=1491387&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
Mon Jun 10 09:37:51 2013
@@ -140,10 +140,12 @@ public abstract class AbstractSecuritySe
         final String moduleID = newContext.getBeanContext().getModuleID();
         PolicyContext.setContextID(moduleID);
 
-        SecurityContext securityContext = (oldContext != null) ? oldContext.get(SecurityContext.class)
: null;
+        Subject runAsSubject = getRunAsSubject(newContext.getBeanContext());
+        if (oldContext != null && runAsSubject == null) {
+            runAsSubject = getRunAsSubject(oldContext.getBeanContext());
+        }
 
-        final BeanContext callingBeanContext = (oldContext != null) ? oldContext.getBeanContext()
: null;
-        final Subject runAsSubject = getRunAsSubject(callingBeanContext);
+        SecurityContext securityContext = (oldContext != null) ? oldContext.get(SecurityContext.class)
: null;
         if (runAsSubject != null) {
 
             securityContext = new SecurityContext(runAsSubject);

Added: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/security/RunAsTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/security/RunAsTest.java?rev=1491387&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/security/RunAsTest.java
(added)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/security/RunAsTest.java
Mon Jun 10 09:37:51 2013
@@ -0,0 +1,63 @@
+/**
+ * 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.openejb.core.security;
+
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Module;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RunAs;
+import javax.ejb.EJB;
+import javax.ejb.SessionContext;
+import javax.ejb.Singleton;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(ApplicationComposer.class)
+public class RunAsTest {
+    @Module
+    public Class<?>[] beans() {
+        return new Class<?>[] { MyRunAsBean.class };
+    }
+
+    @EJB
+    private MyRunAsBean bean;
+
+    @Test
+    public void runAs() {
+        assertTrue(bean.isInRole());
+        assertEquals("foo", bean.principal());
+    }
+
+    @RunAs("foo")
+    @Singleton
+    public static class MyRunAsBean {
+        @Resource
+        private SessionContext ctx;
+
+        public String principal() {
+            return ctx.getCallerPrincipal().getName();
+        }
+
+        public boolean isInRole() {
+            return ctx.isCallerInRole("foo");
+        }
+    }
+}



Mime
View raw message