diff --git a/apis/settings_test.go b/apis/settings_test.go index d1fd4eae..22b74644 100644 --- a/apis/settings_test.go +++ b/apis/settings_test.go @@ -49,10 +49,12 @@ func TestSettingsList(t *testing.T) { `"s3":{`, `"adminAuthToken":{`, `"adminPasswordResetToken":{`, + `"adminFileToken":{`, `"recordAuthToken":{`, `"recordPasswordResetToken":{`, `"recordEmailChangeToken":{`, `"recordVerificationToken":{`, + `"recordFileToken":{`, `"emailAuth":{`, `"googleAuth":{`, `"facebookAuth":{`, @@ -125,10 +127,12 @@ func TestSettingsSet(t *testing.T) { `"s3":{`, `"adminAuthToken":{`, `"adminPasswordResetToken":{`, + `"adminFileToken":{`, `"recordAuthToken":{`, `"recordPasswordResetToken":{`, `"recordEmailChangeToken":{`, `"recordVerificationToken":{`, + `"recordFileToken":{`, `"emailAuth":{`, `"googleAuth":{`, `"facebookAuth":{`, @@ -188,10 +192,12 @@ func TestSettingsSet(t *testing.T) { `"s3":{`, `"adminAuthToken":{`, `"adminPasswordResetToken":{`, + `"adminFileToken":{`, `"recordAuthToken":{`, `"recordPasswordResetToken":{`, `"recordEmailChangeToken":{`, `"recordVerificationToken":{`, + `"recordFileToken":{`, `"emailAuth":{`, `"googleAuth":{`, `"facebookAuth":{`, diff --git a/models/settings/settings.go b/models/settings/settings.go index eac8c932..e6f582b4 100644 --- a/models/settings/settings.go +++ b/models/settings/settings.go @@ -94,7 +94,7 @@ func New() *Settings { }, AdminFileToken: TokenConfig{ Secret: security.RandomString(50), - Duration: 180, // 3 minutes + Duration: 300, // 5 minutes }, RecordAuthToken: TokenConfig{ Secret: security.RandomString(50), @@ -110,7 +110,7 @@ func New() *Settings { }, RecordFileToken: TokenConfig{ Secret: security.RandomString(50), - Duration: 180, // 3 minutes + Duration: 300, // 5 minutes }, RecordEmailChangeToken: TokenConfig{ Secret: security.RandomString(50), @@ -183,6 +183,7 @@ func (s *Settings) Validate() error { validation.Field(&s.Logs), validation.Field(&s.AdminAuthToken), validation.Field(&s.AdminPasswordResetToken), + validation.Field(&s.AdminFileToken), validation.Field(&s.RecordAuthToken), validation.Field(&s.RecordPasswordResetToken), validation.Field(&s.RecordEmailChangeToken), @@ -246,6 +247,7 @@ func (s *Settings) RedactClone() (*Settings, error) { &clone.S3.Secret, &clone.AdminAuthToken.Secret, &clone.AdminPasswordResetToken.Secret, + &clone.AdminFileToken.Secret, &clone.RecordAuthToken.Secret, &clone.RecordPasswordResetToken.Secret, &clone.RecordEmailChangeToken.Secret, diff --git a/models/settings/settings_test.go b/models/settings/settings_test.go index a8baa4d0..738f07fa 100644 --- a/models/settings/settings_test.go +++ b/models/settings/settings_test.go @@ -25,6 +25,7 @@ func TestSettingsValidate(t *testing.T) { s.S3.Endpoint = "invalid" s.AdminAuthToken.Duration = -10 s.AdminPasswordResetToken.Duration = -10 + s.AdminFileToken.Duration = -10 s.RecordAuthToken.Duration = -10 s.RecordPasswordResetToken.Duration = -10 s.RecordEmailChangeToken.Duration = -10 @@ -80,6 +81,7 @@ func TestSettingsValidate(t *testing.T) { `"s3":{`, `"adminAuthToken":{`, `"adminPasswordResetToken":{`, + `"adminFileToken":{`, `"recordAuthToken":{`, `"recordPasswordResetToken":{`, `"recordEmailChangeToken":{`, @@ -127,6 +129,7 @@ func TestSettingsMerge(t *testing.T) { s2.S3.Endpoint = "test" s2.AdminAuthToken.Duration = 1 s2.AdminPasswordResetToken.Duration = 2 + s2.AdminFileToken.Duration = 2 s2.RecordAuthToken.Duration = 3 s2.RecordPasswordResetToken.Duration = 4 s2.RecordEmailChangeToken.Duration = 5 @@ -230,6 +233,7 @@ func TestSettingsRedactClone(t *testing.T) { s1.S3.Secret = testSecret s1.AdminAuthToken.Secret = testSecret s1.AdminPasswordResetToken.Secret = testSecret + s1.AdminFileToken.Secret = testSecret s1.RecordAuthToken.Secret = testSecret s1.RecordPasswordResetToken.Secret = testSecret s1.RecordEmailChangeToken.Secret = testSecret