uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-17 14:19:54 +05:00
Code Issues Packages Projects Releases Wiki Activity

RADIUS dry_run in templates, RADIUS operational

Browse Source
This commit is contained in:
DanB
2017-06-14 19:38:55 +02:00
parent 166ce87609
commit f10152d64a
1 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
agents/radagent.go
View File

@@ -155,55 +155,65 @@ func (ra *RadiusAgent) processRequest(reqProcessor *config.RARequestProcessor,
for k, v := range reqProcessor.Flags { // update processorVars with flags from processor
processorVars[k] = strconv.FormatBool(v)
}
if reqProcessor.DryRun {
utils.Logger.Info(fmt.Sprintf("<RadiusAgent> DRY_RUN, RADIUS request: %s", utils.ToJSON(req)))
utils.Logger.Info(fmt.Sprintf("<RadiusAgent> DRY_RUN, process variabiles: %+v", processorVars))
}
smgEv, err := radReqAsSMGEvent(req, processorVars, reqProcessor.Flags, reqProcessor.RequestFields)
if err != nil {
return false, err
}
var maxUsage time.Duration
var cgrReply interface{} // so we can store it in processorsVars
switch processorVars[MetaRadReqType] {
case MetaRadAuth: // auth attempt, make sure that MaxUsage is enough
if err = ra.smg.Call("SMGenericV2.GetMaxUsage", smgEv, &maxUsage); err != nil {
processorVars[MetaCGRError] = err.Error()
return
}
if reqUsage, has := smgEv[utils.USAGE]; !has { // usage was not requested, decide based on 0
if maxUsage == 0 {
if reqProcessor.DryRun {
utils.Logger.Info(fmt.Sprintf("<RadiusAgent> DRY_RUN, SMGEvent: %+v", smgEv))
} else { // process with RPC
var maxUsage time.Duration
var cgrReply interface{} // so we can store it in processorsVars
switch processorVars[MetaRadReqType] {
case MetaRadAuth: // auth attempt, make sure that MaxUsage is enough
if err = ra.smg.Call("SMGenericV2.GetMaxUsage", smgEv, &maxUsage); err != nil {
processorVars[MetaCGRError] = err.Error()
return
}
if reqUsage, has := smgEv[utils.USAGE]; !has { // usage was not requested, decide based on 0
if maxUsage == 0 {
reply.Code = radigo.AccessReject
}
} else if reqUsage.(time.Duration) < maxUsage {
reply.Code = radigo.AccessReject
}
} else if reqUsage.(time.Duration) < maxUsage {
reply.Code = radigo.AccessReject
}
case MetaRadAcctStart:
err = ra.smg.Call("SMGenericV2.InitiateSession", smgEv, &maxUsage)
cgrReply = maxUsage
case MetaRadAcctUpdate:
err = ra.smg.Call("SMGenericV2.UpdateSession", smgEv, &maxUsage)
cgrReply = maxUsage
case MetaRadAcctStop:
var rpl string
err = ra.smg.Call("SMGenericV1.TerminateSession", smgEv, &rpl)
cgrReply = rpl
if ra.cgrCfg.RadiusAgentCfg().CreateCDR {
if errCdr := ra.smg.Call("SMGenericV1.ProcessCDR", smgEv, &rpl); errCdr != nil {
err = errCdr
} else {
cgrReply = rpl
case MetaRadAcctStart:
err = ra.smg.Call("SMGenericV2.InitiateSession", smgEv, &maxUsage)
cgrReply = maxUsage
case MetaRadAcctUpdate:
err = ra.smg.Call("SMGenericV2.UpdateSession", smgEv, &maxUsage)
cgrReply = maxUsage
case MetaRadAcctStop:
var rpl string
err = ra.smg.Call("SMGenericV1.TerminateSession", smgEv, &rpl)
cgrReply = rpl
if ra.cgrCfg.RadiusAgentCfg().CreateCDR {
if errCdr := ra.smg.Call("SMGenericV1.ProcessCDR", smgEv, &rpl); errCdr != nil {
err = errCdr
} else {
cgrReply = rpl
}
}
default:
err = fmt.Errorf("unsupported radius request type: <%s>", processorVars[MetaRadReqType])
}
default:
err = fmt.Errorf("unsupported radius request type: <%s>", processorVars[MetaRadReqType])
if err != nil {
processorVars[MetaCGRError] = err.Error()
return false, err
}
processorVars[MetaCGRReply] = utils.ToJSON(cgrReply)
processorVars[MetaCGRMaxUsage] = strconv.Itoa(int(maxUsage))
}
if err != nil {
processorVars[MetaCGRError] = err.Error()
return false, err
}
processorVars[MetaCGRReply] = utils.ToJSON(cgrReply)
processorVars[MetaCGRMaxUsage] = strconv.Itoa(int(maxUsage))
if err := radReplyAppendAttributes(reply, processorVars, reqProcessor.ReplyFields); err != nil {
return false, err
}
if reqProcessor.DryRun {
utils.Logger.Info(fmt.Sprintf("<RadiusAgent> DRY_RUN, radius reply: %s", reply))
}
return true, nil
}