fix: Update to JDK21 - EXO-71474 - Meeds-io/MIPs#91

Remove usage of SecurityManager as it is deprecated for removal in jdk21 Remove also usage of classes - SecurityHelper - PrivilegedSystemHelper - PrivilegedFileHelper - SecureList - SecureSet - SecureCollections These classes are here only to use securityManager, and as it is removed, it is no more necessary Resolves Meeds-io/MIPs#91
Meeds-io · May 16, 2024 · f6a6489 · f6a6489
1 parent 7259030
commit f6a6489
Show file tree

Hide file tree

Showing 22 changed files with 34 additions and 797 deletions.
diff --git a/exo.core.component.database/pom.xml b/exo.core.component.database/pom.xml
@@ -136,13 +136,7 @@
   </dependencies>
 
    <build>
-     <plugins>   
-         <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>@{argLine} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-            </configuration>
-         </plugin>
+     <plugins>
          <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>

diff --git a/...ore.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java b/...ore.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java
@@ -18,15 +18,12 @@
  */
 package org.exoplatform.services.database;
 
-import org.exoplatform.commons.utils.SecurityHelper;
 import org.exoplatform.services.database.table.IDGenerator;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 
-import java.security.PrivilegedExceptionAction;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
 
 import javax.sql.DataSource;
 
