Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FISH-7354 : replacing old jsp class on the fly #6284

Merged
merged 1 commit into from
May 22, 2023
Merged

FISH-7354 : replacing old jsp class on the fly #6284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion appserver/web/web-core/src/main/java/org/apache/catalina/core/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Portions Copyright [2022] [Payara Foundation and/or its affiliates]
// Portions Copyright [2022-2023] [Payara Foundation and/or its affiliates]

package org.apache.catalina.core;

Expand All @@ -69,6 +69,9 @@ public class Constants {
public static final String JSP_SERVLET_CLASS
= "org.glassfish.wasp.servlet.JspServlet";

public static final String OLD_JSP_SERVLET_CLASS
= "org.apache.jasper.servlet.JspServlet";

public static final String JSP_SERVLET_NAME = "jsp";

public static final String DEFAULT_SERVLET_NAME = "default";
Expand Down
127 changes: 56 additions & 71 deletions appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,72 +55,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Portions Copyright [2016-2022] [Payara Foundation and/or its affiliates]
// Portions Copyright [2016-2023] [Payara Foundation and/or its affiliates]

package org.apache.catalina.core;

import static java.text.MessageFormat.format;
import static java.util.Collections.list;
import static java.util.Collections.unmodifiableList;
import static java.util.Collections.unmodifiableMap;
import static java.util.logging.Level.FINE;
import static java.util.logging.Level.FINEST;
import static java.util.logging.Level.INFO;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static org.apache.catalina.InstanceEvent.EventType.AFTER_DESTROY_EVENT;
import static org.apache.catalina.InstanceEvent.EventType.AFTER_INIT_EVENT;
import static org.apache.catalina.InstanceEvent.EventType.AFTER_SERVICE_EVENT;
import static org.apache.catalina.InstanceEvent.EventType.BEFORE_DESTROY_EVENT;
import static org.apache.catalina.InstanceEvent.EventType.BEFORE_INIT_EVENT;
import static org.apache.catalina.InstanceEvent.EventType.BEFORE_SERVICE_EVENT;
import static org.apache.catalina.LogFacade.CANNOT_ALLOCATE_SERVLET_EXCEPTION;
import static org.apache.catalina.LogFacade.CANNOT_FIND_LOADER_EXCEPTION;
import static org.apache.catalina.LogFacade.CANNOT_FIND_SERVLET_CLASS_EXCEPTION;
import static org.apache.catalina.LogFacade.CLASS_IS_NOT_SERVLET_EXCEPTION;
import static org.apache.catalina.LogFacade.DESTROY_SERVLET_EXCEPTION;
import static org.apache.catalina.LogFacade.ERROR_ALLOCATE_SERVLET_INSTANCE_EXCEPTION;
import static org.apache.catalina.LogFacade.ERROR_INSTANTIATE_SERVLET_CLASS_EXCEPTION;
import static org.apache.catalina.LogFacade.ERROR_LOADING_INFO;
import static org.apache.catalina.LogFacade.MARK_SERVLET_UNAVAILABLE;
import static org.apache.catalina.LogFacade.NO_SERVLET_BE_SPECIFIED_EXCEPTION;
import static org.apache.catalina.LogFacade.PARENT_CONTAINER_MUST_BE_CONTEXT_EXCEPTION;
import static org.apache.catalina.LogFacade.PRIVILEGED_SERVLET_CANNOT_BE_LOADED_EXCEPTION;
import static org.apache.catalina.LogFacade.SERVLET_EXECUTION_EXCEPTION;
import static org.apache.catalina.LogFacade.SERVLET_INIT_EXCEPTION;
import static org.apache.catalina.LogFacade.SERVLET_UNLOAD_EXCEPTION;
import static org.apache.catalina.LogFacade.WAITING_INSTANCE_BE_DEALLOCATED;
import static org.apache.catalina.LogFacade.WRAPPER_CONTAINER_NO_CHILD_EXCEPTION;
import static org.apache.catalina.core.Constants.JSP_SERVLET_CLASS;
import static org.apache.catalina.core.Constants.JSP_SERVLET_NAME;
import static org.apache.catalina.security.SecurityUtil.doAsPrivilege;
import static org.apache.catalina.security.SecurityUtil.executeUnderSubjectDoAs;
import static org.apache.catalina.security.SecurityUtil.isPackageProtectionEnabled;
import static org.glassfish.internal.api.Globals.getDefaultHabitat;

import java.io.IOException;
import java.lang.reflect.Method;
import java.security.AccessController;
import java.security.Principal;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.Stack;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Filter;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;

import javax.management.Notification;
import javax.management.NotificationBroadcasterSupport;
import javax.management.ObjectName;
import fish.payara.notification.requesttracing.RequestTraceSpan;
import fish.payara.nucleus.requesttracing.RequestTracingService;
import fish.payara.opentracing.OpenTracingService;
import io.opentracing.Tracer;
import io.opentracing.tag.Tags;
import jakarta.servlet.Servlet;
import jakarta.servlet.ServletConfig;
import jakarta.servlet.ServletContext;
Expand All @@ -131,8 +74,6 @@
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import io.opentracing.Tracer;
import org.apache.catalina.Container;
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Context;
Expand All @@ -143,15 +84,55 @@
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.Enumerator;
import org.apache.catalina.util.InstanceSupport;
import org.glassfish.api.invocation.InvocationManager;
import org.glassfish.internal.api.Globals;
import org.glassfish.jersey.servlet.ServletContainer;
import org.glassfish.web.valve.GlassFishValve;

import fish.payara.nucleus.requesttracing.RequestTracingService;
import fish.payara.notification.requesttracing.RequestTraceSpan;
import fish.payara.opentracing.OpenTracingService;
import io.opentracing.tag.Tags;
import org.glassfish.api.invocation.InvocationManager;
import org.glassfish.internal.api.Globals;
import javax.management.Notification;
import javax.management.NotificationBroadcasterSupport;
import javax.management.ObjectName;
import java.io.IOException;
import java.lang.reflect.Method;
import java.security.AccessController;
import java.security.Principal;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Filter;
import java.util.logging.LogRecord;
import java.util.logging.Logger;

import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static java.text.MessageFormat.format;
import static java.util.Collections.list;
import static java.util.Collections.unmodifiableList;
import static java.util.Collections.unmodifiableMap;
import static java.util.logging.Level.FINE;
import static java.util.logging.Level.FINEST;
import static java.util.logging.Level.INFO;
import static org.apache.catalina.InstanceEvent.EventType.AFTER_DESTROY_EVENT;
import static org.apache.catalina.InstanceEvent.EventType.AFTER_INIT_EVENT;
import static org.apache.catalina.InstanceEvent.EventType.AFTER_SERVICE_EVENT;
import static org.apache.catalina.InstanceEvent.EventType.BEFORE_DESTROY_EVENT;
import static org.apache.catalina.InstanceEvent.EventType.BEFORE_INIT_EVENT;
import static org.apache.catalina.InstanceEvent.EventType.BEFORE_SERVICE_EVENT;
import static org.apache.catalina.LogFacade.*;
import static org.apache.catalina.core.Constants.JSP_SERVLET_CLASS;
import static org.apache.catalina.core.Constants.JSP_SERVLET_NAME;
import static org.apache.catalina.core.Constants.OLD_JSP_SERVLET_CLASS;
import static org.apache.catalina.security.SecurityUtil.doAsPrivilege;
import static org.apache.catalina.security.SecurityUtil.executeUnderSubjectDoAs;
import static org.apache.catalina.security.SecurityUtil.isPackageProtectionEnabled;
import static org.glassfish.internal.api.Globals.getDefaultHabitat;

/**
* Standard implementation of the <b>Wrapper</b> interface that represents
Expand Down Expand Up @@ -670,6 +651,10 @@ public void setServletClassName(String className) {
"class, or name");
}

if (OLD_JSP_SERVLET_CLASS.equals(className)) {
className = JSP_SERVLET_CLASS;
}

servletClassName = className;
// oldServletClassName is null
support.firePropertyChange("servletClassName", null, servletClassName);
Expand Down
17 changes: 15 additions & 2 deletions appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
// Portions Copyright [2019-2021] [Payara Foundation and/or its affiliates]
// Portions Copyright [2019-2023] [Payara Foundation and/or its affiliates]

package com.sun.enterprise.web;

Expand Down Expand Up @@ -88,6 +88,8 @@ final class WebModuleListener
* The logger used to log messages
*/
private static final Logger _logger = LogFacade.getLogger();
public static final String OLD_PAYARA5_JSP_SERVLET = "org.apache.jasper.servlet.JspServlet";
public static final String NEW_PAYARA6_JSP_SERVLET = "org.glassfish.wasp.servlet.JspServlet";

/**
* Descriptor object associated with this web application.
Expand Down Expand Up @@ -324,10 +326,13 @@ private void initIncludeJars() {
String includeJarsString = null;;
for (WebComponentDescriptor wcd: wbd.getWebComponentDescriptors()) {
if ("jsp".equals(wcd.getCanonicalName())) {
if (OLD_PAYARA5_JSP_SERVLET.equals(wcd.getWebComponentImplementation())) {
wcd.setWebComponentImplementation(NEW_PAYARA6_JSP_SERVLET);
}
InitializationParameter initp =
wcd.getInitializationParameterByName("system-jar-includes");
if (initp != null) {
includeJarsString = initp.getValue();
includeJarsString = adjustJars(initp.getValue());
break;
}
}
Expand All @@ -344,6 +349,14 @@ private void initIncludeJars() {
}
}

private String adjustJars(String value) {
if (value.contains("javax.servlet.jsp")) {
return value.replace("javax.servlet.jsp.jstl.jar", "jakarta.servlet.jsp.jstl.jar")
.replace("javax.servlet.jsp.jar", "");
}
return value;
}

private boolean included(String path) {
for (String item: includeJars) {
if (path.contains(item)) {
Expand Down