* Posts * Add missing translation * Fix internal store marshaling * [MM-22051] Remove To/From JSON (Channels) (#18116) * Channels * Channel members * ChannelSearch * Channel categories, list, sidebar, stats, view * Fix conversions * [MM-22051] Remove To/From JSON (Users) (#18121) * User related structs * Fix return * Team related structures (#18127) * [MM-22051] Remove To/From JSON (Status, Bot, Reaction, Thread, FileInfo) (#18130) * Status * Bot * Reaction * Thread * FileInfo * Some fixes * Translations update from Weblate (#18143) * Translated using Weblate (German) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/ * Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ * Translated using Weblate (German) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/ * Translated using Weblate (English (Australia)) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/en_AU/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ * Translated using Weblate (Japanese) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ja/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/zh_Hans/ Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> * [MM-22051] Remove To/From JSON methods from model (#18138) * Scheme * Role * Session * Config * Status * Fix logic * Emoji * GuestsInvite * Group * Command * ClusterInfo * License * Job * System * Plugin * Command2 * IncomingWebhook * OutgoingWebhook * Fix tests * Update traslation * Some fixes * Add missing return * Simplify * Make Config.ToJSONFiltered() return []byte * Make Busy.ToJSON() return []byte * Include error in log * Split logic * [MM-22051] Remove To/From JSON (final) (#18150) * SwitchRequest * PluginEventData * Permalink * PushNotification * SuggestCommand * PluginsResponse * WebSocketMessage * RemoteCluster * SharedChannel * PluginStatuses * InitialLoad * ClusterDiscovery * ClusterStats * MfaSecret * GroupSyncable * SAML * WebSocketRequest * TypingRequest * SecurityBulletin * OAuthApp * IntegrationAction * DataRetention * Preference * FileInfoList * Compliance * Preferences * FileInfoSearchResults * TermsOfService * InstallMarketplacePluginRequest * GitLabUser * UploadSessions * Remove unused helpers * Fix tests * [MM-23280] Fix linting for ToJSON/FromJSON (#18153) * SwitchRequest * PluginEventData * Permalink * PushNotification * SuggestCommand * PluginsResponse * WebSocketMessage * RemoteCluster * SharedChannel * PluginStatuses * InitialLoad * ClusterDiscovery * ClusterStats * MfaSecret * GroupSyncable * SAML * WebSocketRequest * TypingRequest * SecurityBulletin * OAuthApp * IntegrationAction * DataRetention * Preference * FileInfoList * Compliance * Preferences * FileInfoSearchResults * TermsOfService * InstallMarketplacePluginRequest * GitLabUser * UploadSessions * Remove unused helpers * Fix tests * Fix linting for ToJSON/FromJSON * Fix conversions Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
265 строки
8.7 KiB
Go
265 строки
8.7 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package api4
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/mattermost/mattermost-server/v6/app"
|
|
"github.com/mattermost/mattermost-server/v6/einterfaces/mocks"
|
|
"github.com/mattermost/mattermost-server/v6/model"
|
|
"github.com/mattermost/mattermost-server/v6/utils"
|
|
mocks2 "github.com/mattermost/mattermost-server/v6/utils/mocks"
|
|
"github.com/mattermost/mattermost-server/v6/utils/testutils"
|
|
|
|
"github.com/stretchr/testify/mock"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestGetOldClientLicense(t *testing.T) {
|
|
th := Setup(t)
|
|
defer th.TearDown()
|
|
client := th.Client
|
|
|
|
license, _, err := client.GetOldClientLicense("")
|
|
require.NoError(t, err)
|
|
|
|
require.NotEqual(t, license["IsLicensed"], "", "license not returned correctly")
|
|
|
|
client.Logout()
|
|
|
|
_, _, err = client.GetOldClientLicense("")
|
|
require.NoError(t, err)
|
|
|
|
resp, err := client.DoAPIGet("/license/client", "")
|
|
require.Error(t, err, "get /license/client did not return an error")
|
|
require.Equal(t, http.StatusNotImplemented, resp.StatusCode,
|
|
"expected 501 Not Implemented")
|
|
|
|
resp, err = client.DoAPIGet("/license/client?format=junk", "")
|
|
require.Error(t, err, "get /license/client?format=junk did not return an error")
|
|
require.Equal(t, http.StatusBadRequest, resp.StatusCode,
|
|
"expected 400 Bad Request")
|
|
|
|
license, _, err = th.SystemAdminClient.GetOldClientLicense("")
|
|
require.NoError(t, err)
|
|
|
|
require.NotEmpty(t, license["IsLicensed"], "license not returned correctly")
|
|
}
|
|
|
|
func TestUploadLicenseFile(t *testing.T) {
|
|
th := Setup(t)
|
|
defer th.TearDown()
|
|
client := th.Client
|
|
LocalClient := th.LocalClient
|
|
|
|
t.Run("as system user", func(t *testing.T) {
|
|
resp, err := client.UploadLicenseFile([]byte{})
|
|
require.Error(t, err)
|
|
CheckForbiddenStatus(t, resp)
|
|
})
|
|
|
|
th.TestForSystemAdminAndLocal(t, func(t *testing.T, c *model.Client4) {
|
|
resp, err := c.UploadLicenseFile([]byte{})
|
|
require.Error(t, err)
|
|
CheckBadRequestStatus(t, resp)
|
|
}, "as system admin user")
|
|
|
|
t.Run("as restricted system admin user", func(t *testing.T) {
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ExperimentalSettings.RestrictSystemAdmin = true })
|
|
|
|
resp, err := th.SystemAdminClient.UploadLicenseFile([]byte{})
|
|
require.Error(t, err)
|
|
CheckForbiddenStatus(t, resp)
|
|
})
|
|
|
|
t.Run("restricted admin setting not honoured through local client", func(t *testing.T) {
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ExperimentalSettings.RestrictSystemAdmin = true })
|
|
resp, err := LocalClient.UploadLicenseFile([]byte{})
|
|
require.Error(t, err)
|
|
CheckBadRequestStatus(t, resp)
|
|
})
|
|
|
|
t.Run("server has already gone through trial", func(t *testing.T) {
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ExperimentalSettings.RestrictSystemAdmin = false })
|
|
mockLicenseValidator := mocks2.LicenseValidatorIface{}
|
|
defer testutils.ResetLicenseValidator()
|
|
|
|
//startTimestamp, err := time.Parse("2 Jan 2006 3:04 pm", "1 Jan 2021 12:00 am")
|
|
//require.Nil(t, err)
|
|
|
|
userCount := 100
|
|
mills := model.GetMillis()
|
|
|
|
license := model.License{
|
|
Id: "AAAAAAAAAAAAAAAAAAAAAAAAAA",
|
|
Features: &model.Features{
|
|
Users: &userCount,
|
|
},
|
|
Customer: &model.Customer{
|
|
Name: "Test",
|
|
},
|
|
StartsAt: mills + 100,
|
|
ExpiresAt: mills + 100 + (30*(time.Hour*24) + (time.Hour * 8)).Milliseconds(),
|
|
}
|
|
|
|
mockLicenseValidator.On("LicenseFromBytes", mock.Anything).Return(&license, nil).Once()
|
|
licenseBytes, _ := json.Marshal(license)
|
|
licenseStr := string(licenseBytes)
|
|
|
|
mockLicenseValidator.On("ValidateLicense", mock.Anything).Return(true, licenseStr)
|
|
utils.LicenseValidator = &mockLicenseValidator
|
|
|
|
licenseManagerMock := &mocks.LicenseInterface{}
|
|
licenseManagerMock.On("CanStartTrial").Return(false, nil).Once()
|
|
th.App.Srv().LicenseManager = licenseManagerMock
|
|
|
|
resp, err := th.SystemAdminClient.UploadLicenseFile([]byte("sadasdasdasdasdasdsa"))
|
|
CheckErrorID(t, err, "api.license.request-trial.can-start-trial.not-allowed")
|
|
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
|
|
})
|
|
|
|
t.Run("allow uploading sanctioned trials even if server already gone through trial", func(t *testing.T) {
|
|
mockLicenseValidator := mocks2.LicenseValidatorIface{}
|
|
defer testutils.ResetLicenseValidator()
|
|
|
|
userCount := 100
|
|
mills := model.GetMillis()
|
|
|
|
license := model.License{
|
|
Id: "PPPPPPPPPPPPPPPPPPPPPPPPPP",
|
|
Features: &model.Features{
|
|
Users: &userCount,
|
|
},
|
|
Customer: &model.Customer{
|
|
Name: "Test",
|
|
},
|
|
IsTrial: true,
|
|
StartsAt: mills + 100,
|
|
ExpiresAt: mills + 100 + (29*(time.Hour*24) + (time.Hour * 8)).Milliseconds(),
|
|
}
|
|
|
|
mockLicenseValidator.On("LicenseFromBytes", mock.Anything).Return(&license, nil).Once()
|
|
|
|
licenseBytes, _ := json.Marshal(license)
|
|
licenseStr := string(licenseBytes)
|
|
|
|
mockLicenseValidator.On("ValidateLicense", mock.Anything).Return(true, licenseStr)
|
|
|
|
utils.LicenseValidator = &mockLicenseValidator
|
|
|
|
licenseManagerMock := &mocks.LicenseInterface{}
|
|
licenseManagerMock.On("CanStartTrial").Return(false, nil).Once()
|
|
th.App.Srv().LicenseManager = licenseManagerMock
|
|
|
|
resp, err := th.SystemAdminClient.UploadLicenseFile([]byte("sadasdasdasdasdasdsa"))
|
|
require.NoError(t, err)
|
|
require.Equal(t, http.StatusOK, resp.StatusCode)
|
|
})
|
|
}
|
|
|
|
func TestRemoveLicenseFile(t *testing.T) {
|
|
th := Setup(t)
|
|
defer th.TearDown()
|
|
client := th.Client
|
|
LocalClient := th.LocalClient
|
|
|
|
t.Run("as system user", func(t *testing.T) {
|
|
resp, err := client.RemoveLicenseFile()
|
|
require.Error(t, err)
|
|
CheckForbiddenStatus(t, resp)
|
|
})
|
|
|
|
th.TestForSystemAdminAndLocal(t, func(t *testing.T, c *model.Client4) {
|
|
_, err := c.RemoveLicenseFile()
|
|
require.NoError(t, err)
|
|
}, "as system admin user")
|
|
|
|
t.Run("as restricted system admin user", func(t *testing.T) {
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ExperimentalSettings.RestrictSystemAdmin = true })
|
|
|
|
resp, err := th.SystemAdminClient.RemoveLicenseFile()
|
|
require.Error(t, err)
|
|
CheckForbiddenStatus(t, resp)
|
|
})
|
|
|
|
t.Run("restricted admin setting not honoured through local client", func(t *testing.T) {
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ExperimentalSettings.RestrictSystemAdmin = true })
|
|
|
|
_, err := LocalClient.RemoveLicenseFile()
|
|
require.NoError(t, err)
|
|
})
|
|
}
|
|
|
|
func TestRequestTrialLicense(t *testing.T) {
|
|
th := Setup(t)
|
|
defer th.TearDown()
|
|
|
|
licenseManagerMock := &mocks.LicenseInterface{}
|
|
licenseManagerMock.On("CanStartTrial").Return(true, nil)
|
|
th.App.Srv().LicenseManager = licenseManagerMock
|
|
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.SiteURL = "http://localhost:8065/" })
|
|
|
|
t.Run("permission denied", func(t *testing.T) {
|
|
resp, err := th.Client.RequestTrialLicense(1000)
|
|
require.Error(t, err)
|
|
CheckForbiddenStatus(t, resp)
|
|
})
|
|
|
|
t.Run("blank site url", func(t *testing.T) {
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.SiteURL = "" })
|
|
defer th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.SiteURL = "http://localhost:8065/" })
|
|
resp, err := th.SystemAdminClient.RequestTrialLicense(1000)
|
|
CheckErrorID(t, err, "api.license.request_trial_license.no-site-url.app_error")
|
|
CheckBadRequestStatus(t, resp)
|
|
})
|
|
|
|
t.Run("trial license user count less than current users", func(t *testing.T) {
|
|
nUsers := 1
|
|
license := model.NewTestLicense()
|
|
license.Features.Users = model.NewInt(nUsers)
|
|
licenseJSON, jsonErr := json.Marshal(license)
|
|
require.NoError(t, jsonErr)
|
|
testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
|
|
res.WriteHeader(http.StatusOK)
|
|
response := map[string]string{
|
|
"license": string(licenseJSON),
|
|
}
|
|
err := json.NewEncoder(res).Encode(response)
|
|
require.NoError(t, err)
|
|
}))
|
|
defer testServer.Close()
|
|
|
|
mockLicenseValidator := mocks2.LicenseValidatorIface{}
|
|
defer testutils.ResetLicenseValidator()
|
|
|
|
mockLicenseValidator.On("ValidateLicense", mock.Anything).Return(true, string(licenseJSON))
|
|
utils.LicenseValidator = &mockLicenseValidator
|
|
licenseManagerMock := &mocks.LicenseInterface{}
|
|
licenseManagerMock.On("CanStartTrial").Return(true, nil).Once()
|
|
th.App.Srv().LicenseManager = licenseManagerMock
|
|
|
|
defer func(requestTrialURL string) {
|
|
app.RequestTrialURL = requestTrialURL
|
|
}(app.RequestTrialURL)
|
|
app.RequestTrialURL = testServer.URL
|
|
|
|
resp, err := th.SystemAdminClient.RequestTrialLicense(nUsers)
|
|
CheckErrorID(t, err, "api.license.add_license.unique_users.app_error")
|
|
CheckBadRequestStatus(t, resp)
|
|
})
|
|
|
|
th.App.Srv().LicenseManager = nil
|
|
t.Run("trial license should fail if LicenseManager is nil", func(t *testing.T) {
|
|
resp, err := th.SystemAdminClient.RequestTrialLicense(1)
|
|
CheckErrorID(t, err, "api.license.upgrade_needed.app_error")
|
|
CheckForbiddenStatus(t, resp)
|
|
})
|
|
}
|