update to 2.4.0

3 files changed, 28 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 06d6c716003e..a2f4f05b942c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sftpgo
 	pkgdesc = Fully featured and highly configurable SFTP server with optional HTTP, FTP/S and WebDAV support. It can serve local filesystem, S3, GCS, Azure Blob, SFTP
-	pkgver = 2.3.6
+	pkgver = 2.4.0
 	pkgrel = 1
 	url = https://github.com/drakkan/sftpgo
 	install = sftpgo.install
@@ -18,11 +18,11 @@ pkgbase = sftpgo
 	optdepends = mariadb: to use MySQL provider
 	optdepends = cockroachdb: to use CockroachDB provider
 	backup = etc/sftpgo/sftpgo.json
-	source = git+https://github.com/drakkan/sftpgo#tag=v2.3.6
+	source = git+https://github.com/drakkan/sftpgo#tag=v2.4.0
 	source = sftpgo.json
 	source = sftpgo.sysusers
 	sha256sums = SKIP
-	sha256sums = 9b8f14b35006e74778cc88ed8c4699083983c756ea65fabc208b034a12f30087
+	sha256sums = 244b17e00d3b65e95a2af78e22cb84c1d9e0b107b86a54402af6c4304f91b98b
 	sha256sums = 44658210043f805057c2e4b473653637a91204e4da17954b08081292c72edcb8
 
 pkgname = sftpgo
diff --git a/PKGBUILD b/PKGBUILD
index 7da8f0351358..321ab05d4f9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: drakkan <nicola.murino at gmail dot com>
 # Contributor: drakkan <nicola.murino at gmail dot com>
 pkgname=sftpgo
-pkgver=2.3.6
+pkgver=2.4.0
 pkgrel=1
 pkgdesc='Fully featured and highly configurable SFTP server with optional HTTP, FTP/S and WebDAV support. It can serve local filesystem, S3, GCS, Azure Blob, SFTP'
 arch=('i686' 'x86_64' 'aarch64')
@@ -22,7 +22,7 @@ source=("git+https://github.com/drakkan/${pkgname}#tag=v${pkgver}"
   "sftpgo.json"
   "sftpgo.sysusers")
 sha256sums=('SKIP'
-  '9b8f14b35006e74778cc88ed8c4699083983c756ea65fabc208b034a12f30087'
+  '244b17e00d3b65e95a2af78e22cb84c1d9e0b107b86a54402af6c4304f91b98b'
   '44658210043f805057c2e4b473653637a91204e4da17954b08081292c72edcb8')
 
 _uid_sftpgo=315
@@ -30,7 +30,7 @@ _gid_sftpgo=315
 
 build() {
   cd "${pkgname}"
-  go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=`git describe --always --abbrev=8 --dirty` -X github.com/drakkan/sftpgo/v2/version.date=`date --utc +%FT%TZ`" -o sftpgo
+  go build -trimpath -tags nopgxregisterdefaulttypes -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/internal/version.commit=`git describe --always --abbrev=8 --dirty` -X github.com/drakkan/sftpgo/v2/internal/version.date=`date --utc +%FT%TZ`" -o sftpgo
   ./sftpgo gen completion bash > sftpgo-completion.bash
   ./sftpgo gen man -d man1
   gzip man1/*
@@ -41,6 +41,7 @@ package() {
   install -Dm 755 sftpgo "$pkgdir/usr/bin/${pkgname}"
   install -Dm 644 init/${pkgname}.service -t "${pkgdir}/usr/lib/systemd/system"
   install -dm750 -o ${_uid_sftpgo} -g ${_gid_sftpgo} "${pkgdir}/etc/${pkgname}"
+  install -dm750 -o ${_uid_sftpgo} -g ${_gid_sftpgo} "${pkgdir}/etc/${pkgname}/env.d"
   install -Dm 640 -o ${_uid_sftpgo} -g ${_gid_sftpgo} "$srcdir/sftpgo.json" -t "${pkgdir}/etc/${pkgname}"
   install -dm750 -o ${_uid_sftpgo} -g ${_gid_sftpgo} "${pkgdir}/var/lib/${pkgname}"
   install -dm750 -o ${_uid_sftpgo} -g ${_gid_sftpgo} "${pkgdir}/srv/${pkgname}"
diff --git a/sftpgo.json b/sftpgo.json
index 57dd0edc2f35..b8db0f1cc148 100644
--- a/sftpgo.json
+++ b/sftpgo.json
@@ -18,6 +18,7 @@
     "max_total_connections": 0,
     "max_per_host_connections": 20,
     "whitelist_file": "",
+    "allow_self_connections": 0,
     "defender": {
       "enabled": false,
       "driver": "memory",
@@ -151,7 +152,8 @@
         "prefix": "",
         "proxy_allowed": [],
         "client_ip_proxy_header": "",
-        "client_ip_header_depth": 0
+        "client_ip_header_depth": 0,
+        "disable_www_auth_header": false
       }
     ],
     "certificate_file": "",
@@ -165,7 +167,10 @@
       "allowed_headers": [],
       "exposed_headers": [],
       "allow_credentials": false,
-      "max_age": 0
+      "max_age": 0,
+      "options_passthrough": false,
+      "options_success_status": 0,
+      "allow_private_network": false
     },
     "cache": {
       "users": {
@@ -186,6 +191,8 @@
     "username": "",
     "password": "",
     "sslmode": 0,
+    "disable_sni": false,
+    "target_session_attrs": "",
     "root_cert": "",
     "client_cert": "",
     "client_key": "",
@@ -202,7 +209,6 @@
     },
     "external_auth_hook": "",
     "external_auth_scope": 0,
-    "credentials_path": "/var/lib/sftpgo/credentials",
     "pre_login_hook": "",
     "post_login_hook": "",
     "post_login_scope": 0,
@@ -232,12 +238,12 @@
     "create_default_admin": false,
     "naming_rules": 1,
     "is_shared": 0,
-    "backups_path": "/srv/sftpgo/backups",
-    "auto_backup": {
-      "enabled": true,
-      "hour": "0",
-      "day_of_week": "*"
-    }
+    "node": {
+      "host": "",
+      "port": 0,
+      "proto": "http"
+    },
+    "backups_path": "/srv/sftpgo/backups"
   },
   "httpd": {
     "bindings": [
@@ -246,6 +252,7 @@
         "address": "",
         "enable_web_admin": true,
         "enable_web_client": true,
+        "enable_rest_api": true,
         "enabled_login_methods": 0,
         "enable_https": false,
         "certificate_file": "",
@@ -273,6 +280,7 @@
           "role_field": "",
           "implicit_roles": false,
           "custom_fields": [],
+          "insecure_skip_signature_check": false,
           "debug": false
         },
         "security": {
@@ -336,7 +344,10 @@
       "allowed_headers": [],
       "exposed_headers": [],
       "allow_credentials": false,
-      "max_age": 0
+      "max_age": 0,
+      "options_passthrough": false,
+      "options_success_status": 0,
+      "allow_private_network": false
     },
     "setup": {
       "installation_code": "",