Skip to content

Commit

Permalink
Fix listener receiving encrypted content when kms is open. (nacos-gro…
Browse files Browse the repository at this point in the history
…up#549)

* Fix listener receiving encrypted content when kms is open.
  • Loading branch information
a3d21 authored Dec 26, 2022
1 parent c819fd3 commit 8fb78d1
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions clients/config_client/config_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,18 @@ type cacheDataListener struct {
lastMd5 string
}

func (cacheData *cacheData) executeListener() {
cacheData.cacheDataListener.lastMd5 = cacheData.md5

decryptedContent, err := cacheData.configClient.decrypt(cacheData.dataId, cacheData.content)
if err != nil {
logger.Errorf("decrypt content fail ,dataId=%s,group=%s,tenant=%s,err:%+v ", cacheData.dataId,
cacheData.group, cacheData.tenant, err)
return
}
go cacheData.cacheDataListener.listener(cacheData.tenant, cacheData.group, cacheData.dataId, decryptedContent)
}

func NewConfigClient(nc nacos_client.INacosClient) (*ConfigClient, error) {
config := &ConfigClient{}
config.ctx, config.cancel = context.WithCancel(context.Background())
Expand Down Expand Up @@ -390,8 +402,7 @@ func (client *ConfigClient) executeConfigListen() {

if cache.isSyncWithServer {
if cache.md5 != cache.cacheDataListener.lastMd5 {
go cache.cacheDataListener.listener(cache.tenant, cache.group, cache.dataId, cache.content)
cache.cacheDataListener.lastMd5 = cache.md5
cache.executeListener()
}
if !needAllSync {
continue
Expand Down Expand Up @@ -478,9 +489,9 @@ func (client *ConfigClient) refreshContentAndCheck(cacheData *cacheData, notify
}
cacheData.md5 = util.Md5(cacheData.content)
if cacheData.md5 != cacheData.cacheDataListener.lastMd5 {
go cacheData.cacheDataListener.listener(cacheData.tenant, cacheData.group, cacheData.dataId, cacheData.content)
cacheData.cacheDataListener.lastMd5 = cacheData.md5
client.cacheMap.Set(util.GetConfigCacheKey(cacheData.dataId, cacheData.group, cacheData.tenant), cacheData)

cacheData.executeListener()
}
}

Expand Down

0 comments on commit 8fb78d1

Please sign in to comment.