MM-34437 Preventing infinite trial requests (#17472)
* MM-34434: Added 'is_trial' boolean to all trial license requests and to the License struct. * MM-34434: Generalized the concept of a license request. * MM-34434: Verifies JSON field of license instance is set. * MM-34434: Added missing client param. * MM-34434: Added some tests of the request trial API endpoint. * MM-34434: Removed comment. * fix broken test (#17348) * Add missing wrapped errors (#17339) * Improve document extraction and including a document extraction command (#17183) * Add extract documents content command * Adding the extraction command and making the pure go pdf library as secondary option * Improving the memory usage and docextractor interface * Enable content extraction by default in all the instances * Tiny improvement on archive indexing * Adding App interface generation and the opentracing layer * Fixing linter errors * Addressing PR review comments * Addressing PR review comments * Update en.json (#17356) Automatic Merge * adding new feature flag (#17308) Co-authored-by: Benjamin Cooke <benjamincooke@Benjamins-MacBook-Pro.local> Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * Bump no_output_timeout to 2 hours (#17358) * log invalid username (#17345) Automatic Merge * MM-34434: Added missing client param. MM-34434: Added some tests of the request trial API endpoint. MM-34434: Removed comment. * MM-34434: Switched to a hard-coded true value. * MM-34434: Reverts test change. * MM-34434: Removes unnecessary field. * MM-34434: Tests that is_trial is hard-coded by TrialLicenseRequest. * MM-34434: Removed accidental commit. * MM-34434: Removes unnecessary is_trial key from JSON payload. * MM-34434: Reverts to old pointer receiver variable name. * MM-34434: Removes test. * #MM-34437 Initialized license service * ##MM-34437 Verified at all points if server is trial elligible * WIp * #MM-34437 removed unused commented code * MM-34437 make a log less severe * #MM-34437 generated einterface mocks * #MM-34437 added license on new file * #MM-34437 removed unused translation * #MM-34437 some refactoring * Update api4/license.go * Update api4/license.go * #MM-34437 made a variable name consistent * #MM-34437 Added mocks for lince validator * #M--34437 Added license validator test framework * #MM-34437 Renamed isTrial method to isTrialLicense to avoid conflict with newlya dded field * #M--34437 Allowed sales-sanctioned trials * #MM-34437 fixed trial license API tests * Added tests for add license API * #MM-34437 fixed ValidateLicense test * #MM-34437 Added util tests * #MM-34437 using NoError for checking no error * #MM-34437 using NoError for checking no error * Added dummy piblic key for testing * Fixed tests * #MM-34437 udpaetd trial license URL for testing * #MM-34437 adjusted times for licences generated through admin portal * Reverted test-only changes Co-authored-by: Martin Kraft <martin@upspin.org> Co-authored-by: Hossein <hahmadia@users.noreply.github.com> Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com> Co-authored-by: Jesús Espino <jespinog@gmail.com> Co-authored-by: Amy Blais <amy_blais@hotmail.com> Co-authored-by: Ben Cooke <benkcooke@gmail.com> Co-authored-by: Benjamin Cooke <benjamincooke@Benjamins-MacBook-Pro.local> Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Agniva De Sarker <agnivade@yahoo.co.in> Co-authored-by: Max Erenberg <max.erenberg@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
6bb1cbca63
Коммит
e4aa729a0c
4
Makefile
4
Makefile
@@ -315,6 +315,10 @@ sharedchannel-mocks: ## Creates mock files for shared channels.
|
||||
$(GOBIN)/mockery -dir=./services/sharedchannel -name=ServerIface -output=./services/sharedchannel -inpkg -outpkg=sharedchannel -testonly -note 'Regenerate this file using `make sharedchannel-mocks`.'
|
||||
$(GOBIN)/mockery -dir=./services/sharedchannel -name=AppIface -output=./services/sharedchannel -inpkg -outpkg=sharedchannel -testonly -note 'Regenerate this file using `make sharedchannel-mocks`.'
|
||||
|
||||
misc-mocks: ## Creates mocks for misc interfaces.
|
||||
$(GO) get -modfile=go.tools.mod github.com/vektra/mockery/...
|
||||
$(GOPATH)/bin/mockery -dir utils --name LicenseValidatorIface -output utils/mocks -note 'Regenerate this file using `make misc-mocks`.'
|
||||
|
||||
pluginapi: ## Generates api and hooks glue code for plugins
|
||||
$(GO) generate $(GOFLAGS) ./plugin
|
||||
|
||||
|
||||
@@ -11,12 +11,15 @@ import (
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v5/utils"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v5/audit"
|
||||
"github.com/mattermost/mattermost-server/v5/model"
|
||||
)
|
||||
|
||||
func (api *API) InitLicense() {
|
||||
api.BaseRoutes.ApiRoot.Handle("/trial-license", api.ApiSessionRequired(requestTrialLicense)).Methods("POST")
|
||||
api.BaseRoutes.ApiRoot.Handle("/trial-license/prev", api.ApiSessionRequired(getPrevTrialLicense)).Methods("GET")
|
||||
api.BaseRoutes.ApiRoot.Handle("/license", api.ApiSessionRequired(addLicense)).Methods("POST")
|
||||
api.BaseRoutes.ApiRoot.Handle("/license", api.ApiSessionRequired(removeLicense)).Methods("DELETE")
|
||||
api.BaseRoutes.ApiRoot.Handle("/license/renewal", api.ApiSessionRequired(requestRenewalLink)).Methods("GET")
|
||||
@@ -94,7 +97,28 @@ func addLicense(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
buf := bytes.NewBuffer(nil)
|
||||
io.Copy(buf, file)
|
||||
|
||||
license, appErr := c.App.Srv().SaveLicense(buf.Bytes())
|
||||
licenseBytes := buf.Bytes()
|
||||
license, appErr := utils.LicenseValidator.LicenseFromBytes(licenseBytes)
|
||||
if appErr != nil {
|
||||
c.Err = appErr
|
||||
return
|
||||
}
|
||||
|
||||
// skip the restrictions if license is a sanctioned trial
|
||||
if !license.IsSanctionedTrial() && license.IsTrialLicense() {
|
||||
canStartTrialLicense, err := c.App.Srv().LicenseManager.CanStartTrial()
|
||||
if err != nil {
|
||||
c.Err = model.NewAppError("addLicense", "api.license.add_license.open.app_error", nil, "", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if !canStartTrialLicense {
|
||||
c.Err = model.NewAppError("addLicense", "api.license.request-trial.can-start-trial.not-allowed", nil, "", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
license, appErr = c.App.Srv().SaveLicense(licenseBytes)
|
||||
if appErr != nil {
|
||||
if appErr.Id == model.EXPIRED_LICENSE_ERROR {
|
||||
c.LogAudit("failed - expired or non-started license")
|
||||
@@ -154,6 +178,17 @@ func requestTrialLicense(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
canStartTrialLicense, err := c.App.Srv().LicenseManager.CanStartTrial()
|
||||
if err != nil {
|
||||
c.Err = model.NewAppError("requestTrialLicense", "api.license.request-trial.can-start-trial.error", nil, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if !canStartTrialLicense {
|
||||
c.Err = model.NewAppError("requestTrialLicense", "api.license.request-trial.can-start-trial.not-allowed", nil, "", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
var trialRequest struct {
|
||||
Users int `json:"users"`
|
||||
TermsAccepted bool `json:"terms_accepted"`
|
||||
@@ -175,9 +210,9 @@ func requestTrialLicense(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
currentUser, err := c.App.GetUser(c.AppContext.Session().UserId)
|
||||
if err != nil {
|
||||
c.Err = err
|
||||
currentUser, appErr := c.App.GetUser(c.AppContext.Session().UserId)
|
||||
if appErr != nil {
|
||||
c.Err = appErr
|
||||
return
|
||||
}
|
||||
|
||||
@@ -238,3 +273,21 @@ func requestRenewalLink(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func getPrevTrialLicense(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
license, err := c.App.Srv().LicenseManager.GetPrevTrial()
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
var clientLicense map[string]string
|
||||
|
||||
if c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PERMISSION_READ_LICENSE_INFORMATION) {
|
||||
clientLicense = utils.GetClientLicense(license)
|
||||
} else {
|
||||
clientLicense = utils.GetSanitizedClientLicense(utils.GetClientLicense(license))
|
||||
}
|
||||
|
||||
w.Write([]byte(model.MapToJson(clientLicense)))
|
||||
}
|
||||
|
||||
@@ -4,9 +4,16 @@
|
||||
package api4
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v5/einterfaces/mocks"
|
||||
"github.com/mattermost/mattermost-server/v5/utils"
|
||||
mocks2 "github.com/mattermost/mattermost-server/v5/utils/mocks"
|
||||
"github.com/mattermost/mattermost-server/v5/utils/testutils"
|
||||
"github.com/stretchr/testify/mock"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v5/model"
|
||||
@@ -75,6 +82,85 @@ func TestUploadLicenseFile(t *testing.T) {
|
||||
CheckBadRequestStatus(t, resp)
|
||||
require.False(t, ok)
|
||||
})
|
||||
|
||||
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
|
||||
|
||||
ok, resp := th.SystemAdminClient.UploadLicenseFile([]byte("sadasdasdasdasdasdsa"))
|
||||
require.False(t, ok)
|
||||
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
|
||||
require.Equal(t, "api.license.request-trial.can-start-trial.not-allowed", resp.Error.Id)
|
||||
})
|
||||
|
||||
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
|
||||
|
||||
ok, resp := th.SystemAdminClient.UploadLicenseFile([]byte("sadasdasdasdasdasdsa"))
|
||||
require.False(t, ok)
|
||||
require.Equal(t, http.StatusOK, resp.StatusCode)
|
||||
require.Nil(t, resp.Error)
|
||||
})
|
||||
}
|
||||
|
||||
func TestRemoveLicenseFile(t *testing.T) {
|
||||
@@ -116,6 +202,10 @@ 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) {
|
||||
|
||||
@@ -181,6 +181,12 @@ func RegisterNotificationInterface(f func(*Server) einterfaces.NotificationInter
|
||||
notificationInterface = f
|
||||
}
|
||||
|
||||
var licenseInterface func(*Server) einterfaces.LicenseInterface
|
||||
|
||||
func RegisterLicenseInterface(f func(*Server) einterfaces.LicenseInterface) {
|
||||
licenseInterface = f
|
||||
}
|
||||
|
||||
func (s *Server) initEnterprise() {
|
||||
if metricsInterface != nil {
|
||||
s.Metrics = metricsInterface(s)
|
||||
@@ -200,6 +206,11 @@ func (s *Server) initEnterprise() {
|
||||
if elasticsearchInterface != nil {
|
||||
s.SearchEngine.RegisterElasticsearchEngine(elasticsearchInterface(s))
|
||||
}
|
||||
|
||||
if licenseInterface != nil {
|
||||
s.LicenseManager = licenseInterface(s)
|
||||
}
|
||||
|
||||
if accountMigrationInterface != nil {
|
||||
s.AccountMigration = accountMigrationInterface(s)
|
||||
}
|
||||
|
||||
@@ -38,6 +38,26 @@ func (s *Server) LoadLicense() {
|
||||
// ENV var overrides all other sources of license.
|
||||
licenseStr := os.Getenv(LicenseEnv)
|
||||
if licenseStr != "" {
|
||||
license, err := utils.LicenseValidator.LicenseFromBytes([]byte(licenseStr))
|
||||
if err != nil {
|
||||
mlog.Error("Failed to read license set in environment.", mlog.Err(err))
|
||||
return
|
||||
}
|
||||
|
||||
// skip the restrictions if license is a sanctioned trial
|
||||
if !license.IsSanctionedTrial() && license.IsTrialLicense() {
|
||||
canStartTrialLicense, err := s.LicenseManager.CanStartTrial()
|
||||
if err != nil {
|
||||
mlog.Info("Failed to validate trial eligibility.", mlog.Err(err))
|
||||
return
|
||||
}
|
||||
|
||||
if !canStartTrialLicense {
|
||||
mlog.Info("Cannot start trial multiple times.")
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if s.ValidateAndSetLicenseBytes([]byte(licenseStr)) {
|
||||
mlog.Info("License key from ENV is valid, unlocking enterprise features.")
|
||||
}
|
||||
@@ -75,7 +95,7 @@ func (s *Server) LoadLicense() {
|
||||
}
|
||||
|
||||
func (s *Server) SaveLicense(licenseBytes []byte) (*model.License, *model.AppError) {
|
||||
success, licenseStr := utils.ValidateLicense(licenseBytes)
|
||||
success, licenseStr := utils.LicenseValidator.ValidateLicense(licenseBytes)
|
||||
if !success {
|
||||
return nil, model.NewAppError("addLicense", model.INVALID_LICENSE_ERROR, nil, "", http.StatusBadRequest)
|
||||
}
|
||||
@@ -174,7 +194,7 @@ func (s *Server) SetLicense(license *model.License) bool {
|
||||
}
|
||||
|
||||
func (s *Server) ValidateAndSetLicenseBytes(b []byte) bool {
|
||||
if success, licenseStr := utils.ValidateLicense(b); success {
|
||||
if success, licenseStr := utils.LicenseValidator.ValidateLicense(b); success {
|
||||
license := model.LicenseFromJson(strings.NewReader(licenseStr))
|
||||
s.SetLicense(license)
|
||||
return true
|
||||
@@ -228,22 +248,7 @@ func (s *Server) RemoveLicenseListener(id string) {
|
||||
}
|
||||
|
||||
func (s *Server) GetSanitizedClientLicense() map[string]string {
|
||||
sanitizedLicense := make(map[string]string)
|
||||
|
||||
for k, v := range s.ClientLicense() {
|
||||
sanitizedLicense[k] = v
|
||||
}
|
||||
|
||||
delete(sanitizedLicense, "Id")
|
||||
delete(sanitizedLicense, "Name")
|
||||
delete(sanitizedLicense, "Email")
|
||||
delete(sanitizedLicense, "IssuedAt")
|
||||
delete(sanitizedLicense, "StartsAt")
|
||||
delete(sanitizedLicense, "ExpiresAt")
|
||||
delete(sanitizedLicense, "SkuName")
|
||||
delete(sanitizedLicense, "SkuShortName")
|
||||
|
||||
return sanitizedLicense
|
||||
return utils.GetSanitizedClientLicense(s.ClientLicense())
|
||||
}
|
||||
|
||||
// RequestTrialLicense request a trial license from the mattermost official license server
|
||||
|
||||
@@ -191,6 +191,7 @@ type Server struct {
|
||||
Metrics einterfaces.MetricsInterface
|
||||
Notification einterfaces.NotificationInterface
|
||||
Saml einterfaces.SamlInterface
|
||||
LicenseManager einterfaces.LicenseInterface
|
||||
|
||||
CacheProvider cache.Provider
|
||||
|
||||
|
||||
11
einterfaces/license.go
Обычный файл
11
einterfaces/license.go
Обычный файл
@@ -0,0 +1,11 @@
|
||||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
|
||||
package einterfaces
|
||||
|
||||
import "github.com/mattermost/mattermost-server/v5/model"
|
||||
|
||||
type LicenseInterface interface {
|
||||
CanStartTrial() (bool, error)
|
||||
GetPrevTrial() (*model.License, error)
|
||||
}
|
||||
59
einterfaces/mocks/LicenseInterface.go
Обычный файл
59
einterfaces/mocks/LicenseInterface.go
Обычный файл
@@ -0,0 +1,59 @@
|
||||
// Code generated by mockery v1.0.0. DO NOT EDIT.
|
||||
|
||||
// Regenerate this file using `make einterfaces-mocks`.
|
||||
|
||||
package mocks
|
||||
|
||||
import (
|
||||
model "github.com/mattermost/mattermost-server/v5/model"
|
||||
mock "github.com/stretchr/testify/mock"
|
||||
)
|
||||
|
||||
// LicenseInterface is an autogenerated mock type for the LicenseInterface type
|
||||
type LicenseInterface struct {
|
||||
mock.Mock
|
||||
}
|
||||
|
||||
// CanStartTrial provides a mock function with given fields:
|
||||
func (_m *LicenseInterface) CanStartTrial() (bool, error) {
|
||||
ret := _m.Called()
|
||||
|
||||
var r0 bool
|
||||
if rf, ok := ret.Get(0).(func() bool); ok {
|
||||
r0 = rf()
|
||||
} else {
|
||||
r0 = ret.Get(0).(bool)
|
||||
}
|
||||
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func() error); ok {
|
||||
r1 = rf()
|
||||
} else {
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetPrevTrial provides a mock function with given fields:
|
||||
func (_m *LicenseInterface) GetPrevTrial() (*model.License, error) {
|
||||
ret := _m.Called()
|
||||
|
||||
var r0 *model.License
|
||||
if rf, ok := ret.Get(0).(func() *model.License); ok {
|
||||
r0 = rf()
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.License)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func() error); ok {
|
||||
r1 = rf()
|
||||
} else {
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
@@ -1976,6 +1976,14 @@
|
||||
"id": "api.license.request-trial.bad-request.terms-not-accepted",
|
||||
"translation": "You must accept the Mattermost Software Evaluation Agreement and Privacy Policy to request a license."
|
||||
},
|
||||
{
|
||||
"id": "api.license.request-trial.can-start-trial.error",
|
||||
"translation": "Could not check if a trial can be started"
|
||||
},
|
||||
{
|
||||
"id": "api.license.request-trial.can-start-trial.not-allowed",
|
||||
"translation": "This trial license key for Mattermost Enterprise Edition has expired and is no longer valid. If you would like to extend your trial period please [contact our sales team](https://mattermost.com/contact-us/)."
|
||||
},
|
||||
{
|
||||
"id": "api.license.request_renewal_link.app_error",
|
||||
"translation": "Error getting the license renewal link"
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"encoding/json"
|
||||
"io"
|
||||
"net/http"
|
||||
"time"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -16,6 +17,16 @@ const (
|
||||
LICENSE_RENEWAL_LINK = "https://mattermost.com/renew/"
|
||||
)
|
||||
|
||||
var (
|
||||
trialDuration = 30*(time.Hour*24) + (time.Hour * 8) // 720 hours (30 days) + 8 hours is trial license duration
|
||||
adminTrialDuration = 30*(time.Hour*24) + (time.Hour * 23) + (time.Minute * 59) + (time.Second * 59) // 720 hours (30 days) + 23 hours, 59 mins and 59 seconds
|
||||
|
||||
// a sanctioned trial's duration is either more than the upper bound,
|
||||
// or less than the lower bound
|
||||
sanctionedTrialDurationLowerBound = 31*(time.Hour*24) + (time.Hour * 23) + (time.Minute * 59) + (time.Second * 59) // 744 hours (31 days) + 23 hours, 59 mins and 59 seconds
|
||||
sanctionedTrialDurationUpperBound = 29*(time.Hour*24) + (time.Hour * 23) + (time.Minute * 59) + (time.Second * 59) // 696 hours (29 days) + 23 hours, 59 mins and 59 seconds
|
||||
)
|
||||
|
||||
type LicenseRecord struct {
|
||||
Id string `json:"id"`
|
||||
CreateAt int64 `json:"create_at"`
|
||||
@@ -263,6 +274,17 @@ func (l *License) ToJson() string {
|
||||
return string(b)
|
||||
}
|
||||
|
||||
func (l *License) IsTrialLicense() bool {
|
||||
return l.IsTrial || (l.ExpiresAt-l.StartsAt) == trialDuration.Milliseconds() || (l.ExpiresAt-l.StartsAt) == adminTrialDuration.Milliseconds()
|
||||
}
|
||||
|
||||
func (l *License) IsSanctionedTrial() bool {
|
||||
duration := l.ExpiresAt - l.StartsAt
|
||||
|
||||
return l.IsTrialLicense() &&
|
||||
(duration >= sanctionedTrialDurationLowerBound.Milliseconds() || duration <= sanctionedTrialDurationUpperBound.Milliseconds())
|
||||
}
|
||||
|
||||
// NewTestLicense returns a license that expires in the future and has the given features.
|
||||
func NewTestLicense(features ...string) *License {
|
||||
ret := &License{
|
||||
|
||||
@@ -6,6 +6,7 @@ package model
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
@@ -240,3 +241,147 @@ func TestLicenseRecordPreSave(t *testing.T) {
|
||||
|
||||
assert.NotZero(t, lr.CreateAt)
|
||||
}
|
||||
|
||||
func TestLicense_IsTrialLicense(t *testing.T) {
|
||||
t.Run("detect trial license directly from the flag", func(t *testing.T) {
|
||||
license := &License{
|
||||
IsTrial: true,
|
||||
}
|
||||
assert.True(t, license.IsTrial)
|
||||
|
||||
license.IsTrial = false
|
||||
assert.False(t, license.IsTrialLicense())
|
||||
})
|
||||
|
||||
t.Run("detect trial license form duration", func(t *testing.T) {
|
||||
startDate, err := time.Parse(time.RFC822, "01 Jan 21 00:00 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
endDate, err := time.Parse(time.RFC822, "31 Jan 21 08:00 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
license := &License{
|
||||
StartsAt: startDate.UnixNano() / int64(time.Millisecond),
|
||||
ExpiresAt: endDate.UnixNano() / int64(time.Millisecond),
|
||||
}
|
||||
assert.True(t, license.IsTrialLicense())
|
||||
|
||||
endDate, err = time.Parse(time.RFC822, "01 Feb 21 08:00 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
license.ExpiresAt = endDate.UnixNano() / int64(time.Millisecond)
|
||||
assert.False(t, license.IsTrialLicense())
|
||||
|
||||
// 30 days + 23 hours 59 mins 59 seconds
|
||||
endDate, err = time.Parse("02 Jan 06 15:04:05 MST", "31 Jan 21 23:59:59 UTC")
|
||||
assert.NoError(t, err)
|
||||
license.ExpiresAt = endDate.UnixNano() / int64(time.Millisecond)
|
||||
assert.True(t, license.IsTrialLicense())
|
||||
})
|
||||
|
||||
t.Run("detect trial with both flag and duration", func(t *testing.T) {
|
||||
startDate, err := time.Parse(time.RFC822, "01 Jan 21 00:00 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
endDate, err := time.Parse(time.RFC822, "31 Jan 21 08:00 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
license := &License{
|
||||
IsTrial: true,
|
||||
StartsAt: startDate.UnixNano() / int64(time.Millisecond),
|
||||
ExpiresAt: endDate.UnixNano() / int64(time.Millisecond),
|
||||
}
|
||||
|
||||
assert.True(t, license.IsTrialLicense())
|
||||
license.IsTrial = false
|
||||
|
||||
// detecting trial from duration
|
||||
assert.True(t, license.IsTrialLicense())
|
||||
|
||||
endDate, _ = time.Parse(time.RFC822, "1 Feb 2021 08:00 UTC")
|
||||
license.ExpiresAt = endDate.UnixNano() / int64(time.Millisecond)
|
||||
assert.False(t, license.IsTrialLicense())
|
||||
|
||||
license.IsTrial = true
|
||||
assert.True(t, license.IsTrialLicense())
|
||||
})
|
||||
}
|
||||
|
||||
func TestLicense_IsSanctionedTrial(t *testing.T) {
|
||||
t.Run("short duration sanctioned trial", func(t *testing.T) {
|
||||
startDate, err := time.Parse(time.RFC822, "01 Jan 21 00:00 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
endDate, err := time.Parse(time.RFC822, "08 Jan 21 08:00 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
license := &License{
|
||||
IsTrial: true,
|
||||
StartsAt: startDate.UnixNano() / int64(time.Millisecond),
|
||||
ExpiresAt: endDate.UnixNano() / int64(time.Millisecond),
|
||||
}
|
||||
|
||||
assert.True(t, license.IsSanctionedTrial())
|
||||
|
||||
license.IsTrial = false
|
||||
assert.False(t, license.IsSanctionedTrial())
|
||||
})
|
||||
|
||||
t.Run("long duration sanctioned trial", func(t *testing.T) {
|
||||
startDate, err := time.Parse(time.RFC822, "01 Jan 21 00:00 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
endDate, err := time.Parse(time.RFC822, "02 Feb 21 08:00 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
license := &License{
|
||||
IsTrial: true,
|
||||
StartsAt: startDate.UnixNano() / int64(time.Millisecond),
|
||||
ExpiresAt: endDate.UnixNano() / int64(time.Millisecond),
|
||||
}
|
||||
|
||||
assert.True(t, license.IsSanctionedTrial())
|
||||
|
||||
license.IsTrial = false
|
||||
assert.False(t, license.IsSanctionedTrial())
|
||||
})
|
||||
|
||||
t.Run("invalid duration for sanctioned trial", func(t *testing.T) {
|
||||
startDate, err := time.Parse(time.RFC822, "01 Jan 21 00:00 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
endDate, err := time.Parse(time.RFC822, "31 Jan 21 08:00 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
license := &License{
|
||||
IsTrial: true,
|
||||
StartsAt: startDate.UnixNano() / int64(time.Millisecond),
|
||||
ExpiresAt: endDate.UnixNano() / int64(time.Millisecond),
|
||||
}
|
||||
|
||||
assert.False(t, license.IsSanctionedTrial())
|
||||
})
|
||||
|
||||
t.Run("boundary conditions for sanctioned trial", func(t *testing.T) {
|
||||
startDate, err := time.Parse(time.RFC822, "01 Jan 21 00:00 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
// 29 days + 23 hours 59 mins 59 seconds
|
||||
endDate, err := time.Parse("02 Jan 06 15:04:05 MST", "30 Jan 21 23:59:59 UTC")
|
||||
assert.NoError(t, err)
|
||||
|
||||
license := &License{
|
||||
IsTrial: true,
|
||||
StartsAt: startDate.UnixNano() / int64(time.Millisecond),
|
||||
ExpiresAt: endDate.UnixNano() / int64(time.Millisecond),
|
||||
}
|
||||
|
||||
assert.True(t, license.IsSanctionedTrial())
|
||||
|
||||
// 31 days + 23 hours 59 mins 59 seconds
|
||||
endDate, err = time.Parse("02 Jan 06 15:04:05 MST", "01 Feb 21 23:59:59 UTC")
|
||||
assert.NoError(t, err)
|
||||
license.ExpiresAt = endDate.UnixNano() / int64(time.Millisecond)
|
||||
assert.True(t, license.IsSanctionedTrial())
|
||||
})
|
||||
}
|
||||
|
||||
@@ -4393,6 +4393,24 @@ func (s *OpenTracingLayerLicenseStore) Get(id string) (*model.LicenseRecord, err
|
||||
return result, err
|
||||
}
|
||||
|
||||
func (s *OpenTracingLayerLicenseStore) GetAll() ([]*model.LicenseRecord, error) {
|
||||
origCtx := s.Root.Store.Context()
|
||||
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "LicenseStore.GetAll")
|
||||
s.Root.Store.SetContext(newCtx)
|
||||
defer func() {
|
||||
s.Root.Store.SetContext(origCtx)
|
||||
}()
|
||||
|
||||
defer span.Finish()
|
||||
result, err := s.LicenseStore.GetAll()
|
||||
if err != nil {
|
||||
span.LogFields(spanlog.Error(err))
|
||||
ext.Error.Set(span, true)
|
||||
}
|
||||
|
||||
return result, err
|
||||
}
|
||||
|
||||
func (s *OpenTracingLayerLicenseStore) Save(license *model.LicenseRecord) (*model.LicenseRecord, error) {
|
||||
origCtx := s.Root.Store.Context()
|
||||
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "LicenseStore.Save")
|
||||
|
||||
@@ -4746,6 +4746,26 @@ func (s *RetryLayerLicenseStore) Get(id string) (*model.LicenseRecord, error) {
|
||||
|
||||
}
|
||||
|
||||
func (s *RetryLayerLicenseStore) GetAll() ([]*model.LicenseRecord, error) {
|
||||
|
||||
tries := 0
|
||||
for {
|
||||
result, err := s.LicenseStore.GetAll()
|
||||
if err == nil {
|
||||
return result, nil
|
||||
}
|
||||
if !isRepeatableError(err) {
|
||||
return result, err
|
||||
}
|
||||
tries++
|
||||
if tries >= 3 {
|
||||
err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures")
|
||||
return result, err
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (s *RetryLayerLicenseStore) Save(license *model.LicenseRecord) (*model.LicenseRecord, error) {
|
||||
|
||||
tries := 0
|
||||
|
||||
@@ -75,3 +75,21 @@ func (ls SqlLicenseStore) Get(id string) (*model.LicenseRecord, error) {
|
||||
}
|
||||
return obj.(*model.LicenseRecord), nil
|
||||
}
|
||||
|
||||
func (ls SqlLicenseStore) GetAll() ([]*model.LicenseRecord, error) {
|
||||
query := ls.getQueryBuilder().
|
||||
Select("*").
|
||||
From("Licenses")
|
||||
|
||||
queryString, _, err := query.ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "license_tosql")
|
||||
}
|
||||
|
||||
var licenses []*model.LicenseRecord
|
||||
if _, err := ls.GetReplica().Select(&licenses, queryString); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to fetch licenses")
|
||||
}
|
||||
|
||||
return licenses, nil
|
||||
}
|
||||
|
||||
@@ -578,6 +578,7 @@ type PreferenceStore interface {
|
||||
type LicenseStore interface {
|
||||
Save(license *model.LicenseRecord) (*model.LicenseRecord, error)
|
||||
Get(id string) (*model.LicenseRecord, error)
|
||||
GetAll() ([]*model.LicenseRecord, error)
|
||||
}
|
||||
|
||||
type TokenStore interface {
|
||||
|
||||
@@ -37,6 +37,29 @@ func (_m *LicenseStore) Get(id string) (*model.LicenseRecord, error) {
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetAll provides a mock function with given fields:
|
||||
func (_m *LicenseStore) GetAll() ([]*model.LicenseRecord, error) {
|
||||
ret := _m.Called()
|
||||
|
||||
var r0 []*model.LicenseRecord
|
||||
if rf, ok := ret.Get(0).(func() []*model.LicenseRecord); ok {
|
||||
r0 = rf()
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]*model.LicenseRecord)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func() error); ok {
|
||||
r1 = rf()
|
||||
} else {
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// Save provides a mock function with given fields: license
|
||||
func (_m *LicenseStore) Save(license *model.LicenseRecord) (*model.LicenseRecord, error) {
|
||||
ret := _m.Called(license)
|
||||
|
||||
@@ -3995,6 +3995,22 @@ func (s *TimerLayerLicenseStore) Get(id string) (*model.LicenseRecord, error) {
|
||||
return result, err
|
||||
}
|
||||
|
||||
func (s *TimerLayerLicenseStore) GetAll() ([]*model.LicenseRecord, error) {
|
||||
start := timemodule.Now()
|
||||
|
||||
result, err := s.LicenseStore.GetAll()
|
||||
|
||||
elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second)
|
||||
if s.Root.Metrics != nil {
|
||||
success := "false"
|
||||
if err == nil {
|
||||
success = "true"
|
||||
}
|
||||
s.Root.Metrics.ObserveStoreMethodDuration("LicenseStore.GetAll", success, elapsed)
|
||||
}
|
||||
return result, err
|
||||
}
|
||||
|
||||
func (s *TimerLayerLicenseStore) Save(license *model.LicenseRecord) (*model.LicenseRecord, error) {
|
||||
start := timemodule.Now()
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ import (
|
||||
"encoding/base64"
|
||||
"encoding/pem"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
@@ -31,7 +32,33 @@ a0v85XL6i9ote2P+fLZ3wX9EoioHzgdgB7arOxY50QRJO7OyCqpKFKv6lRWTXuSt
|
||||
hwIDAQAB
|
||||
-----END PUBLIC KEY-----`)
|
||||
|
||||
func ValidateLicense(signed []byte) (bool, string) {
|
||||
var LicenseValidator LicenseValidatorIface
|
||||
|
||||
func init() {
|
||||
if LicenseValidator == nil {
|
||||
LicenseValidator = &LicenseValidatorImpl{}
|
||||
}
|
||||
}
|
||||
|
||||
type LicenseValidatorIface interface {
|
||||
LicenseFromBytes(licenseBytes []byte) (*model.License, *model.AppError)
|
||||
ValidateLicense(signed []byte) (bool, string)
|
||||
}
|
||||
|
||||
type LicenseValidatorImpl struct {
|
||||
}
|
||||
|
||||
func (l *LicenseValidatorImpl) LicenseFromBytes(licenseBytes []byte) (*model.License, *model.AppError) {
|
||||
success, licenseStr := l.ValidateLicense(licenseBytes)
|
||||
if !success {
|
||||
return nil, model.NewAppError("LicenseFromBytes", model.INVALID_LICENSE_ERROR, nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
license := model.LicenseFromJson(strings.NewReader(licenseStr))
|
||||
return license, nil
|
||||
}
|
||||
|
||||
func (l *LicenseValidatorImpl) ValidateLicense(signed []byte) (bool, string) {
|
||||
decoded := make([]byte, base64.StdEncoding.DecodedLen(len(signed)))
|
||||
|
||||
_, err := base64.StdEncoding.Decode(decoded, signed)
|
||||
@@ -87,7 +114,7 @@ func GetAndValidateLicenseFileFromDisk(location string) (*model.License, []byte)
|
||||
mlog.Info("License key has not been uploaded. Loading license key from disk at", mlog.String("filename", fileName))
|
||||
licenseBytes := GetLicenseFileFromDisk(fileName)
|
||||
|
||||
success, licenseStr := ValidateLicense(licenseBytes)
|
||||
success, licenseStr := LicenseValidator.ValidateLicense(licenseBytes)
|
||||
if !success {
|
||||
mlog.Error("Found license key at %v but it appears to be invalid.", mlog.String("filename", fileName))
|
||||
return nil, nil
|
||||
@@ -161,7 +188,27 @@ func GetClientLicense(l *model.License) map[string]string {
|
||||
props["Cloud"] = strconv.FormatBool(*l.Features.Cloud)
|
||||
props["SharedChannels"] = strconv.FormatBool(*l.Features.SharedChannels)
|
||||
props["RemoteClusterService"] = strconv.FormatBool(*l.Features.RemoteClusterService)
|
||||
props["IsTrial"] = strconv.FormatBool(l.IsTrial)
|
||||
}
|
||||
|
||||
return props
|
||||
}
|
||||
|
||||
func GetSanitizedClientLicense(l map[string]string) map[string]string {
|
||||
sanitizedLicense := make(map[string]string)
|
||||
|
||||
for k, v := range l {
|
||||
sanitizedLicense[k] = v
|
||||
}
|
||||
|
||||
delete(sanitizedLicense, "Id")
|
||||
delete(sanitizedLicense, "Name")
|
||||
delete(sanitizedLicense, "Email")
|
||||
delete(sanitizedLicense, "IssuedAt")
|
||||
delete(sanitizedLicense, "StartsAt")
|
||||
delete(sanitizedLicense, "ExpiresAt")
|
||||
delete(sanitizedLicense, "SkuName")
|
||||
delete(sanitizedLicense, "SkuShortName")
|
||||
|
||||
return sanitizedLicense
|
||||
}
|
||||
|
||||
@@ -14,11 +14,11 @@ import (
|
||||
|
||||
func TestValidateLicense(t *testing.T) {
|
||||
b1 := []byte("junk")
|
||||
ok, _ := ValidateLicense(b1)
|
||||
ok, _ := LicenseValidator.ValidateLicense(b1)
|
||||
require.False(t, ok, "should have failed - bad license")
|
||||
|
||||
b2 := []byte("junkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunk")
|
||||
ok, _ = ValidateLicense(b2)
|
||||
ok, _ = LicenseValidator.ValidateLicense(b2)
|
||||
require.False(t, ok, "should have failed - bad license")
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ func TestGetLicenseFileFromDisk(t *testing.T) {
|
||||
fileBytes := GetLicenseFileFromDisk(f.Name())
|
||||
require.NotEmpty(t, fileBytes, "should have read the file")
|
||||
|
||||
success, _ := ValidateLicense(fileBytes)
|
||||
success, _ := LicenseValidator.ValidateLicense(fileBytes)
|
||||
assert.False(t, success, "should have been an invalid file")
|
||||
})
|
||||
}
|
||||
|
||||
61
utils/mocks/LicenseValidatorIface.go
Обычный файл
61
utils/mocks/LicenseValidatorIface.go
Обычный файл
@@ -0,0 +1,61 @@
|
||||
// Code generated by mockery v1.0.0. DO NOT EDIT.
|
||||
|
||||
// Regenerate this file using `make misc-mocks`.
|
||||
|
||||
package mocks
|
||||
|
||||
import (
|
||||
model "github.com/mattermost/mattermost-server/v5/model"
|
||||
mock "github.com/stretchr/testify/mock"
|
||||
)
|
||||
|
||||
// LicenseValidatorIface is an autogenerated mock type for the LicenseValidatorIface type
|
||||
type LicenseValidatorIface struct {
|
||||
mock.Mock
|
||||
}
|
||||
|
||||
// LicenseFromBytes provides a mock function with given fields: licenseBytes
|
||||
func (_m *LicenseValidatorIface) LicenseFromBytes(licenseBytes []byte) (*model.License, *model.AppError) {
|
||||
ret := _m.Called(licenseBytes)
|
||||
|
||||
var r0 *model.License
|
||||
if rf, ok := ret.Get(0).(func([]byte) *model.License); ok {
|
||||
r0 = rf(licenseBytes)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.License)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func([]byte) *model.AppError); ok {
|
||||
r1 = rf(licenseBytes)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// ValidateLicense provides a mock function with given fields: signed
|
||||
func (_m *LicenseValidatorIface) ValidateLicense(signed []byte) (bool, string) {
|
||||
ret := _m.Called(signed)
|
||||
|
||||
var r0 bool
|
||||
if rf, ok := ret.Get(0).(func([]byte) bool); ok {
|
||||
r0 = rf(signed)
|
||||
} else {
|
||||
r0 = ret.Get(0).(bool)
|
||||
}
|
||||
|
||||
var r1 string
|
||||
if rf, ok := ret.Get(1).(func([]byte) string); ok {
|
||||
r1 = rf(signed)
|
||||
} else {
|
||||
r1 = ret.Get(1).(string)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
@@ -14,6 +14,8 @@ import (
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v5/utils"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v5/utils/fileutils"
|
||||
)
|
||||
|
||||
@@ -72,3 +74,7 @@ func GetInterface(port int) string {
|
||||
}
|
||||
return string(out)
|
||||
}
|
||||
|
||||
func ResetLicenseValidator() {
|
||||
utils.LicenseValidator = &utils.LicenseValidatorImpl{}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user