From 5b7e4d4d031a6574a6bafd4faafb6cb9a7752192 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Thu, 9 Feb 2023 10:49:15 -0500 Subject: [PATCH] run the accounting "post-auth" query for sql_session_start Which should make it work again. However, it's not a good idea to have admins mangle the default queries. We should have a better way of "just doing the right thing" --- raddb/mods-config/sql/main/mssql/queries.conf | 2 +- raddb/mods-config/sql/main/mysql/queries.conf | 4 ++-- raddb/mods-config/sql/main/oracle/queries.conf | 2 +- raddb/mods-config/sql/main/postgresql/queries.conf | 2 +- raddb/mods-config/sql/main/sqlite/queries.conf | 2 +- raddb/policy.d/accounting | 5 ++--- share/dictionary.freeradius.internal | 5 +++++ 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/raddb/mods-config/sql/main/mssql/queries.conf b/raddb/mods-config/sql/main/mssql/queries.conf index 1978463a8e..c0e8fef8b7 100644 --- a/raddb/mods-config/sql/main/mssql/queries.conf +++ b/raddb/mods-config/sql/main/mssql/queries.conf @@ -175,7 +175,7 @@ simul_verify_query = "\ # combination of attributes, or custom 'Acct-Status-Type' values. ####################################################################### accounting { - reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Request-Processing-Stage}}.query}" + reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Acct-Session-Query}}.query}" # Write SQL queries to a logfile. This is potentially useful for bulk inserts # when used with the rlm_sql_null driver. diff --git a/raddb/mods-config/sql/main/mysql/queries.conf b/raddb/mods-config/sql/main/mysql/queries.conf index e7c97822db..44e83980ac 100644 --- a/raddb/mods-config/sql/main/mysql/queries.conf +++ b/raddb/mods-config/sql/main/mysql/queries.conf @@ -1,4 +1,4 @@ -# -*- text -*- + -*- text -*- # # main/mysql/queries.conf-- MySQL configuration for default schema (schema.sql) # @@ -265,7 +265,7 @@ simul_verify_query = "\ # combination of attributes, or custom 'Acct-Status-Type' values. ####################################################################### accounting { - reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Request-Processing-Stage}}.query}" + reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Acct-Session-Query}}.query}" # Write SQL queries to a logfile. This is potentially useful for bulk inserts # when used with the rlm_sql_null driver. diff --git a/raddb/mods-config/sql/main/oracle/queries.conf b/raddb/mods-config/sql/main/oracle/queries.conf index 58c3ba88bc..5a03348160 100644 --- a/raddb/mods-config/sql/main/oracle/queries.conf +++ b/raddb/mods-config/sql/main/oracle/queries.conf @@ -225,7 +225,7 @@ group_membership_query = "\ # combination of attributes, or custom 'Acct-Status-Type' values. ####################################################################### accounting { - reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Request-Processing-Stage}}.query}" + reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Acct-Session-Query}}.query}" # Write SQL queries to a logfile. This is potentially useful for bulk inserts # when used with the rlm_sql_null driver. diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf index 18a1ed0b64..0a1df59ec4 100644 --- a/raddb/mods-config/sql/main/postgresql/queries.conf +++ b/raddb/mods-config/sql/main/postgresql/queries.conf @@ -282,7 +282,7 @@ group_membership_query = "\ ####################################################################### accounting { - reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Request-Processing-Stage}}.query}" + reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Acct-Session-Query}}.query}" # Write SQL queries to a logfile. This is potentially useful for bulk inserts # when used with the rlm_sql_null driver. diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf index 35016f42f9..216d805803 100644 --- a/raddb/mods-config/sql/main/sqlite/queries.conf +++ b/raddb/mods-config/sql/main/sqlite/queries.conf @@ -242,7 +242,7 @@ simul_verify_query = "\ # combination of attributes, or custom 'Acct-Status-Type' values. ####################################################################### accounting { - reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Request-Processing-Stage}}.query}" + reference = "%{tolower:type.%{%{Acct-Status-Type}:-%{Acct-Session-Query}}.query}" # Write SQL queries to a logfile. This is potentially useful for bulk inserts # when used with the rlm_sql_null driver. diff --git a/raddb/policy.d/accounting b/raddb/policy.d/accounting index 7c52637d11..61ca2b683d 100644 --- a/raddb/policy.d/accounting +++ b/raddb/policy.d/accounting @@ -122,13 +122,12 @@ acct_counters64.preacct { # the session information. # sql_session_start.post-auth { - acct_unique - # # The SQL accounting queries need an Acct-Status-Type attribute # update request { - Acct-Status-Type := Start + &Acct-Session-Query := "post-auth" + &Acct-Status-Type := Start } sql.accounting } diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal index bc6008ccfa..0cdf205474 100644 --- a/share/dictionary.freeradius.internal +++ b/share/dictionary.freeradius.internal @@ -253,6 +253,11 @@ ATTRIBUTE FreeRADIUS-Client-Src-IP-Address 1153 ipaddr ATTRIBUTE FreeRADIUS-Client-Src-IPv6-Address 1154 ipv6addr ATTRIBUTE FreeRADIUS-Response-Delay-USec 1155 integer +# +# For sql_session_start policy +# +ATTRIBUTE Acct-Session-Query 1156 string + ATTRIBUTE REST-HTTP-Header 1160 string ATTRIBUTE REST-HTTP-Body 1161 string ATTRIBUTE REST-HTTP-Status-Code 1162 integer -- 2.47.3