mirror of
https://github.com/grafana/grafana.git
synced 2025-02-20 11:48:34 -06:00
722c414fef
* Encryption: Add support to encrypt/decrypt sjd * Add datasources.Service as a proxy to datasources db operations * Encrypt ds.SecureJsonData before calling SQLStore * Move ds cache code into ds service * Fix tlsmanager tests * Fix pluginproxy tests * Remove some securejsondata.GetEncryptedJsonData usages * Add pluginsettings.Service as a proxy for plugin settings db operations * Add AlertNotificationService as a proxy for alert notification db operations * Remove some securejsondata.GetEncryptedJsonData usages * Remove more securejsondata.GetEncryptedJsonData usages * Fix lint errors * Minor fixes * Remove encryption global functions usages from ngalert * Fix lint errors * Minor fixes * Minor fixes * Remove securejsondata.DecryptedValue usage * Refactor the refactor * Remove securejsondata.DecryptedValue usage * Move securejsondata to migrations package * Move securejsondata to migrations package * Minor fix * Fix integration test * Fix integration tests * Undo undesired changes * Fix tests * Add context.Context into encryption methods * Fix tests * Fix tests * Fix tests * Trigger CI * Fix test * Add names to params of encryption service interface * Remove bus from CacheServiceImpl * Add logging * Add keys to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Add missing key to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Undo changes in markdown files * Fix formatting * Add context to secrets service * Rename decryptSecureJsonData to decryptSecureJsonDataFn * Name args in GetDecryptedValueFn * Add template back to NewAlertmanagerNotifier * Copy GetDecryptedValueFn to ngalert * Add logging to pluginsettings * Fix pluginsettings test Co-authored-by: Tania B <yalyna.ts@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
57 lines
1.7 KiB
Go
57 lines
1.7 KiB
Go
package alerting
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/grafana/grafana/pkg/bus"
|
|
"github.com/grafana/grafana/pkg/components/simplejson"
|
|
"github.com/grafana/grafana/pkg/models"
|
|
"github.com/grafana/grafana/pkg/services/encryption/ossencryption"
|
|
"github.com/grafana/grafana/pkg/services/sqlstore"
|
|
"github.com/grafana/grafana/pkg/setting"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestService(t *testing.T) {
|
|
sqlStore := sqlstore.InitTestDB(t)
|
|
|
|
s := ProvideService(bus.New(), sqlStore, ossencryption.ProvideService())
|
|
|
|
origSecret := setting.SecretKey
|
|
setting.SecretKey = "alert_notification_service_test"
|
|
t.Cleanup(func() {
|
|
setting.SecretKey = origSecret
|
|
})
|
|
|
|
var an *models.AlertNotification
|
|
|
|
t.Run("create alert notification should encrypt the secure json data", func(t *testing.T) {
|
|
ctx := context.Background()
|
|
|
|
ss := map[string]string{"password": "12345"}
|
|
cmd := models.CreateAlertNotificationCommand{SecureSettings: ss}
|
|
|
|
err := s.CreateAlertNotificationCommand(ctx, &cmd)
|
|
require.NoError(t, err)
|
|
|
|
an = cmd.Result
|
|
decrypted, err := s.EncryptionService.DecryptJsonData(ctx, an.SecureSettings, setting.SecretKey)
|
|
require.NoError(t, err)
|
|
require.Equal(t, ss, decrypted)
|
|
})
|
|
|
|
t.Run("update alert notification should encrypt the secure json data", func(t *testing.T) {
|
|
ctx := context.Background()
|
|
|
|
ss := map[string]string{"password": "678910"}
|
|
cmd := models.UpdateAlertNotificationCommand{Id: an.Id, Settings: simplejson.New(), SecureSettings: ss}
|
|
err := s.UpdateAlertNotification(ctx, &cmd)
|
|
require.NoError(t, err)
|
|
|
|
decrypted, err := s.EncryptionService.DecryptJsonData(ctx, cmd.Result.SecureSettings, setting.SecretKey)
|
|
require.NoError(t, err)
|
|
require.Equal(t, ss, decrypted)
|
|
})
|
|
}
|