Merge branch 'master'

meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/MeecrowaveSecurityService.java

@@ -57,7 +57,7 @@ public MeecrowaveSecurityService(final WebBeansContext context) {
         proxy = apiToProxy.length == 1 ? new MeecrowavePrincipal() : Principal.class.cast(
                 Proxy.newProxyInstance(loader, apiToProxy, (proxy, method, args) -> {
                     try {
-                        return method.invoke(getCurrentPrincipal(), args);
+                        return method.invoke(getUserPrincipal(), args);
                     } catch (final InvocationTargetException ite) {
                         throw ite.getTargetException();
                     }

meecrowave-core/src/test/java/org/apache/meecrowave/PrincipalTest.java

@@ -62,6 +62,43 @@ protected Principal getPrincipal(final String username) {
         }
     }
 
+    @Test
+    public void runWithProxy() throws IOException {
+        String proxyApis = System.getProperty("org.apache.webbeans.component.PrincipalBean.proxyApis");
+        System.setProperty("org.apache.webbeans.component.PrincipalBean.proxyApis", "org.apache.meecrowave.TestPrincipal");
+        try (final Meecrowave container = new Meecrowave(new Meecrowave.Builder()
+                .randomHttpPort()
+                .includePackages("org.superbiz.app")
+                .realm(new RealmBase() {
+                    @Override
+                    protected String getPassword(final String username) {
+                        return "foo".equals(username) ? "pwd" : null;
+                    }
+
+                    @Override
+                    protected Principal getPrincipal(final String username) {
+                        return new MyPrincipal(username);
+                    }
+                }).loginConfig(new Meecrowave.LoginConfigBuilder()
+                        .basic()
+                        .realmName("basic realm"))
+                .securityConstraints(new Meecrowave.SecurityConstaintBuilder()
+                        .authConstraint(true)
+                        .addAuthRole("**")
+                        .addCollection("secured", "/*")))
+                .bake()) {
+            assertEquals(
+                    "org.apache.meecrowave.PrincipalTest$MyPrincipal_foo  org.apache.webbeans.custom.Principal_foo",
+                    slurp(new URL("http://localhost:" + container.getConfiguration().getHttpPort() + "/api/test/principal")));
+        } finally {
+            if (proxyApis != null) {
+                System.setProperty("org.apache.webbeans.component.PrincipalBean.proxyApis", proxyApis);
+            } else {
+                System.clearProperty("org.apache.webbeans.component.PrincipalBean.proxyApis");
+            }
+        }
+    }
+
     private String slurp(final URL url) throws IOException {
         final URLConnection is = HttpURLConnection.class.cast(url.openConnection());
         is.setRequestProperty("Authorization", "Basic " + Base64.getEncoder().encodeToString("foo:pwd".getBytes(StandardCharsets.UTF_8)));

meecrowave-core/src/test/java/org/apache/meecrowave/TestPrincipal.java

@@ -0,0 +1,23 @@
+/*
+ * 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.meecrowave;
+
+public interface TestPrincipal {
+
+}

meecrowave-core/src/test/resources/META-INF/openwebbeans/openwebbeans.properties

@@ -0,0 +1 @@
+org.apache.webbeans.component.PrincipalBean.proxyApis=

meecrowave-oauth2-minimal/pom.xml

@@ -181,6 +181,14 @@
       <version>${h2.version}</version>
       <scope>test</scope>
     </dependency>
+<!--X TODO check
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <version>1.64</version>
+      <scope>test</scope>
+    </dependency>
+  -->
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>