Merge pull request #71 from arjantijms/remove_security_manager_and_de…

…precated Remove security manager support and other deprecated items.
eclipse-ee4j · Aug 20, 2024 · 7905de0 · 7905de0
2 parents 64ce5d1 + 17f21c8
commit 7905de0
Show file tree

Hide file tree

Showing 43 changed files with 437 additions and 906 deletions.
diff --git a/pom.xml b/pom.xml
@@ -166,7 +166,7 @@
                 <version>3.13.0</version>
                 <configuration>
                     <release>17</release>
-                    <compilerArgument>-Xlint:unchecked</compilerArgument>
+                    <compilerArgument>-Xlint:all</compilerArgument>
                 </configuration>
             </plugin>
 

diff --git a/src/main/java/org/glassfish/wasp/Constants.java b/src/main/java/org/glassfish/wasp/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
@@ -187,11 +187,6 @@ public class Constants {
     // other modules, and therefore requires special caution whenever it is changed.
     public static final String JSP_ERROR_HANDLED = "org.glassfish.jsp.error_handled";
 
-    /**
-     * Has security been turned on?
-     */
-    public static final boolean IS_SECURITY_ENABLED = System.getSecurityManager() != null;
-
     /**
      * The name of the JSP engine. Used for X-Powered-By identification in the response header
      */

diff --git a/src/main/java/org/glassfish/wasp/JspC.java b/src/main/java/org/glassfish/wasp/JspC.java
@@ -1,8 +1,7 @@
 /*
- * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +18,9 @@
 
 package org.glassfish.wasp;
 
+// START GlassFish 750
+import jakarta.servlet.jsp.tagext.TagLibraryInfo;
+
 import java.io.BufferedReader;
 import java.io.CharArrayWriter;
 import java.io.File;
@@ -59,9 +61,6 @@
 import org.glassfish.wasp.servlet.JspCServletContext;
 import org.glassfish.wasp.xmlparser.ParserUtils;
 
-// START GlassFish 750
-import jakarta.servlet.jsp.tagext.TagLibraryInfo;
-
 
 /**
  * Shell for the jspc compiler. Handles all options associated with the command line and creates compilation contexts
@@ -217,8 +216,6 @@ public class JspC implements Options {
 
     private HashMap<String, WaspException> jspErrors = new HashMap<>();
 
-    private static String myJavaVersion = System.getProperty("java.specification.version");
-
     private boolean ignoreJspFragmentErrors = false;
     private Set<String> dependents = new HashSet<>();
 
@@ -550,7 +547,7 @@ public File getScratchDir() {
         return scratchDir;
     }
 
-    public Class getJspCompilerPlugin() {
+    public Class<?> getJspCompilerPlugin() {
         // we don't compile, so this is meaningless
         return null;
     }
@@ -1388,7 +1385,7 @@ private void initClassLoader(JspCompilationContext clctxt) throws IOException {
             String path = tokenizer.nextToken();
             try {
                 File libFile = new File(path);
-                urls.add(libFile.toURL());
+                urls.add(libFile.toURI().toURL());
             } catch (IOException ioe) {
                 // Failing a toCanonicalPath on a file that
                 // exists() should be a JVM regression test,
@@ -1403,7 +1400,7 @@ private void initClassLoader(JspCompilationContext clctxt) throws IOException {
             try {
                 if (classes.exists()) {
                     classPath = classPath + File.pathSeparator + classes.getCanonicalPath();
-                    urls.add(classes.getCanonicalFile().toURL());
+                    urls.add(classes.getCanonicalFile().toURI().toURL());
                 }
             } catch (IOException ioe) {
                 // failing a toCanonicalPath on a file that
@@ -1428,7 +1425,7 @@ private void initClassLoader(JspCompilationContext clctxt) throws IOException {
                     try {
                         File libFile = new File(lib, libs[i]);
                         classPath = classPath + File.pathSeparator + libFile.getCanonicalPath();
-                        urls.add(libFile.getCanonicalFile().toURL());
+                        urls.add(libFile.getCanonicalFile().toURI().toURL());
                     } catch (IOException ioe) {
                         // failing a toCanonicalPath on a file that
                         // exists() should be a JVM regression test,
@@ -1440,7 +1437,7 @@ private void initClassLoader(JspCompilationContext clctxt) throws IOException {
         }
 
         // What is this ??
-        urls.add(new File(clctxt.getRealPath("/")).getCanonicalFile().toURL());
+        urls.add(new File(clctxt.getRealPath("/")).getCanonicalFile().toURI().toURL());
 
         URL urlsA[] = new URL[urls.size()];
         urls.toArray(urlsA);
@@ -1519,7 +1516,7 @@ private ClassLoader initSystemClassLoader() throws IOException {
         ArrayList<URL> urls = new ArrayList<>();
         StringTokenizer tokenizer = new StringTokenizer(sysClassPath, File.pathSeparator);
         while (tokenizer.hasMoreTokens()) {
-            urls.add(new File(tokenizer.nextToken()).toURL());
+            urls.add(new File(tokenizer.nextToken()).toURI().toURL());
         }
 
         if (urls.size() == 0) {

diff --git a/src/main/java/org/glassfish/wasp/JspCompilationContext.java b/src/main/java/org/glassfish/wasp/JspCompilationContext.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to Eclipse Foundation.
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
@@ -17,6 +18,9 @@
 
 package org.glassfish.wasp;
 
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.jsp.tagext.TagInfo;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
@@ -32,11 +36,8 @@
 import org.glassfish.wasp.compiler.Localizer;
 import org.glassfish.wasp.compiler.ServletWriter;
 import org.glassfish.wasp.compiler.TagLibraryInfoImpl;
-import org.glassfish.wasp.servlet.WaspLoader;
 import org.glassfish.wasp.servlet.JspServletWrapper;
-
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.jsp.tagext.TagInfo;
+import org.glassfish.wasp.servlet.WaspLoader;
 
 /**
  * A place holder for various things that are used through out the JSP engine. This is a per-request/per-context data
@@ -602,7 +603,7 @@ public Class<?> load() throws WaspException, ClassNotFoundException {
     }
 
     public ClassLoader getJspLoader() {
-        return new WaspLoader(new URL[] { baseUrl }, getClassLoader(), rctxt.getPermissionCollection(), rctxt.getCodeSource(), rctxt.getBytecodes());
+        return new WaspLoader(new URL[] { baseUrl }, getClassLoader(), rctxt.getBytecodes());
     }
 
     public void makeOutputDir(String outdir) {
@@ -631,7 +632,7 @@ private void createOutputDir() {
             // Append servlet or tag handler path to scratch dir
             File f = new File(options.getScratchDir(), path);
             makeOutputDir(f.getPath() + File.separator);
-            baseUrl = options.getScratchDir().toURL();
+            baseUrl = options.getScratchDir().toURI().toURL();
         } catch (Exception e) {
             throw new IllegalStateException("No output directory: " + e.getMessage());
         }

diff --git a/src/main/java/org/glassfish/wasp/compiler/JspDocumentParser.java b/src/main/java/org/glassfish/wasp/compiler/JspDocumentParser.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to Eclipse Foundation.
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
@@ -17,26 +18,24 @@
 
 package org.glassfish.wasp.compiler;
 
+import jakarta.servlet.jsp.tagext.TagFileInfo;
+import jakarta.servlet.jsp.tagext.TagInfo;
+import jakarta.servlet.jsp.tagext.TagLibraryInfo;
+
 import java.io.CharArrayWriter;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.AccessController;
-// START GlassFish 750
 import java.util.Iterator;
 import java.util.List;
-// START GlassFish 750
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.jar.JarFile;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.glassfish.wasp.Constants;
-import org.glassfish.wasp.WaspException;
 import org.glassfish.wasp.JspCompilationContext;
-import org.glassfish.wasp.security.PrivilegedGetTccl;
-import org.glassfish.wasp.security.PrivilegedSetTccl;
+import org.glassfish.wasp.WaspException;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
@@ -47,10 +46,6 @@
 import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.DefaultHandler;
 
-import jakarta.servlet.jsp.tagext.TagFileInfo;
-import jakarta.servlet.jsp.tagext.TagInfo;
-import jakarta.servlet.jsp.tagext.TagLibraryInfo;
-
 /**
  * Class implementing a parser for a JSP document, that is, a JSP page in XML syntax.
  *
@@ -996,20 +991,10 @@ private void checkPrefix(String uri, String qName) {
      */
     private static SAXParser getSAXParser(boolean validating, JspDocumentParser jspDocParser) throws Exception {
 
-        ClassLoader original;
-        if (Constants.IS_SECURITY_ENABLED) {
-            PrivilegedGetTccl pa = new PrivilegedGetTccl();
-            original = AccessController.doPrivileged(pa);
-        } else {
-            original = Thread.currentThread().getContextClassLoader();
-        }
+        ClassLoader original = Thread.currentThread().getContextClassLoader();
+
         try {
-            if (Constants.IS_SECURITY_ENABLED) {
-                PrivilegedSetTccl pa = new PrivilegedSetTccl(JspDocumentParser.class.getClassLoader());
-                AccessController.doPrivileged(pa);
-            } else {
-                Thread.currentThread().setContextClassLoader(JspDocumentParser.class.getClassLoader());
-            }
+            Thread.currentThread().setContextClassLoader(JspDocumentParser.class.getClassLoader());
 
             SAXParserFactory factory = SAXParserFactory.newInstance();
             factory.setNamespaceAware(true);
@@ -1026,12 +1011,7 @@ private static SAXParser getSAXParser(boolean validating, JspDocumentParser jspD
 
             return saxParser;
         } finally {
-            if (Constants.IS_SECURITY_ENABLED) {
-                PrivilegedSetTccl pa = new PrivilegedSetTccl(original);
-                AccessController.doPrivileged(pa);
-            } else {
-                Thread.currentThread().setContextClassLoader(original);
-            }
+            Thread.currentThread().setContextClassLoader(original);
         }
     }