Make max application package size configurable

4 files changed, 12 insertions, 8 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 7a754dd84cd..cb1c1a461e3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -1053,7 +1053,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
 
     private File decompressApplication(InputStream in, String contentType, File tempDir) {
         try (CompressedApplicationInputStream application =
-                     CompressedApplicationInputStream.createFromCompressedStream(in, contentType)) {
+                     CompressedApplicationInputStream.createFromCompressedStream(in, contentType, configserverConfig.maxApplicationPackageSize())) {
             return decompressApplication(application, tempDir);
         } catch (IOException e) {
             throw new IllegalArgumentException("Unable to decompress data in body", e);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java
index 6f141e3e6ad..443ab47e786 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java
@@ -39,11 +39,12 @@ public class CompressedApplicationInputStream implements AutoCloseable {
      *
      * @param is   the input stream containing the compressed files.
      * @param contentType the content type for determining what kind of compressed stream should be used.
+     * @param maxSizeInBytes the maximum allowed size of the decompressed content
      * @return An instance of an unpacked application.
      */
-    public static CompressedApplicationInputStream createFromCompressedStream(InputStream is, String contentType) {
+    public static CompressedApplicationInputStream createFromCompressedStream(InputStream is, String contentType, long maxSizeInBytes) {
         try {
-            Options options = Options.standard().allowDotSegment(true);
+            Options options = Options.standard().maxSize(maxSizeInBytes).allowDotSegment(true);
             switch (contentType) {
                 case ApplicationApiHandler.APPLICATION_X_GZIP:
                     return new CompressedApplicationInputStream(ArchiveStreamReader.ofTarGzip(is, options));
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java
index 1a8b36ee19f..c8953d5996c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java
@@ -49,9 +49,11 @@ public class ApplicationApiHandler extends SessionHandler {
     public final static String MULTIPART_PARAMS = "prepareParams";
     public final static String MULTIPART_APPLICATION_PACKAGE = "applicationPackage";
     public final static String contentTypeHeader = "Content-Type";
+
     private final TenantRepository tenantRepository;
     private final Duration zookeeperBarrierTimeout;
     private final Zone zone;
+    private final long maxApplicationPackageSize;
 
     @Inject
     public ApplicationApiHandler(Context ctx,
@@ -61,6 +63,7 @@ public class ApplicationApiHandler extends SessionHandler {
         super(ctx, applicationRepository);
         this.tenantRepository = applicationRepository.tenantRepository();
         this.zookeeperBarrierTimeout = Duration.ofSeconds(configserverConfig.zookeeper().barrierTimeout());
+        this.maxApplicationPackageSize = configserverConfig.maxApplicationPackageSize();
         this.zone = zone;
     }
 
@@ -85,14 +88,14 @@ public class ApplicationApiHandler extends SessionHandler {
                 log.log(Level.FINE, "Deploy parameters: [{0}]", new String(params, StandardCharsets.UTF_8));
                 prepareParams = PrepareParams.fromJson(params, tenantName, zookeeperBarrierTimeout);
                 Part appPackagePart = parts.get(MULTIPART_APPLICATION_PACKAGE);
-                compressedStream = createFromCompressedStream(appPackagePart.getInputStream(), appPackagePart.getContentType());
+                compressedStream = createFromCompressedStream(appPackagePart.getInputStream(), appPackagePart.getContentType(), maxApplicationPackageSize);
             } catch (IOException e) {
                 log.log(Level.WARNING, "Unable to parse multipart in deploy", e);
                 throw new BadRequestException("Request contains invalid data");
             }
         } else {
             prepareParams = PrepareParams.fromHttpRequest(request, tenantName, zookeeperBarrierTimeout);
-            compressedStream = createFromCompressedStream(request.getData(), request.getHeader(contentTypeHeader));
+            compressedStream = createFromCompressedStream(request.getData(), request.getHeader(contentTypeHeader), maxApplicationPackageSize);
         }
 
         PrepareResult result = applicationRepository.deploy(compressedStream, prepareParams);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java
index 61642d33e62..5ee6c7d7507 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java
@@ -108,7 +108,7 @@ public class CompressedApplicationInputStreamTest {
     public void require_that_gnu_tared_file_can_be_unpacked() throws IOException, InterruptedException {
         File gzFile = createTarGz("src/test/resources/deploy/validapp");
         assertTrue(gzFile.exists());
-        CompressedApplicationInputStream unpacked = CompressedApplicationInputStream.createFromCompressedStream(new FileInputStream(gzFile), "application/x-gzip");
+        CompressedApplicationInputStream unpacked = CompressedApplicationInputStream.createFromCompressedStream(new FileInputStream(gzFile), "application/x-gzip", Long.MAX_VALUE);
         File outApp = unpacked.decompress();
         assertTestApp(outApp);
     }
@@ -168,11 +168,11 @@ public class CompressedApplicationInputStreamTest {
     }
 
     private static CompressedApplicationInputStream streamFromZip(File zipFile) {
-        return Exceptions.uncheck(() -> CompressedApplicationInputStream.createFromCompressedStream(new FileInputStream(zipFile), "application/zip"));
+        return Exceptions.uncheck(() -> CompressedApplicationInputStream.createFromCompressedStream(new FileInputStream(zipFile), "application/zip", Long.MAX_VALUE));
     }
 
     private static CompressedApplicationInputStream streamFromTarGz(File tarFile) {
-        return Exceptions.uncheck(() -> CompressedApplicationInputStream.createFromCompressedStream(new FileInputStream(tarFile), "application/x-gzip"));
+        return Exceptions.uncheck(() -> CompressedApplicationInputStream.createFromCompressedStream(new FileInputStream(tarFile), "application/x-gzip", Long.MAX_VALUE));
     }
 
 }