Add protection in case of nil arguments for cgr-console for PostprocessRpcParams fixes #1642

This commit is contained in:
TeoV
2019-08-01 10:36:20 +03:00
committed by Dan Christian Bogos
parent 48d966e0c6
commit cae07d1e35
14 changed files with 29 additions and 16 deletions

View File

@@ -58,7 +58,7 @@ func (self *CmdAttributesProcessEvent) RpcParams(reset bool) interface{} {
}
func (self *CmdAttributesProcessEvent) PostprocessRpcParams() error {
if self.rpcParams.Time == nil {
if self.rpcParams != nil && self.rpcParams.Time == nil {
self.rpcParams.Time = utils.TimePointer(time.Now())
}
return nil

View File

@@ -61,7 +61,8 @@ func (self *CmdChargersProcessEvent) RpcParams(reset bool) interface{} {
}
func (self *CmdChargersProcessEvent) PostprocessRpcParams() error {
if self.rpcParams.CGREvent != nil && self.rpcParams.Time == nil {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.Time == nil {
self.rpcParams.Time = utils.TimePointer(time.Now())
}
return nil

View File

@@ -58,7 +58,8 @@ func (self *CmdResourceAllocate) RpcParams(reset bool) interface{} {
}
func (self *CmdResourceAllocate) PostprocessRpcParams() error {
if self.rpcParams.CGREvent.Time == nil {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
}
return nil

View File

@@ -58,7 +58,8 @@ func (self *CmdResourceAuthorize) RpcParams(reset bool) interface{} {
}
func (self *CmdResourceAuthorize) PostprocessRpcParams() error {
if self.rpcParams.CGREvent.Time == nil {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
}
return nil

View File

@@ -59,7 +59,8 @@ func (self *CmdGetResourceForEvent) RpcParams(reset bool) interface{} {
}
func (self *CmdGetResourceForEvent) PostprocessRpcParams() error {
if self.rpcParams.CGREvent.Time == nil {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
}
return nil

View File

@@ -58,7 +58,8 @@ func (self *CmdResourceRelease) RpcParams(reset bool) interface{} {
}
func (self *CmdResourceRelease) PostprocessRpcParams() error {
if self.rpcParams.CGREvent.Time == nil {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
}
return nil

View File

@@ -58,7 +58,8 @@ func (self *CmdSessionsAuthorize) RpcParams(reset bool) interface{} {
}
func (self *CmdSessionsAuthorize) PostprocessRpcParams() error {
if self.rpcParams.CGREvent.Time == nil {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
}
return nil

View File

@@ -58,7 +58,8 @@ func (self *CmdSessionsInitiate) RpcParams(reset bool) interface{} {
}
func (self *CmdSessionsInitiate) PostprocessRpcParams() error {
if self.rpcParams.CGREvent.Time == nil {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
}
return nil

View File

@@ -58,7 +58,8 @@ func (self *CmdSessionsProcessEvent) RpcParams(reset bool) interface{} {
}
func (self *CmdSessionsProcessEvent) PostprocessRpcParams() error {
if self.rpcParams.CGREvent.Time == nil {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
}
return nil

View File

@@ -58,7 +58,8 @@ func (self *CmdSessionsTerminate) RpcParams(reset bool) interface{} {
}
func (self *CmdSessionsTerminate) PostprocessRpcParams() error {
if self.rpcParams.CGREvent.Time == nil {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
}
return nil

View File

@@ -58,7 +58,8 @@ func (self *CmdSessionsUpdate) RpcParams(reset bool) interface{} {
}
func (self *CmdSessionsUpdate) PostprocessRpcParams() error {
if self.rpcParams.CGREvent.Time == nil {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
}
return nil

View File

@@ -59,8 +59,9 @@ func (self *CmdStatQueueProcessEvent) RpcParams(reset bool) interface{} {
}
func (self *CmdStatQueueProcessEvent) PostprocessRpcParams() error {
if self.rpcParams.Time == nil {
self.rpcParams.Time = utils.TimePointer(time.Now())
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
}
return nil
}

View File

@@ -58,7 +58,8 @@ func (self *CmdSuppliersSort) RpcParams(reset bool) interface{} {
}
func (self *CmdSuppliersSort) PostprocessRpcParams() error {
if self.rpcParams.CGREvent.Time == nil {
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
}
return nil

View File

@@ -58,8 +58,9 @@ func (self *CmdThresholdProcessEvent) RpcParams(reset bool) interface{} {
}
func (self *CmdThresholdProcessEvent) PostprocessRpcParams() error {
if self.rpcParams.Time == nil {
self.rpcParams.Time = utils.TimePointer(time.Now())
if self.rpcParams != nil && self.rpcParams.CGREvent != nil &&
self.rpcParams.CGREvent.Time == nil {
self.rpcParams.CGREvent.Time = utils.TimePointer(time.Now())
}
return nil
}