Merge branch 'master' into dev

gbif · Mar 26, 2024 · 2c04df0 · 2c04df0
2 parents 8f08f1a + 60c3147
commit 2c04df0
Show file tree

Hide file tree

Showing 22 changed files with 67 additions and 42 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.gbif.registry</groupId>
   <artifactId>registry-parent</artifactId>
-  <version>3.96.0-SNAPSHOT</version>
+  <version>3.96.2-SNAPSHOT</version>
   <name>GBIF Registry Parent</name>
   <description>GBIF Registry project</description>
 
@@ -84,7 +84,7 @@
     <spring-cloud-sleuth.version>2.2.8.RELEASE</spring-cloud-sleuth.version>
 
     <!-- GBIF -->
-    <gbif-api.version>1.14.0</gbif-api.version>
+    <gbif-api.version>1.14.2</gbif-api.version>
     <gbif-common.version>0.59</gbif-common.version>
     <gbif-common-mybatis.version>1.3</gbif-common-mybatis.version>
     <gbif-common-ws.version>1.26</gbif-common-ws.version>

diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.gbif.registry</groupId>
     <artifactId>registry-parent</artifactId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>registry-cli</artifactId>
@@ -29,7 +29,7 @@
     <guava.version>18.0</guava.version>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -13,9 +13,7 @@
   <properties>
     <main.basedir>${project.parent.basedir}</main.basedir>
 
-    <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
-    </sonar.coverage.jacoco.xmlReportPaths>
+    <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 
   <dependencies>

diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-events/pom.xml b/registry-events/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-identity/src/main/java/org/gbif/registry/identity/service/IdentityServiceImpl.java b/registry-identity/src/main/java/org/gbif/registry/identity/service/IdentityServiceImpl.java
@@ -208,7 +208,12 @@ public PagingResponse<GbifUser> search(
   @Override
   @Nullable
   public GbifUser authenticate(String username, String password) {
-    if (Strings.isNullOrEmpty(username) || password == null) {
+    if (Strings.isNullOrEmpty(username) || Strings.isNullOrEmpty(password)) {
+      return null;
+    }
+
+    // Avoid DOS route with an attacker trying extremely long passwords.
+    if (!PASSWORD_LENGTH_RANGE.contains(password.length())) {
       return null;
     }
 

diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-search/pom.xml b/registry-search/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-security/pom.xml b/registry-security/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-service/pom.xml b/registry-service/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <sonar.coverage.jacoco.xmlReportPaths>
-      ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 

diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml
@@ -4,14 +4,18 @@
   <parent>
     <groupId>org.gbif.registry</groupId>
     <artifactId>registry-parent</artifactId>
-    <version>3.96.0-SNAPSHOT</version>
+    <version>3.96.2-SNAPSHOT</version>
   </parent>
   <artifactId>registry-ws</artifactId>
   <name>GBIF Registry Webservices</name>
 
   <properties>
     <main.basedir>${project.parent.basedir}</main.basedir>
     <start-class>org.gbif.registry.ws.RegistryWsApplication</start-class>
+
+    <sonar.coverage.jacoco.xmlReportPaths>
+      ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml
+    </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
 
   <dependencies>

diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/EnumerationResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/EnumerationResource.java
@@ -14,8 +14,15 @@
 package org.gbif.registry.ws.resources;
 
 import org.gbif.api.annotation.NullToNotFound;
+import org.gbif.api.model.checklistbank.search.NameUsageSearchParameter;
 import org.gbif.api.model.literature.LiteratureType;
+import org.gbif.api.model.literature.search.LiteratureSearchParameter;
+import org.gbif.api.model.occurrence.DownloadFormat;
+import org.gbif.api.model.occurrence.geo.DistanceUnit;
+import org.gbif.api.model.occurrence.search.OccurrenceSearchParameter;
 import org.gbif.api.model.pipelines.PipelineStep;
+import org.gbif.api.model.registry.EndorsementStatus;
+import org.gbif.api.model.registry.search.DatasetSearchParameter;
 import org.gbif.api.util.VocabularyUtils;
 import org.gbif.api.vocabulary.Country;
 import org.gbif.api.vocabulary.Extension;
@@ -188,8 +195,19 @@ private static Map<String, Enum<?>[]> enumerations() {
         new CachingMetadataReaderFactory(resourcePatternResolver);
 
     List<Class<? extends Serializable>> classes =
-        Arrays.asList(
-            Country.class, PreservationType.class, PipelineStep.class, LiteratureType.class);
+      Arrays.asList(
+        Country.class, // org.gbif.api.vocabulary
+        PreservationType.class, // org.gbif.api.vocabulary.collections
+        PipelineStep.class, // org.gbif.api.model.pipelines
+        LiteratureType.class, // org.gbif.api.model.literature
+        LiteratureSearchParameter.class, // org.gbif.api.model.literature.search
+        OccurrenceSearchParameter.class, // org.gbif.api.model.occurrence.search
+        DownloadFormat.class, // org.gbif.api.model.occurrence
+        DistanceUnit.class, // org.gbif.api.model.occurrence.geo
+        DatasetSearchParameter.class, // org.gbif.api.model.registry.search
+        EndorsementStatus.class, // org.gbif.api.model.registry
+        NameUsageSearchParameter.class // org.gbif.api.model.checklistbank.search
+      );
 
     ImmutableSortedMap<String, Enum<?>[]> result;
     try {