You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/01/27 02:43:03 UTC
[james-project] 02/02: JAMES-3490 maxUploadSize should come from
configuration
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit afb79258b95af2260f1b8c1d14aa08c45f005839
Author: LanKhuat <dl...@linagora.com>
AuthorDate: Tue Jan 26 14:02:29 2021 +0700
JAMES-3490 maxUploadSize should come from configuration
---
.../jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java | 7 ++++++-
.../src/test/resources/jmap.properties | 3 ++-
.../apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala | 4 ++--
.../src/test/resources/jmap.properties | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java
index 7a42557..9c5b19c 100644
--- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java
+++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java
@@ -73,6 +73,7 @@ import com.google.inject.Provides;
import com.google.inject.Scopes;
import com.google.inject.Singleton;
import com.google.inject.multibindings.Multibinder;
+import com.google.inject.multibindings.ProvidesIntoSet;
public class JMAPModule extends AbstractModule {
private static final int DEFAULT_JMAP_PORT = 80;
@@ -136,7 +137,6 @@ public class JMAPModule extends AbstractModule {
supportedVersions.addBinding().toInstance(Version.RFC8621);
Multibinder<Capability> supportedCapabilities = Multibinder.newSetBinder(binder(), Capability.class);
- supportedCapabilities.addBinding().toInstance(DefaultCapabilities.coreCapability(JmapRfc8621Configuration.UPLOAD_LIMIT_30_MB()));
supportedCapabilities.addBinding().toInstance(DefaultCapabilities.MAIL_CAPABILITY());
supportedCapabilities.addBinding().toInstance(DefaultCapabilities.QUOTA_CAPABILITY());
supportedCapabilities.addBinding().toInstance(DefaultCapabilities.SHARES_CAPABILITY());
@@ -144,6 +144,11 @@ public class JMAPModule extends AbstractModule {
supportedCapabilities.addBinding().toInstance(DefaultCapabilities.SUBMISSION_CAPABILITY());
}
+ @ProvidesIntoSet
+ Capability coreCapability(JmapRfc8621Configuration configuration) {
+ return DefaultCapabilities.coreCapability(configuration.maxUploadSize());
+ }
+
@Provides
@Singleton
JMAPConfiguration provideConfiguration(PropertiesProvider propertiesProvider) throws ConfigurationException {
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/resources/jmap.properties b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/resources/jmap.properties
index a0da434..aa1cd40 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/resources/jmap.properties
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/resources/jmap.properties
@@ -1,2 +1,3 @@
# Configuration urlPrefix for JMAP routes.
-url.prefix=http://domain.com
\ No newline at end of file
+url.prefix=http://domain.com
+upload.max.size=20M
\ No newline at end of file
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala
index b6a1d50..9ba8df0 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala
@@ -46,7 +46,7 @@ object SessionRoutesContract {
| "submissionExtensions": []
| },
| "urn:ietf:params:jmap:core" : {
- | "maxSizeUpload" : 31457280,
+ | "maxSizeUpload" : 20971520,
| "maxConcurrentUpload" : 4,
| "maxSizeRequest" : 10000000,
| "maxConcurrentRequests" : 4,
@@ -78,7 +78,7 @@ object SessionRoutesContract {
| "submissionExtensions": []
| },
| "urn:ietf:params:jmap:core" : {
- | "maxSizeUpload" : 31457280,
+ | "maxSizeUpload" : 20971520,
| "maxConcurrentUpload" : 4,
| "maxSizeRequest" : 10000000,
| "maxConcurrentRequests" : 4,
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/jmap.properties b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/jmap.properties
index 0128031..aa1cd40 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/jmap.properties
+++ b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/jmap.properties
@@ -1,3 +1,3 @@
# Configuration urlPrefix for JMAP routes.
url.prefix=http://domain.com
-upload.max.size=30M
\ No newline at end of file
+upload.max.size=20M
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org