CVE-2020-1695

@@ -39,7 +39,7 @@ public void filter(ClientRequestContext requestContext) {
         Optional<ClientHeaderProvider> handler = ClientHeaderProviders.getProvider(method);
         handler.ifPresent(h -> h.addHeaders(headers));
 
-        Optional<ClientHeadersFactory> factory = ClientHeaderProviders.getFactory(method.getDeclaringClass());
+        Optional<ClientHeadersFactory> factory = ClientHeaderProviders.getFactory(ClientRequestContextUtils.getDeclaringClass(requestContext));
 
         requestContext.getHeaders().forEach(
                 (key, values) -> headers.put(key, castToListOfStrings(values))

@@ -25,6 +25,19 @@ public static Method getMethod(ClientRequestContext requestContext) {
         return invocation.getClientInvoker().getMethod();
     }
 
+    /**
+     * Get {@link Class} for the client call from {@link ClientRequestContext}
+     * @param requestContext the context
+     * @return the class
+     */
+    public static Class<?> getDeclaringClass(ClientRequestContext requestContext) {
+        if(requestContext instanceof ClientRequestContextImpl == false) {
+            throw new RuntimeException("Failed to get ClientInvocation from request context. Is RestEasy client used underneath?");
+        }
+        ClientInvocation invocation = ((ClientRequestContextImpl)requestContext).getInvocation();
+        return invocation.getClientInvoker().getDeclaring();
+    }
+
     private ClientRequestContextUtils() {
     }
 }

@@ -36,24 +36,26 @@ static class Worker {
 
       @Inject
       @RestClient
-      private TestResourceIntf service;
+      private SubClassResourceIntf service;
 
       public String work() {
          return service.hello("Stefano");
       }
    }
 
    @Path("/")
-   @RegisterRestClient(baseUri="http://localhost:8081")
-   @RegisterClientHeaders(TestClientHeadersFactory.class)
-   @ClientHeaderParam(name="IntfHeader", value="intfValue")
    public interface TestResourceIntf {
 
       @Path("hello/{h}")
       @GET
       String hello(@PathParam("h") String h);
    }
 
+   @RegisterRestClient(baseUri="http://localhost:8081")
+   @RegisterClientHeaders(TestClientHeadersFactory.class)
+   @ClientHeaderParam(name="IntfHeader", value="intfValue")
+   public interface SubClassResourceIntf extends TestResourceIntf {};
+
    @Path("/")
    public static class TestResource {
 
@@ -102,7 +104,7 @@ public Set<Class<?>> getClasses() {
    public static void init() throws Exception {
       Weld weld = new Weld();
       weld.addBeanClass(Worker.class);
-      weld.addBeanClass(TestResourceIntf.class);
+      weld.addBeanClass(SubClassResourceIntf.class);
       weld.addBeanClass(TestClientHeadersFactory.class);
       weld.addBeanClass(Counter.class);
       container = weld.initialize();