fix: max file size not propagated all the way through

Author: Muni10

.github/workflows/main.yaml

@@ -83,8 +83,9 @@ jobs:
           targets: |
             [
               { "target": { "kind": "tenant", "tenant": "nav", "environment": "dev" }, "wait": true },
-              { "target": { "kind": "tenant", "tenant": "nav" } },
+              { "target": { "kind": "tenant", "tenant": "nav"  } },
               { "target": { "kind": "tenant", "tenant": "ldir" } },
               { "target": { "kind": "tenant", "tenant": "atil" } },
-              { "target": { "kind": "onprem" } }
+              { "target": { "kind": "onprem", "tenant": "nav", "environment": "dev-fss" }, "wait": true },
+              { "target": { "kind": "onprem", "tenant": "nav", "environment": "prod-fss" } }
             ]

README.md

@@ -111,7 +111,7 @@ make build
 - `-log-level` - Log level (default: `info`)
 - `-timeout` - Client connection timeout in seconds (default: `3`)
 - `-keepalive` - Client connection keepalive (default: `3`)
-- 
+- `-max-file-size` - Max upload size accepted by scan endpoints (default: `400Mi`, accepts units like `Mi`, `M`, `Gi`)
 ### Test
 
 ```bash

charts/Feature.yaml

@@ -6,10 +6,4 @@ values:
     displayName: Max file size allowed
     description: Max file size allowed for scanning (should be the same value as in clamd.conf)
     config:
-      type: string
-  replaceLegacyService:
-    displayName: Use the original service name
-    description: Temporary switch to ease migration to new rest api, set this to enable the new api
-    config:
-      type: bool
-    
+      type: string

charts/templates/deployment.yaml

@@ -29,6 +29,8 @@ spec:
           env:
           - name: DAEMON_ENDPOINT
             value: clamav-daemon:3310
+          - name: MAX_FILE_SIZE
+            value: {{ .Values.maxFileSize | quote }}
           image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           livenessProbe:

charts/templates/service.yaml

@@ -1,12 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-{{- if .Values.replaceLegacyService }}
-  # use the old name of rest api to avoid changes in team applications
-  name: clamav 
-{{- else }}
-  name: {{ include "clamav-rest.fullname" . | nindent 4 }}
-{{- end }}
+  name: clamav
   labels:
     app: clamav
     {{- include "clamav-rest.labels" . | nindent 4 }}

charts/values.yaml

@@ -2,7 +2,7 @@ image:
   tag: "1.0.0"
   repository: europe-north1-docker.pkg.dev/nais-io/nais/images/clamav-rest 
   pullPolicy: IfNotPresent
-maxFileSize: 400
+maxFileSize: "400Mi"
 
 containerSecurityContext:
   capabilities:

cmd/clamav-rest/config.go

@@ -3,7 +3,11 @@ package main
 import (
 	"errors"
 	"flag"
+	"fmt"
+	"math"
 	"os"
+	"strconv"
+	"strings"
 	"time"
 )
 
@@ -29,26 +33,79 @@ func LoadConfig() (*Config, error) {
 	cfg.ServerReadTimeout = 120 * time.Second
 	cfg.ServerReadHeaderTimeout = 10 * time.Second
 	cfg.ServerWriteTimeout = 120 * time.Second
-	cfg.ServerMaxRequestSize = int64(400 * 1024 * 1024)
+	maxFileSize := "400Mi"
 
 	if val, ok := os.LookupEnv("DAEMON_ENDPOINT"); ok {
 		cfg.DaemonEndpoint = val
 	}
+	if val, ok := os.LookupEnv("MAX_FILE_SIZE"); ok {
+		maxFileSize = val
+	}
 
 	// Override with flags
 	flag.StringVar(&cfg.BindAddress, "bind-address", cfg.BindAddress, "Bind address")
 	flag.StringVar(&cfg.LogLevel, "log-level", cfg.LogLevel, "Log level")
 	flag.StringVar(&cfg.DaemonEndpoint, "daemon-endpoint", cfg.DaemonEndpoint, "ClamAV daemon endpoint")
+	flag.StringVar(&maxFileSize, "max-file-size", maxFileSize, "Maximum file size accepted by /scan (e.g. 400Mi, 400M)")
 	timeout := flag.Int("timeout", int(cfg.Timeout.Seconds()), "Timeout in seconds")
 	keepalive := flag.Int("keepalive", int(cfg.Keepalive.Seconds()), "Keepalive in seconds")
 	flag.Parse()
 
 	cfg.Timeout = time.Duration(*timeout) * time.Second
 	cfg.Keepalive = time.Duration(*keepalive) * time.Second
+	var err error
+	cfg.ServerMaxRequestSize, err = parseByteSize(maxFileSize)
+	if err != nil {
+		return nil, fmt.Errorf("invalid max file size %q: %w", maxFileSize, err)
+	}
 
 	if cfg.DaemonEndpoint == "" {
 		return nil, errors.New("daemon endpoint is required")
 	}
 
 	return cfg, nil
 }
+
+func parseByteSize(value string) (int64, error) {
+	normalized := strings.ToUpper(strings.TrimSpace(value))
+	if normalized == "" {
+		return 0, errors.New("value cannot be empty")
+	}
+	if strings.HasSuffix(normalized, "B") {
+		normalized = strings.TrimSuffix(normalized, "B")
+	}
+
+	multiplier := int64(1)
+	for _, unit := range []struct {
+		suffix     string
+		multiplier int64
+	}{
+		{suffix: "TI", multiplier: 1024 * 1024 * 1024 * 1024},
+		{suffix: "GI", multiplier: 1024 * 1024 * 1024},
+		{suffix: "MI", multiplier: 1024 * 1024},
+		{suffix: "KI", multiplier: 1024},
+		{suffix: "T", multiplier: 1000 * 1000 * 1000 * 1000},
+		{suffix: "G", multiplier: 1000 * 1000 * 1000},
+		{suffix: "M", multiplier: 1000 * 1000},
+		{suffix: "K", multiplier: 1000},
+	} {
+		if strings.HasSuffix(normalized, unit.suffix) {
+			multiplier = unit.multiplier
+			normalized = strings.TrimSuffix(normalized, unit.suffix)
+			break
+		}
+	}
+
+	size, err := strconv.ParseInt(normalized, 10, 64)
+	if err != nil {
+		return 0, fmt.Errorf("invalid numeric value %q", normalized)
+	}
+	if size < 0 {
+		return 0, errors.New("value cannot be negative")
+	}
+	if size > math.MaxInt64/multiplier {
+		return 0, errors.New("value is too large")
+	}
+
+	return size * multiplier, nil
+}