@@ -96,14 +93,7 @@ public class ExoDatasource
    public ExoDatasource(final DataSource ds) throws Exception
    {
       xaDatasource_ = ds;
-      DatabaseMetaData metaData =
-         SecurityHelper.doPrivilegedSQLExceptionAction(new PrivilegedExceptionAction<DatabaseMetaData>()
-         {
-            public DatabaseMetaData run() throws SQLException
-            {
-               return ds.getConnection().getMetaData();
-            }
-         });
+      DatabaseMetaData metaData = ds.getConnection().getMetaData();
 
       databaseName_ = metaData.getDatabaseProductName();
       databaseVersion_ = metaData.getDatabaseProductVersion();

diff --git a/...component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java b/...component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java
@@ -20,7 +20,6 @@
 
 import org.exoplatform.commons.utils.ClassLoading;
 import org.exoplatform.commons.utils.IOUtil;
-import org.exoplatform.commons.utils.SecurityHelper;
 import org.exoplatform.container.configuration.ConfigurationException;
 import org.exoplatform.container.configuration.ConfigurationManager;
 import org.exoplatform.container.xml.InitParams;
@@ -31,7 +30,6 @@
 import org.exoplatform.services.database.utils.JDBCUtils;
 
 import java.io.IOException;
-import java.security.PrivilegedExceptionAction;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -446,14 +444,8 @@ private Connection openConnection() throws DBCreatorException
       {
          ClassLoading.forName(connectionProperties.get(DRIVER_NAME), this);
 
-         conn = SecurityHelper.doPrivilegedSQLExceptionAction(new PrivilegedExceptionAction<Connection>()
-         {
-            public Connection run() throws Exception
-            {
-               return DriverManager.getConnection(serverUrl, connectionProperties.get(USERNAME),
-                  connectionProperties.get(PASSWORD));
-            }
-         });
+         conn = DriverManager.getConnection(serverUrl, connectionProperties.get(USERNAME),
+                                            connectionProperties.get(PASSWORD));
 
          return conn;
       }

diff --git a/...t.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java b/...t.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java
@@ -30,8 +30,6 @@
 import org.hibernate.cfg.Configuration;
 
 import org.exoplatform.commons.exception.ObjectNotFoundException;
-import org.exoplatform.commons.utils.PrivilegedSystemHelper;
-import org.exoplatform.commons.utils.SecurityHelper;
 import org.exoplatform.container.ExoContainer;
 import org.exoplatform.container.component.ComponentRequestLifecycle;
 import org.exoplatform.container.xml.InitParams;
@@ -64,11 +62,7 @@ public class HibernateServiceImpl implements HibernateService, ComponentRequestL
   public HibernateServiceImpl(InitParams initParams) {
     threadLocal_ = new ThreadLocal<Session>();
     PropertiesParam param = initParams.getPropertiesParam("hibernate.properties");
-    conf_ = SecurityHelper.doPrivilegedAction(new PrivilegedAction<HibernateConfigurationImpl>() {
-      public HibernateConfigurationImpl run() {
-        return new HibernateConfigurationImpl();
-      }
-    });
+    conf_ = new HibernateConfigurationImpl();
     Iterator<?> properties = param.getPropertyIterator();
     while (properties.hasNext()) {
       Property p = (Property) properties.next();
@@ -79,7 +73,7 @@ public HibernateConfigurationImpl run() {
     String connectionURL = conf_.getProperty("hibernate.connection.url");
     if (connectionURL != null) {
       connectionURL =
-                    connectionURL.replace("${java.io.tmpdir}", PrivilegedSystemHelper.getProperty("java.io.tmpdir"));
+                    connectionURL.replace("${java.io.tmpdir}", System.getProperty("java.io.tmpdir"));
       conf_.setProperty("hibernate.connection.url", connectionURL);
     }
   }
@@ -93,12 +87,7 @@ public Configuration getHibernateConfiguration() {
    */
   public SessionFactory getSessionFactory() {
     if (sessionFactory_ == null) {
-      sessionFactory_ = SecurityHelper.doPrivilegedAction(new PrivilegedAction<SessionFactory>() {
-        public SessionFactory run() {
-          SessionFactory factory = conf_.buildSessionFactory();
-          return factory;
-        }
-      });
+      sessionFactory_ = conf_.buildSessionFactory();
     }
 
     return sessionFactory_;

diff --git a/.../src/main/java/org/exoplatform/services/database/impl/XAPoolTxSupportDatabaseService.java b/.../src/main/java/org/exoplatform/services/database/impl/XAPoolTxSupportDatabaseService.java
@@ -20,14 +20,12 @@
 
 import org.enhydra.jdbc.pool.StandardXAPoolDataSource;
 import org.enhydra.jdbc.standard.StandardXADataSource;
-import org.exoplatform.commons.utils.SecurityHelper;
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.container.xml.PropertiesParam;
 import org.exoplatform.services.database.DatabaseService;
 import org.exoplatform.services.database.ExoDatasource;
 import org.exoplatform.services.transaction.TransactionService;
 
-import java.security.PrivilegedAction;
 import java.sql.Connection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -96,13 +94,7 @@ public TransactionService getTransactionService() throws Exception
 
    private DataSource createDatasource(Map<String, String> props) throws Exception
    {
-      StandardXADataSource ds = SecurityHelper.doPrivilegedAction(new PrivilegedAction<StandardXADataSource>()
-      {
-         public StandardXADataSource run()
-         {
-            return new StandardXADataSource();
-         }
-      });
+      StandardXADataSource ds = new StandardXADataSource();
 
       ds.setDriverName(props.get("connection.driver"));
       ds.setUrl(props.get("connection.url"));

diff --git a/...onent.database/src/main/java/org/exoplatform/services/database/utils/DialectDetecter.java b/...onent.database/src/main/java/org/exoplatform/services/database/utils/DialectDetecter.java
@@ -18,11 +18,9 @@
  */
 package org.exoplatform.services.database.utils;
 
-import org.exoplatform.commons.utils.SecurityHelper;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 
-import java.security.PrivilegedExceptionAction;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
 
@@ -51,14 +49,7 @@ public class DialectDetecter
     */
    public static String detect(final DatabaseMetaData metaData) throws SQLException
    {
-      final String databaseName =
-         SecurityHelper.doPrivilegedSQLExceptionAction(new PrivilegedExceptionAction<String>()
-         {
-            public String run() throws Exception
-            {
-               return metaData.getDatabaseProductName();
-            }
-         });
+      final String databaseName = metaData.getDatabaseProductName();
 
       if ("HSQL Database Engine".equals(databaseName))
       {

diff --git a/...e.component.database/src/main/java/org/exoplatform/services/database/utils/JDBCUtils.java b/...e.component.database/src/main/java/org/exoplatform/services/database/utils/JDBCUtils.java
@@ -18,11 +18,9 @@
  */
 package org.exoplatform.services.database.utils;
 
-import org.exoplatform.commons.utils.SecurityHelper;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 
-import java.security.PrivilegedExceptionAction;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -272,13 +270,7 @@ public static String getAppropriateCharType(DataSource dataSource) throws SQLExc
     */
    public static String resolveDialect(final DataSource dataSource) throws SQLException
    {
-      Connection jdbcConn = SecurityHelper.doPrivilegedSQLExceptionAction(new PrivilegedExceptionAction<Connection>()
-      {
-         public Connection run() throws Exception
-         {
-            return dataSource.getConnection();
-         }
-      });
+      Connection jdbcConn = dataSource.getConnection();
 
       try
       {

diff --git a/exo.core.component.organization.api/pom.xml b/exo.core.component.organization.api/pom.xml
@@ -97,12 +97,6 @@
          </testResource>
       </testResources>
       <plugins>
-         <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>@{argLine} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-            </configuration>
-         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>

diff --git a/...groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptInstantiator.java b/...groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptInstantiator.java
@@ -24,7 +24,6 @@
 import org.codehaus.groovy.control.CompilationFailedException;
 
 import org.exoplatform.commons.utils.IOUtil;
-import org.exoplatform.commons.utils.SecurityHelper;
 import org.exoplatform.container.ExoContainer;
 import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.container.component.ComponentPlugin;
@@ -136,26 +135,14 @@ public Object instantiateScript(InputStream stream, String name) throws IOExcept
       GroovyClassLoader loader;
       if (mapping.size() > 0)
       {
-         JarJarClassLoader jarjarLoader = SecurityHelper.doPrivilegedAction(new PrivilegedAction<JarJarClassLoader>()
-         {
-            public JarJarClassLoader run()
-            {
-               return new JarJarClassLoader();
-            }
-         });
+         JarJarClassLoader jarjarLoader = new JarJarClassLoader();
 
          jarjarLoader.addMapping(mapping);
          loader = jarjarLoader;
       }
       else
       {
-         loader = SecurityHelper.doPrivilegedAction(new PrivilegedAction<GroovyClassLoader>()
-         {
-            public GroovyClassLoader run()
-            {
-               return new GroovyClassLoader();
-            }
-         });
+         loader = new GroovyClassLoader();
       }
       return instantiateScript(stream, name, loader);
    }
@@ -181,40 +168,8 @@ public Object instantiateScript(final InputStream stream, final String name, Gro
          loader = new GroovyClassLoader();
       }
       Class<?> clazz = null;
-      try
-      {
-         final GroovyClassLoader fLoader = loader;
-         clazz = SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Class<?>>()
-         {
-            public Class<?> run() throws Exception
-            {
-               if (name != null && name.length() > 0)
-               {
-                  return fLoader.parseClass(stream, name);
-               }
-               else
-               {
-                  return fLoader.parseClass(IOUtil.getStreamContentAsString(stream));
-               }
-            }
-         });
-      }
-      catch (PrivilegedActionException pae)
-      {
-         Throwable cause = pae.getCause();
-         if (cause instanceof CompilationFailedException)
-         {
-            throw new IOException("Error occurs when parse stream, compiler error:\n " + cause.getMessage(), cause);
-         }
-         else if (cause instanceof RuntimeException)
-         {
-            throw (RuntimeException)cause;
-         }
-         else
-         {
-            throw new RuntimeException(cause);
-         }
-      }
+      final GroovyClassLoader fLoader = loader;
+      clazz = fLoader.parseClass(IOUtil.getStreamContentAsString(stream));
 
       try
       {
@@ -253,13 +208,7 @@ public Object instantiateScript(final GroovyCodeSource codeSource, GroovyClassLo
       }
 
       final GroovyClassLoader fLoader = loader;
-      Class<?> clazz = SecurityHelper.doPrivilegedAction(new PrivilegedAction<Class<?>>()
-      {
-         public Class<?> run()
-         {
-            return fLoader.parseClass(codeSource);
-         }
-      });
+      Class<?> clazz = fLoader.parseClass(codeSource);
 
       try
       {

diff --git a/...groovy/src/main/java/org/exoplatform/services/script/groovy/jarjar/JarJarClassLoader.java b/...groovy/src/main/java/org/exoplatform/services/script/groovy/jarjar/JarJarClassLoader.java
@@ -29,10 +29,8 @@
 import org.codehaus.groovy.control.CompilerConfiguration;
 import org.codehaus.groovy.control.Phases;
 import org.codehaus.groovy.control.SourceUnit;
-import org.exoplatform.commons.utils.SecurityHelper;
 
 import java.security.CodeSource;
-import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
@@ -98,13 +96,7 @@ protected CompilationUnit createCompilationUnit(final CompilerConfiguration comp
       final CodeSource codeSource)
    {
       //
-      final CompilationUnit unit = SecurityHelper.doPrivilegedAction(new PrivilegedAction<CompilationUnit>()
-      {
-         public CompilationUnit run()
-         {
-            return JarJarClassLoader.super.createCompilationUnit(compilerConfiguration, codeSource);
-         }
-      });
+      final CompilationUnit unit = JarJarClassLoader.super.createCompilationUnit(compilerConfiguration, codeSource);
 
       //
       unit.addPhaseOperation(new CompilationUnit.PrimaryClassNodeOperation()
@@ -148,12 +140,6 @@ public void call(SourceUnit sourceUnit, GeneratorContext generatorContext, Class
 
    static protected JarJarClassLoader createJarJarClassLoaderInPrivilegedMode(final ClassLoader classLoader)
    {
-      return SecurityHelper.doPrivilegedAction(new PrivilegedAction<JarJarClassLoader>()
-      {
-         public JarJarClassLoader run()
-         {
-            return new JarJarClassLoader(classLoader);
-         }
-      });
+      return new JarJarClassLoader(classLoader);
    }
 }
diff --git a/...script.groovy/src/test/java/org/exoplatform/services/script/groovy/jarjar/TestScript.java b/...script.groovy/src/test/java/org/exoplatform/services/script/groovy/jarjar/TestScript.java
@@ -23,8 +23,6 @@
 import junit.framework.Assert;
 import junit.framework.AssertionFailedError;
 
-import org.exoplatform.commons.utils.PrivilegedSystemHelper;
-
 import java.io.IOException;
 import java.net.URL;
 
@@ -54,7 +52,7 @@ public Object execute(Mapping mapping)
       mapping.configure(loader);
 
       // Obtain script class
-      URL url = PrivilegedSystemHelper.getResource("jarjar/" + name);
+      URL url = Thread.currentThread().getContextClassLoader().getResource("jarjar/" + name);
       Assert.assertNotNull(url);
       GroovyCodeSource gcs;
       try

diff --git a/exo.core.component.security.core/pom.xml b/exo.core.component.security.core/pom.xml
@@ -61,12 +61,6 @@
 
    <build>
       <plugins>
-         <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>@{argLine} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-            </configuration>
-         </plugin>
          <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>