From ce3ae559a2b7b1811889d63b63c96418a2418d39 Mon Sep 17 00:00:00 2001
From: Junaid Saeed Uppal <junaid.uppal@gmail.com>
Date: Tue, 23 Dec 2025 20:37:06 +0500
Subject: [PATCH] fixes

---
 pppoe_auth.json | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pppoe_auth.json b/pppoe_auth.json
index e12e0b5..4877f50 100644
--- a/pppoe_auth.json
+++ b/pppoe_auth.json
@@ -6,14 +6,14 @@
         "filters": [
           "*string:~*vars.*radReqType:*radAuth"
         ],
-        "flags": ["*log", "*authorize", "*attributes", "*accounts", "*continue"],
+        "flags": ["*log", "*auth", "*attributes", "*accounts", "*continue"],
         "request_fields": [
           {"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*data"},
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "generic"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",
             "value": "*prepaid", "mandatory": true},
-          {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable",
-            "value": "~*req.Acct-Session-Id", "mandatory": true},
+          {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed",
+            "value": "~*req.User-Name;~*req.NAS-IP-Address", "mandatory": true},
           {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable",
             "value": "~*req.NAS-IP-Address", "mandatory": true},
           {"tag": "Account", "path": "*cgreq.Account", "type": "*variable",
@@ -27,9 +27,7 @@
           {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable",
             "value": "~*req.Event-Timestamp"},
           {"tag": "CallingStationId", "path": "*cgreq.CallingStationId", "type": "*variable",
-            "value": "~*req.Calling-Station-Id"},
-          {"tag": "PasswordFromAttributes", "path": "*cgreq.PasswordFromAttributes",
-            "type": "*constant", "value": "*attributes"}
+            "value": "~*req.Calling-Station-Id"}
         ],
         "reply_fields": [
           {"tag": "RejectMessage", "path": "*rep.Reply-Message",
@@ -60,7 +58,7 @@
         "flags": ["*radauth", "*pap", "*log"],
         "request_fields": [
           {"tag": "UserPassword", "path": "*vars.UserPassword", "type": "*variable",
-            "value": "~*cgrep.Attributes.PasswordFromAttributes"}
+            "value": "~*cgrep.Attributes.Password"}
         ],
         "reply_fields": [
           {"tag": "RemoveAddedFields", "filters": ["*notempty:~*cgrep.Error:"],
@@ -80,7 +78,7 @@
         "flags": ["*radauth", "*chap", "*log"],
         "request_fields": [
           {"tag": "UserPassword", "path": "*vars.UserPassword", "type": "*variable",
-            "value": "~*cgrep.Attributes.PasswordFromAttributes"}
+            "value": "~*cgrep.Attributes.Password"}
         ],
         "reply_fields": [
           {"tag": "RemoveAddedFields", "filters": ["*notempty:~*cgrep.Error:"],
@@ -100,7 +98,7 @@
         "flags": ["*radauth", "*mschapv2", "*log"],
         "request_fields": [
           {"tag": "UserPassword", "path": "*vars.UserPassword", "type": "*variable",
-            "value": "~*cgrep.Attributes.PasswordFromAttributes"}
+            "value": "~*cgrep.Attributes.Password"}
         ],
         "reply_fields": [
           {"tag": "RemoveAddedFields", "filters": ["*notempty:~*cgrep.Error:"],