gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-11 23:54:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2923 from gravitl/hotfix/telemetry-trial-end-date

Browse source 
update develop with v0.24.0 hotfixes
This commit is contained in:
Abhishek K 2024-05-07 16:14:17 +05:30 • committed by GitHub
commit 2c38d1e8b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
logic/serverconf.go
View file

@ -21,9 +21,11 @@ var (
EgressesLimit = 1000000000
// FreeTier - specifies if free tier
FreeTier = false
// DefaultTrialEndDate - is a placeholder date for not applicable trial end dates
DefaultTrialEndDate, _ = time.Parse("2006-Jan-02", "2021-Apr-01")
GetTrialEndDate = func() (time.Time, error) {
return time.Time{}, nil
return DefaultTrialEndDate, nil
}
)

16
pro/trial.go
View file

@ -124,37 +124,37 @@ func TrialLicenseHook() error {
func getTrialEndDate() (time.Time, error) {
record, err := database.FetchRecord(trial_table_name, trial_data_key)
if err != nil {
return time.Time{}, err
return logic.DefaultTrialEndDate, err
}
var trialInfo TrialInfo
err = json.Unmarshal([]byte(record), &trialInfo)
if err != nil {
return time.Time{}, err
return logic.DefaultTrialEndDate, err
}
tel, err := logic.FetchTelemetryRecord()
if err != nil {
return time.Time{}, err
return logic.DefaultTrialEndDate, err
}
telePrivKey, err := ncutils.ConvertBytesToKey(tel.TrafficKeyPriv)
if err != nil {
return time.Time{}, err
return logic.DefaultTrialEndDate, err
}
trialPubKey, err := ncutils.ConvertBytesToKey(trialInfo.PubKey)
if err != nil {
return time.Time{}, err
return logic.DefaultTrialEndDate, err
}
// decrypt secret
secretDecrypt, err := ncutils.BoxDecrypt(trialInfo.Secret, trialPubKey, telePrivKey)
if err != nil {
return time.Time{}, err
return logic.DefaultTrialEndDate, err
}
trialDates := TrialDates{}
err = json.Unmarshal(secretDecrypt, &trialDates)
if err != nil {
return time.Time{}, err
return logic.DefaultTrialEndDate, err
}
if trialDates.TrialEndsAt.IsZero() {
return time.Time{}, errors.New("invalid date")
return logic.DefaultTrialEndDate, errors.New("invalid date")
}
return trialDates.TrialEndsAt, nil