Merge pull request #62 from italiangrid/VOMS-883

Fix hr.properties parsing
italiangrid · Mar 22, 2021 · 7260586 · 7260586
2 parents 884e70a + 5fa1ad5
commit 7260586
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 8 deletions.
diff --git a/...n-server/src/main/java/org/glite/security/voms/admin/integration/cern/HrDbProperties.java b/...n-server/src/main/java/org/glite/security/voms/admin/integration/cern/HrDbProperties.java
@@ -187,7 +187,8 @@ public static final HrDbProperties fromProperties(Properties properties) {
     }
 
     if (properties.containsKey(MEMBERSHIP_CHECK_ENABLED_KEY)) {
-      config.getMembershipCheck().setEnabled(Boolean.parseBoolean(MEMBERSHIP_CHECK_ENABLED_KEY));
+      config.getMembershipCheck()
+        .setEnabled(Boolean.parseBoolean(properties.getProperty(MEMBERSHIP_CHECK_ENABLED_KEY)));
     }
 
     config.getApi().setEndpoint(properties.getProperty(API_ENDPOINT_KEY));

diff --git a/voms-admin-server/src/test/java/integration/hr/HrDbConfiguratorTests.java b/voms-admin-server/src/test/java/integration/hr/HrDbConfiguratorTests.java
@@ -99,19 +99,37 @@ public void setup() {
     configurator.setUserDao(dao);
     configurator.setClock(CLOCK);
 
-    when(vomsConfig.getConfigurationDirectoryPath()).thenReturn("src/test/resources/cern/config");
-    when(vomsConfig.getExternalValidatorProperty(eq("orgdb"), anyString(), anyString()))
-      .thenReturn("src/test/resources/cern/config/orgdb.properties");
+    when(vomsConfig.getConfigurationDirectoryPath())
+      .thenReturn("src/test/resources/cern/disabled-task");
+    when(vomsConfig.getExternalValidatorProperty(eq("orgdb"), eq("configFile"), anyString()))
+      .thenReturn("src/test/resources/cern/disabled-task/hr.properties");
     when(apiFactory.newHrDbApiService(any())).thenReturn(api);
     when(validatorFactory.newHrDbRequestValidator(any(), any())).thenReturn(validator);
     when(syncTaskFactory.buildSyncTask(any(), any(), any(), any())).thenReturn(syncTask);
   }
 
   @Test
-  public void testConfigurationFileIsFoundAndParsed() throws VOMSPluginConfigurationException {
+  public void testDisabledConfigurationFileIsFoundAndParsed()
+      throws VOMSPluginConfigurationException {
+    configurator.configure();
+    verifyZeroInteractions(executorService);// no interactions as periodic sync is disabled
+    verifyZeroInteractions(syncTaskFactory);// no interactions as periodic sync is disabled
+    verify(manager).setRequestValidationContext(Mockito.eq(validator));
+  }
+
+  @Test
+  public void testEnabledConfigurationFileIsFoundAndParsed()
+      throws VOMSPluginConfigurationException {
+    when(vomsConfig.getConfigurationDirectoryPath())
+      .thenReturn("src/test/resources/cern/enabled-task");
+    when(vomsConfig.getExternalValidatorProperty(eq("orgdb"), eq("configFile"), anyString()))
+      .thenReturn("src/test/resources/cern/enabled-task/hr.properties");
     configurator.configure();
-    verifyZeroInteractions(executorService);
-    verifyZeroInteractions(syncTaskFactory);
+
+    verify(executorService).scheduleAtFixedRate(isA(DatabaseTransactionTaskWrapper.class),
+        Mockito.anyLong(), Mockito.eq(TimeUnit.HOURS.toSeconds(12)),
+        Mockito.eq(TimeUnit.SECONDS));
+
     verify(manager).setRequestValidationContext(Mockito.eq(validator));
   }
 

diff --git a/voms-admin-server/src/test/java/integration/hr/HrDbPropertiesTest.java b/voms-admin-server/src/test/java/integration/hr/HrDbPropertiesTest.java
@@ -17,9 +17,13 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.Properties;
 
 import org.glite.security.voms.admin.integration.cern.HrDbError;
@@ -71,6 +75,29 @@ public void testValueParsing() {
     assertThat(hrConfig.getMembershipCheck().getPeriodInSeconds(), is(86400L));
   }
 
+
+  @Test
+  public void testFileParsing() throws FileNotFoundException, IOException {
+
+    Properties props = new Properties();
+    props
+      .load(new FileInputStream(new File("src/test/resources/cern/enabled-task/hr.properties")));
+
+    HrDbProperties hrDbProps = HrDbProperties.fromProperties(props);
+
+    assertThat(hrDbProps.getExperimentName(), is("cms"));
+    assertThat(hrDbProps.getMembershipCheck().isEnabled(), is(true));
+    assertThat(hrDbProps.getMembershipCheck().getStartHour(), is(4));
+    assertThat(hrDbProps.getMembershipCheck().isRunAtStartup(), is(false));
+    assertThat(hrDbProps.getApi().getEndpoint(), is("http://localhost:8080"));
+    assertThat(hrDbProps.getApi().getUsername(), is("user"));
+    assertThat(hrDbProps.getApi().getPassword(), is("password"));
+    assertThat(hrDbProps.getApi().getTimeoutInSeconds(), is(2L));
+
+
+
+  }
+
   @Test
   public void testApiTimeoutChecks() {
     Properties props = new Properties();

diff --git a/...st/resources/cern/config/orgdb.properties → ...esources/cern/disabled-task/hr.properties b/...st/resources/cern/config/orgdb.properties → ...esources/cern/disabled-task/hr.properties
diff --git a/voms-admin-server/src/test/resources/cern/enabled-task/hr.properties b/voms-admin-server/src/test/resources/cern/enabled-task/hr.properties
@@ -0,0 +1,8 @@
+ experiment=cms
+ membership_check.enabled=true
+ membership_check.start_hour=4
+ membership_check.run_at_startup=false
+ api.endpoint=http://localhost:8080
+ api.username=user
+ api.password=password
+ api.timeout_secs=2