From 77cc899a44f8c16421074245a64116421fe94182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 30 Jun 2020 16:18:16 +0200 Subject: [PATCH 1/2] Increase transfer token life time to 24h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/allow-datagateway-transfers-24h.md | 5 +++++ pkg/flagset/gateway.go | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelog/unreleased/allow-datagateway-transfers-24h.md diff --git a/changelog/unreleased/allow-datagateway-transfers-24h.md b/changelog/unreleased/allow-datagateway-transfers-24h.md new file mode 100644 index 000000000..800e557f8 --- /dev/null +++ b/changelog/unreleased/allow-datagateway-transfers-24h.md @@ -0,0 +1,5 @@ +Enhancement: Allow datagateway transfers to take 24h + +- Increase transfer token life time to 24h (PR #323) + +https://github.com/owncloud/ocis-reva/pull/323 diff --git a/pkg/flagset/gateway.go b/pkg/flagset/gateway.go index 6ca1bb378..c8863aa34 100644 --- a/pkg/flagset/gateway.go +++ b/pkg/flagset/gateway.go @@ -1,6 +1,8 @@ package flagset import ( + "time" + "github.com/micro/cli/v2" "github.com/owncloud/ocis-reva/pkg/config" ) @@ -90,7 +92,7 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag { }, &cli.IntFlag{ Name: "transfer-expires", - Value: 10, + Value: 24 * int(time.Hour), Usage: "Transfer secret for datagateway", EnvVars: []string{"REVA_TRANSFER_EXPIRES"}, Destination: &cfg.Reva.TransferExpires, From e3e202cd8b8125825986bacbec604229a7d841b8 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Wed, 1 Jul 2020 16:30:17 +0200 Subject: [PATCH 2/2] Fix config default value for token expiry --- pkg/flagset/gateway.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/flagset/gateway.go b/pkg/flagset/gateway.go index c8863aa34..fe2b20936 100644 --- a/pkg/flagset/gateway.go +++ b/pkg/flagset/gateway.go @@ -1,8 +1,6 @@ package flagset import ( - "time" - "github.com/micro/cli/v2" "github.com/owncloud/ocis-reva/pkg/config" ) @@ -92,7 +90,7 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag { }, &cli.IntFlag{ Name: "transfer-expires", - Value: 24 * int(time.Hour), + Value: 24 * 60 * 60, Usage: "Transfer secret for datagateway", EnvVars: []string{"REVA_TRANSFER_EXPIRES"}, Destination: &cfg.Reva.TransferExpires,