-
Notifications
You must be signed in to change notification settings - Fork 692
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
TOMEE-4333 proxy refactor to prevent NotSerializableException
- Loading branch information
1 parent
77cb279
commit 7d55f9b
Showing
10 changed files
with
385 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/HttpServletRequestProxy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * 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.tomee.catalina; | ||
|
|
||
| import javax.servlet.http.HttpServletRequest; | ||
| import java.io.ObjectStreamException; | ||
| import java.io.Serializable; | ||
| import java.lang.reflect.InvocationHandler; | ||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.lang.reflect.Method; | ||
| import java.lang.reflect.Proxy; | ||
|
|
||
| public interface HttpServletRequestProxy extends HttpServletRequest, Serializable { | ||
|
|
||
| public Object writeReplace() throws ObjectStreamException; | ||
|
|
||
| public static HttpServletRequest get() { | ||
| return (HttpServletRequest) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), | ||
| new Class<?>[] { HttpServletRequestProxy.class, HttpServletRequest.class, Serializable.class }, | ||
| new Handler()); | ||
| } | ||
|
|
||
| public static class Handler implements InvocationHandler { | ||
| @Override | ||
| public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { | ||
| if (method.getName().equals("writeReplace") && method.getParameterTypes().length == 0) { | ||
| return new Serialized(); | ||
| } | ||
|
|
||
| try { | ||
| HttpServletRequest obj = OpenEJBSecurityListener.requests.get(); | ||
| return method.invoke(obj, args); | ||
| } catch (final InvocationTargetException ite) { | ||
| throw ite.getCause(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static class Serialized implements Serializable { | ||
| public Object readResolve() throws ObjectStreamException { | ||
| return HttpServletRequestProxy.get(); | ||
| } | ||
| } | ||
| } |
62 changes: 62 additions & 0 deletions
62
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/HttpSessionProxy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * 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.tomee.catalina; | ||
|
|
||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpSession; | ||
| import java.io.ObjectStreamException; | ||
| import java.io.Serializable; | ||
| import java.lang.reflect.InvocationHandler; | ||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.lang.reflect.Method; | ||
| import java.lang.reflect.Proxy; | ||
|
|
||
| public interface HttpSessionProxy extends HttpSession, Serializable { | ||
|
|
||
| public Object writeReplace() throws ObjectStreamException; | ||
|
|
||
| public static HttpSession get() { | ||
| return (HttpSession) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), | ||
| new Class<?>[] { HttpSessionProxy.class, HttpSession.class, Serializable.class }, | ||
| new Handler()); | ||
| } | ||
|
|
||
| public static class Handler implements InvocationHandler { | ||
| @Override | ||
| public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { | ||
| if (method.getName().equals("writeReplace") && method.getParameterTypes().length == 0) { | ||
| return new Serialized(); | ||
| } | ||
|
|
||
| try { | ||
| final HttpServletRequest request = OpenEJBSecurityListener.requests.get(); | ||
| final HttpSession session = request == null ? null : request.getSession(); | ||
|
|
||
| return method.invoke(session, args); | ||
| } catch (final InvocationTargetException ite) { | ||
| throw ite.getCause(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static class Serialized implements Serializable { | ||
| public Object readResolve() throws ObjectStreamException { | ||
| return HttpSessionProxy.get(); | ||
| } | ||
| } | ||
| } |
84 changes: 84 additions & 0 deletions
84
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServletContextProxy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * 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.tomee.catalina; | ||
|
|
||
| import org.apache.catalina.connector.Request; | ||
| import org.apache.openejb.AppContext; | ||
| import org.apache.openejb.cdi.CdiAppContextsService; | ||
| import org.apache.openejb.core.WebContext; | ||
| import org.apache.openejb.loader.SystemInstance; | ||
| import org.apache.openejb.spi.ContainerSystem; | ||
|
|
||
| import javax.servlet.ServletContext; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import java.io.ObjectStreamException; | ||
| import java.io.Serializable; | ||
| import java.lang.reflect.InvocationHandler; | ||
| import java.lang.reflect.Method; | ||
| import java.lang.reflect.Proxy; | ||
|
|
||
| import static org.apache.tomee.catalina.TomcatWebAppBuilder.CONTEXTS; | ||
|
|
||
| public interface ServletContextProxy extends ServletContext, Serializable { | ||
|
|
||
| public Object writeReplace() throws ObjectStreamException; | ||
|
|
||
| public static ServletContext get() { | ||
| return (ServletContext) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), | ||
| new Class<?>[] { ServletContextProxy.class, ServletContext.class, CdiAppContextsService.FiredManually.class, Serializable.class }, | ||
| new Handler()); | ||
| } | ||
|
|
||
| public static class Handler implements InvocationHandler { | ||
| @Override | ||
| public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { | ||
| if (method.getName().equals("writeReplace") && method.getParameterTypes().length == 0) { | ||
| return new Serialized(); | ||
| } | ||
|
|
||
| // ITE are handled by Proxys | ||
| final Request request = OpenEJBSecurityListener.requests.get(); | ||
| if (request != null) { | ||
| return method.invoke(request.getServletContext(), args); | ||
| } | ||
|
|
||
| final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); | ||
| final ServletContext c = CONTEXTS.get(contextClassLoader); | ||
| if (c != null) { | ||
| return method.invoke(c, args); | ||
| } | ||
|
|
||
| OpenEJBSecurityListener.requests.remove(); // can be a not container thread so clean it up | ||
| for (final AppContext a : SystemInstance.get().getComponent(ContainerSystem.class).getAppContexts()) { | ||
| for (final WebContext w : a.getWebContexts()) { | ||
| if (w.getClassLoader() == contextClassLoader) { // not in CXF so == should be fine | ||
| return method.invoke(w.getServletContext(), args); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| throw new IllegalStateException("Didnt find a web context for " + contextClassLoader); | ||
| } | ||
| } | ||
|
|
||
| public static class Serialized implements Serializable { | ||
| public Object readResolve() throws ObjectStreamException { | ||
| return ServletContextProxy.get(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.