Merge pull request #75 from italiangrid/upgrade-struts

VOMS Admin v3.9.0 release

Jenkinsfile

@@ -3,14 +3,7 @@ def kubeLabel = getKubeLabel()
 
 pipeline {
 
-  agent {
-    kubernetes {
-      label "${kubeLabel}"
-      cloud 'Kube mwdevel'
-      defaultContainer 'runner'
-      inheritFrom 'ci-template'
-    }
-  }
+  agent none
 
   parameters {
     booleanParam(name: 'BUILD_DOCKER_IMAGES', defaultValue: false, 
@@ -27,13 +20,15 @@ pipeline {
   stages{
 
     stage('build') {
+      agent { label 'java11' }
       steps {
         git(url: 'https://github.com/italiangrid/voms-admin-server.git', branch: env.BRANCH_NAME)
         sh 'mvn -B -U -P prod,EMI clean package'
       }
     }
 
     stage('build-docker-images') {
+      agent { label 'docker' }
       when {
         expression { return params.BUILD_DOCKER_IMAGES }
       }

pom.xml

@@ -7,7 +7,7 @@
   <artifactId>voms-admin-parent</artifactId>
 
 
-  <version>3.8.1</version>
+  <version>3.9.0</version>
 
   <packaging>pom</packaging>
   <name>VOMS Admin Parent POM</name>

voms-admin-api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.italiangrid</groupId>
     <artifactId>voms-admin-parent</artifactId>
-    <version>3.8.1</version>
+    <version>3.9.0</version>
   </parent>
 
   <artifactId>voms-admin-api</artifactId>

voms-admin-server/pom.xml

@@ -26,7 +26,7 @@
 	<parent>
 		<groupId>org.italiangrid</groupId>
 		<artifactId>voms-admin-parent</artifactId>
-		<version>3.8.1</version>
+		<version>3.9.0</version>
 	</parent>
 
 	<artifactId>voms-admin-server</artifactId>
@@ -38,7 +38,7 @@
 		<api.version>${project.version}</api.version>
 		<interface-version>2.0.2</interface-version>
 
-		<struts.version>2.5.26</struts.version>
+		<struts.version>2.5.33</struts.version>
 		<struts.bootstrap.plugin.version>2.5.2</struts.bootstrap.plugin.version>
 		<struts.jquery.plugin.version>4.0.3</struts.jquery.plugin.version>
 		<hibernate.version>5.2.17.Final</hibernate.version>
@@ -316,7 +316,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-email</artifactId>
-			<version>1.1</version>
+			<version>1.5</version>
 		</dependency>
 
 		<dependency>

voms-admin-server/src/main/java/org/glite/security/voms/admin/configuration/VOMSConfiguration.java

@@ -15,7 +15,6 @@
  */
 package org.glite.security.voms.admin.configuration;
 
-import static org.glite.security.voms.admin.configuration.VOMSConfigurationConstants.PERMISSION_CACHE_DISABLE;
 import static org.glite.security.voms.admin.configuration.VOMSConfigurationConstants.PI_REQUIRED_FIELDS;
 import static org.glite.security.voms.admin.util.SysconfigUtil.SYSCONFIG_CONF_DIR;
 import static org.glite.security.voms.admin.util.SysconfigUtil.SYSCONFIG_DEFAULT_FILE_PATH;
@@ -1039,10 +1038,6 @@ public PEMCredential getServiceCredential() {
     return serviceCredential;
   }
 
-  public boolean permissionCacheDisabled() {
-    return config.getBoolean(PERMISSION_CACHE_DISABLE, false);
-  }
-
   public Set<String> getRequiredPersonalInfoFields() {
     String requiredFields =
         config.getString(PI_REQUIRED_FIELDS, VOMSConfigurationConstants.PI_REQUIRED_FIELDS_DEFAULT);

voms-admin-server/src/main/java/org/glite/security/voms/admin/configuration/VOMSConfigurationConstants.java

@@ -197,11 +197,6 @@ public interface VOMSConfigurationConstants {
    */
   public static final String SKIP_CA_CHECK = "voms.skip_ca_check";
 
-  /**
-   * Should permission cache be disabled?
-   */
-  public static final String PERMISSION_CACHE_DISABLE = "voms.permission_cache.disable";
-
   /**
    * comma-separated list of the personal information fields required at registration
    */

voms-admin-server/src/main/java/org/glite/security/voms/admin/core/VOMSService.java

@@ -36,7 +36,6 @@
 import org.glite.security.voms.admin.configuration.VOMSConfigurationException;
 import org.glite.security.voms.admin.core.tasks.CancelSignAUPTasksForExpiredUsersTask;
 import org.glite.security.voms.admin.core.tasks.ExpiredRequestsPurgerTask;
-import org.glite.security.voms.admin.core.tasks.PermissionCacheStatsLogger;
 import org.glite.security.voms.admin.core.tasks.PrintX509AAStatsTask;
 import org.glite.security.voms.admin.core.tasks.SignAUPReminderCheckTask;
 import org.glite.security.voms.admin.core.tasks.SystemTimeProvider;
@@ -52,9 +51,6 @@
 import org.glite.security.voms.admin.event.DebugEventLogListener;
 import org.glite.security.voms.admin.event.EventManager;
 import org.glite.security.voms.admin.event.auditing.AuditLog;
-import org.glite.security.voms.admin.event.permission_cache.AclEventsCleanPermissionCacheListener;
-import org.glite.security.voms.admin.event.permission_cache.MembershipEventsCleanPermissionCacheListener;
-import org.glite.security.voms.admin.event.permission_cache.UserEventsCleanPermissionCacheListener;
 import org.glite.security.voms.admin.integration.PluginManager;
 import org.glite.security.voms.admin.integration.cern.HrDbConfigurator;
 import org.glite.security.voms.admin.integration.orgdb.OrgDBConfigurator;
@@ -169,9 +165,6 @@ protected static void configureEventManager() {
     manager.register(CertificateRequestsNotificationDispatcher.instance());
     manager.register(MembershipRemovalNotificationDispatcher.instance());
     manager.register(SignAUPReminderDispatcher.instance());
-    manager.register(AclEventsCleanPermissionCacheListener.instance());
-    manager.register(UserEventsCleanPermissionCacheListener.instance());
-    manager.register(MembershipEventsCleanPermissionCacheListener.instance());
 
   }
 
@@ -212,8 +205,6 @@ protected static void startBackgroundTasks() {
         VOMSConfigurationConstants.MONITORING_USER_STATS_UPDATE_PERIOD,
         UserStatsTask.DEFAULT_PERIOD_IN_SECONDS);
 
-    es.scheduleAtFixedRate(new PermissionCacheStatsLogger(true), 1, 60, TimeUnit.SECONDS);
-
     int expiredUserCleanupBatchSize =
         conf.getInt(VOMSConfigurationConstants.EXPIRED_USER_CLEANUP_TASK_BATCH_SIZE, 10);