Merge pull request #580 from zextras/chore/merge-back-to-devel

chore: 24.12.0-SNAPSHOT + merge back to devel
zextras · Sep 4, 2024 · 5d83c48 · 5d83c48
2 parents cbfa8ae + dc8bd7a
commit 5d83c48
Show file tree

Hide file tree

Showing 14 changed files with 123 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,55 @@
 
 
+## [4.17.3](https://github.com/zextras/carbonio-mailbox/compare/4.17.2...4.17.3) (2024-09-03)
+
+
+### Bug Fixes
+
+* versioning ([#577](https://github.com/zextras/carbonio-mailbox/issues/577)) ([c6982c1](https://github.com/zextras/carbonio-mailbox/commit/c6982c1108b9fa0c8d59a18f4c9115220275dd1c))
+
+## [4.17.2](https://github.com/zextras/carbonio-mailbox/compare/4.17.1...4.17.2) (2024-09-02)
+
+
+### Bug Fixes
+
+* [CO-1442] remove Log4J2Plugins.dat from common ([#575](https://github.com/zextras/carbonio-mailbox/issues/575)) ([d3d5bab](https://github.com/zextras/carbonio-mailbox/commit/d3d5babda5a9e990c8afbc34f4c977f4895a74ca))
+
+## [4.17.1](https://github.com/zextras/carbonio-mailbox/compare/4.17.0...4.17.1) (2024-08-30)
+
+
+### Bug Fixes
+
+* CO-1443 access log ([edfdcd8](https://github.com/zextras/carbonio-mailbox/commit/edfdcd84a921ecab2d860dbea811c78d34e5b8aa))
+* rearrange handlers ([a63b0a6](https://github.com/zextras/carbonio-mailbox/commit/a63b0a629ef29d8a6ad525786d63ad8ff8e16b92))
+
+# [4.17.0](https://github.com/zextras/carbonio-mailbox/compare/4.16.3...4.17.0) (2024-08-26)
+
+
+### Bug Fixes
+
+* [CO-1179] UserServlet to properly return XML and scriptable attachments without defanging ([#530](https://github.com/zextras/carbonio-mailbox/issues/530)) ([2708e4d](https://github.com/zextras/carbonio-mailbox/commit/2708e4dab90ae71d6c2afb4d3a82d43551a970e5))
+* [CO-1180] Remove TNEF converter to prevent .dat attachment duplication ([#528](https://github.com/zextras/carbonio-mailbox/issues/528)) ([e36d1d9](https://github.com/zextras/carbonio-mailbox/commit/e36d1d960ee00ccb8b7fbd01e0f43ddb85597201))
+* [CO-1348] PreviewServlet avoid HTTP call to get attachment when available locally ([#555](https://github.com/zextras/carbonio-mailbox/issues/555)) ([1e222df](https://github.com/zextras/carbonio-mailbox/commit/1e222df6c0862d4f46ae3b950e86740242d22bfe))
+* carbonio-milter.service: class not found cause of classpath edits ([6b9a584](https://github.com/zextras/carbonio-mailbox/commit/6b9a58446a3ccf8cbf62b31848d5c08dfbf95f15))
+* **CO-1133:** fix amavis ldap attrs definition ([#533](https://github.com/zextras/carbonio-mailbox/issues/533)) ([5f75ce3](https://github.com/zextras/carbonio-mailbox/commit/5f75ce3ed893cb78d97112051819d5d79a9266d7))
+
+
+### Features
+
+* [CO-1089] Add carbonioFeatureOTPMgmtEnabled Attribute ([#538](https://github.com/zextras/carbonio-mailbox/issues/538)) ([faad780](https://github.com/zextras/carbonio-mailbox/commit/faad7805ffb5bb20f40422a8e595c3aa6d1c69cd))
+* [CO-1258] FileUploadServlet allow uploading huge attachments ([#563](https://github.com/zextras/carbonio-mailbox/issues/563)) ([d139f66](https://github.com/zextras/carbonio-mailbox/commit/d139f667ad5cd59ee0884671c1e5337e089b3dda))
+* [CO-1343] Update LDAP Module Configuration on upgrade ([#548](https://github.com/zextras/carbonio-mailbox/issues/548)) ([44cc588](https://github.com/zextras/carbonio-mailbox/commit/44cc5887f152cfa447411ec86be52c7c5ca92c0a))
+* [CO-1350] export http connection pool statistics to prometheus ([#551](https://github.com/zextras/carbonio-mailbox/issues/551)) ([ea87abb](https://github.com/zextras/carbonio-mailbox/commit/ea87abb3d7d0bd88627372441b0e6138e7280e2f))
+* [CO-1425] Improve argon2 and PID file migration for LDAP ([#567](https://github.com/zextras/carbonio-mailbox/issues/567)) ([fbdea5f](https://github.com/zextras/carbonio-mailbox/commit/fbdea5f708e1b7371f835fa3057db71f938bca99))
+* add ubuntu 24.04 (ubuntu-noble) support ([3f03e11](https://github.com/zextras/carbonio-mailbox/commit/3f03e11c4c48a0155eca806dfea3c0a8803bad83))
+* **CO-1295:** define new carbonioFeatureWscEnabled attribute ([#564](https://github.com/zextras/carbonio-mailbox/issues/564)) ([8ae839a](https://github.com/zextras/carbonio-mailbox/commit/8ae839a9395f76c527add7d0b6edf2a33c687194))
+* properly close soap client in tests ([#544](https://github.com/zextras/carbonio-mailbox/issues/544)) ([d6b5e66](https://github.com/zextras/carbonio-mailbox/commit/d6b5e66f16bd4d05e1752c7a0c78cafa0b4d2a60))
+
+
+### Reverts
+
+* Revert "refactor: remove mailboxd_directory (#549)" (#554) ([2b7d7ef](https://github.com/zextras/carbonio-mailbox/commit/2b7d7ef920ec9c36c57f0de00578a1eb795db8fb)), closes [#549](https://github.com/zextras/carbonio-mailbox/issues/549) [#554](https://github.com/zextras/carbonio-mailbox/issues/554) [#549](https://github.com/zextras/carbonio-mailbox/issues/549)
+
 ## [4.16.3](https://github.com/Zextras/carbonio-mailbox/compare/4.16.2...4.16.3) (2024-07-17)
 
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -9,11 +9,8 @@ def mvnCmd(String cmd) {
     sh 'mvn -B -s settings-jenkins.xml ' + profile + ' ' + cmd
 }
 def isBuildingTag() {
-    def changeSet = currentBuild.changeSets[0]
-    if (changeSet != null) {
-        return changeSet.getItems().any { item ->
-            item.comment.contains('refs/tags/')
-        }
+    if (env.TAG_NAME) {
+        return true
     }
     return false
 }
@@ -164,15 +161,17 @@ pipeline {
                 branch 'devel';
             }
             steps {
-                mvnCmd('$BUILD_PROPERTIES_PARAMS deploy -DskipTests=true -Pdev')
+                mvnCmd('$BUILD_PROPERTIES_PARAMS deploy -DskipTests=true')
             }
         }
         stage('Publish to maven') {
             when {
-                buildingTag()
+                expression {
+                    return isBuildingTag()
+                }
             }
             steps {
-                mvnCmd('$BUILD_PROPERTIES_PARAMS deploy -DskipTests=true -Pprod')
+                mvnCmd('$BUILD_PROPERTIES_PARAMS deploy -DskipTests=true')
             }
         }
         stage('Build deb/rpm') {
@@ -342,9 +341,8 @@ pipeline {
         }
         stage('Upload & Promotion Config') {
             when {
-                anyOf {
-                    branch 'release/*'
-                    buildingTag()
+                expression {
+                    return isBuildingTag()
                 }
             }
             steps {

diff --git a/common/pom.xml b/common/pom.xml
@@ -207,6 +207,18 @@
 
   <build>
     <plugins>
+      <!-- Fix for log4j: https://issues.apache.org/jira/browse/LOG4J2-673 -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.4.2</version>
+        <configuration>
+          <excludes>
+            <exclude>**/Log4j2Plugins.dat</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>

diff --git a/jython-libs/pom.xml b/jython-libs/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <artifactId>zm-mailbox</artifactId>
     <groupId>zextras</groupId>
-    <version>24.7.0-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/packages/appserver-conf/PKGBUILD b/packages/appserver-conf/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname="carbonio-appserver-conf"
-pkgver="4.16.3"
+pkgver="4.17.3"
 pkgrel="1"
 pkgdesc="Carbonio Mailbox Service Configuration"
 arch=('x86_64')

diff --git a/packages/appserver-db/PKGBUILD b/packages/appserver-db/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname="carbonio-appserver-db"
-pkgver="4.16.3"
+pkgver="4.17.3"
 pkgrel="1"
 pkgdesc="Carbonio Appserver DB Files"
 arch=('x86_64')

diff --git a/packages/appserver-service/PKGBUILD b/packages/appserver-service/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname="carbonio-appserver-service"
-pkgver="4.16.3"
+pkgver="4.17.3"
 pkgrel="1"
 pkgdesc="Carbonio Mailbox Service"
 arch=('x86_64')

diff --git a/packages/common-appserver-conf/PKGBUILD b/packages/common-appserver-conf/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname="carbonio-common-appserver-conf"
-pkgver="4.16.3"
+pkgver="4.17.3"
 pkgrel="1"
 pkgdesc="Carbonio Core Mailbox Configuration"
 arch=('x86_64')

diff --git a/packages/common-appserver-native-lib/PKGBUILD b/packages/common-appserver-native-lib/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname="carbonio-common-appserver-native-lib"
-pkgver="4.16.3"
+pkgver="4.17.3"
 pkgrel="1"
 pkgdesc="Carbonio Core Mailbox Native Libs"
 arch=('x86_64')

diff --git a/packages/directory-server/PKGBUILD b/packages/directory-server/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname="carbonio-directory-server"
-pkgver="4.16.3"
+pkgver="4.17.3"
 pkgrel="1"
 pkgdesc="An open-source, community-driven email server"
 maintainer="Zextras <packages@zextras.com>"

diff --git a/packages/mailbox-jar/PKGBUILD b/packages/mailbox-jar/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname="carbonio-mailbox-jar"
-pkgver="4.16.2"
+pkgver="4.17.3"
 pkgrel="1"
 pkgdesc="Carbonio Mailbox Jars"
 arch=('x86_64')

diff --git a/pom.xml b/pom.xml
@@ -370,45 +370,45 @@
       <dependency>
         <groupId>zextras</groupId>
         <artifactId>zm-common</artifactId>
-        <version>${revision}${changelist}</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>zextras</groupId>
         <artifactId>zm-client</artifactId>
-        <version>${revision}${changelist}</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>zextras</groupId>
         <artifactId>zm-soap</artifactId>
-        <version>${revision}${changelist}</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>zextras</groupId>
         <artifactId>zm-native</artifactId>
-        <version>${revision}${changelist}</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>zextras</groupId>
         <artifactId>zm-store</artifactId>
-        <version>${revision}${changelist}</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>zextras</groupId>
         <artifactId>zm-store</artifactId>
-        <version>${revision}${changelist}</version>
+        <version>${project.version}</version>
         <classifier>classes</classifier>
       </dependency>
       <dependency>
         <groupId>zextras</groupId>
         <artifactId>store-extra-runtime-dependencies</artifactId>
         <type>pom</type>
-        <version>${revision}${changelist}</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>zextras</groupId>
         <artifactId>carbonio-jetty-libs</artifactId>
         <type>pom</type>
-        <version>${revision}${changelist}</version>
+        <version>${project.version}</version>
         <exclusions>
           <exclusion>
             <artifactId>*</artifactId>
@@ -820,7 +820,7 @@
     <system-lambda.version>1.2.1</system-lambda.version>
     <!-- Maven revision: https://maven.apache.org/maven-ci-friendly.html -->
     <changelist>-SNAPSHOT</changelist>
-    <revision>24.9.0</revision>
+    <revision>24.12.0</revision>
     <mockserver.version>5.13.0</mockserver.version>
     <mariadb-java-client.version>2.7.3</mariadb-java-client.version>
   </properties>

diff --git a/store/src/main/java/com/zextras/mailbox/LikeXmlJettyServer.java b/store/src/main/java/com/zextras/mailbox/LikeXmlJettyServer.java
@@ -19,6 +19,7 @@
 import org.eclipse.jetty.server.HostHeaderCustomizer;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.NCSARequestLog;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
@@ -81,21 +82,19 @@ public Server build() throws InstantiationException {
       server.addConnector(createMtaAdminHttpsConnector(server));
       server.addConnector(createExtensionsHttpsConnector(server));
 
-      final ContextHandlerCollection contexts = new ContextHandlerCollection();
-        WebAppContext webAppContext = new WebAppContext(contexts, webApp, "/service");
-      webAppContext.setDescriptor(webDescriptor);
-       webAppContext.setThrowUnavailableOnStartupException(true);
-
 
-      final GzipHandler gzipHandler = new GzipHandler();
-      gzipHandler.setHandler(createRewriteHandler());
-      gzipHandler.setMinGzipSize(2048);
-      gzipHandler.setCompressionLevel(-1);
-      gzipHandler.setExcludedAgentPatterns(".*MSIE.6\\.0.*");
-      gzipHandler.setIncludedMethods("GET", "POST");
-      server.setHandler(gzipHandler);
-
-      server.setHandler(webAppContext);
+      final Handler webAppHandler = createWebAppHandler();
+       if (localServer.isHttpCompressionEnabled()) {
+         final GzipHandler gzipHandler = new GzipHandler();
+         gzipHandler.setHandler(webAppHandler);
+         gzipHandler.setMinGzipSize(2048);
+         gzipHandler.setCompressionLevel(-1);
+         gzipHandler.setExcludedAgentPatterns(".*MSIE.6\\.0.*");
+         gzipHandler.setIncludedMethods("GET", "POST");
+         server.setHandler(gzipHandler);
+       } else {
+         server.setHandler(webAppHandler);
+       }
 
       userHttpConnector.open();
       adminHttpsConnector.open();
@@ -121,7 +120,7 @@ public Builder withWebDescriptor(String webDescriptor) {
     }
 
 
-    private Handler createRewriteHandler() {
+    private Handler createWebAppHandler() {
       final RewriteHandler rewriteHandler = new RewriteHandler();
       rewriteHandler.setRewriteRequestURI(true);
       rewriteHandler.setRewritePathInfo(false);
@@ -170,7 +169,26 @@ private Handler createRewriteHandler() {
       rootRule2.setTerminating(true);
       rewriteHandler.addRule(rootRule2);
 
-      rewriteHandler.setHandler(new HandlerCollection(new ContextHandlerCollection(), new DefaultHandler(), new RequestLogHandler()));
+      final ContextHandlerCollection contexts = new ContextHandlerCollection();
+      WebAppContext webAppContext = new WebAppContext(contexts, webApp, "/service");
+      webAppContext.setDescriptor(webDescriptor);
+      webAppContext.setThrowUnavailableOnStartupException(true);
+
+      final String accessLogFileName = LC.zimbra_log_directory.value() + "/access_log.yyyy_mm_dd";
+      final NCSARequestLog ncsaRequestLog = new NCSARequestLog(accessLogFileName);
+      ncsaRequestLog.setLogDateFormat("dd/MMM/yyyy:HH:mm:ss:ms Z");
+      ncsaRequestLog.setRetainDays(30);
+      ncsaRequestLog.setAppend(true);
+      ncsaRequestLog.setExtended(true);
+      ncsaRequestLog.setFilenameDateFormat("yyyy-MM-dd");
+      ncsaRequestLog.setPreferProxiedForAddress(true);
+      ncsaRequestLog.setLogLatency(true);
+
+      final RequestLogHandler requestLogHandler = new RequestLogHandler();
+      requestLogHandler.setRequestLog(ncsaRequestLog);
+
+      rewriteHandler.setHandler(new HandlerCollection(contexts, new DefaultHandler(), webAppContext,
+          requestLogHandler));
 
       return rewriteHandler;
     }

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-4.16.3
+4.17.3