From: Arran Cudbard-Bell Date: Mon, 21 Sep 2020 21:36:46 +0000 (-0500) Subject: s/session-state:/session-state./ X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae102f6f9b76974c8d595dfdbf0266537605232a;p=thirdparty%2Ffreeradius-server.git s/session-state:/session-state./ --- diff --git a/doc/antora/modules/installation/pages/upgrade.adoc b/doc/antora/modules/installation/pages/upgrade.adoc index ba29cd647cc..3feabb9bfaa 100644 --- a/doc/antora/modules/installation/pages/upgrade.adoc +++ b/doc/antora/modules/installation/pages/upgrade.adoc @@ -515,7 +515,7 @@ call to a cache module instance. Both default to `yes`. === rlm_eap -All certificate attributes are available in the `&session-state:` +All certificate attributes are available in the `&session-state.` list, immediately after they are parsed from their ASN1 form. The certificates are no longer added to the `&request.` list. Instead, @@ -523,7 +523,7 @@ they are added to the `session-state` list. You are advised to update any references during the upgrade to 4.0: ``` -s/TLS-Cert-/session-state:TLS-Cert-/ +s/TLS-Cert-/session-state.TLS-Cert-/ ``` The `rlm_eap_ikev2` module was removed. It does not follow RFC 5106, diff --git a/doc/antora/modules/raddb/pages/mods-available/cache_tls.adoc b/doc/antora/modules/raddb/pages/mods-available/cache_tls.adoc index 87600ef8462..20c2786e022 100644 --- a/doc/antora/modules/raddb/pages/mods-available/cache_tls.adoc +++ b/doc/antora/modules/raddb/pages/mods-available/cache_tls.adoc @@ -84,13 +84,13 @@ cache cache_tls_session { key = &Session-Id ttl = 3600 # 60 mins update { - &session-state:Session-Data := &session-state:Session-Data + &session-state.Session-Data := &session-state.Session-Data # &session-state: += &session-state: } } cache cache_ocsp { driver = "rlm_cache_rbtree" - key = &session-state:TLS-Client-Cert-Serial + key = &session-state.TLS-Client-Cert-Serial update { &control.TLS-OCSP-Cert-Valid := &TLS-OCSP-Cert-Valid &control.TLS-OCSP-Response := &TLS-OCSP-Response diff --git a/doc/antora/modules/raddb/pages/mods-available/eap.adoc b/doc/antora/modules/raddb/pages/mods-available/eap.adoc index 882e476acbe..313e42660ef 100644 --- a/doc/antora/modules/raddb/pages/mods-available/eap.adoc +++ b/doc/antora/modules/raddb/pages/mods-available/eap.adoc @@ -508,7 +508,7 @@ how TLS cache now works. If using the default `tls-cache` virtual server and cache module config, policy attributes may be stored in the -`&session-state:` list. +`&session-state.` list. virtual_server:: diff --git a/doc/antora/modules/raddb/pages/sites-available/challenge.adoc b/doc/antora/modules/raddb/pages/sites-available/challenge.adoc index 41b39c1e528..8880bd998b2 100644 --- a/doc/antora/modules/raddb/pages/sites-available/challenge.adoc +++ b/doc/antora/modules/raddb/pages/sites-available/challenge.adoc @@ -57,7 +57,7 @@ recv Access-Request { else { update control { Auth-Type := Step2 - Cleartext-Password := &session-state:Tmp-Integer-0 + Cleartext-Password := &session-state.Tmp-Integer-0 } } } @@ -67,7 +67,7 @@ authenticate step1 { Tmp-Integer-0 := "%{randstr:n}" } update reply { - Reply-Message := &session-state:Tmp-Integer-0 + Reply-Message := &session-state.Tmp-Integer-0 } challenge } diff --git a/doc/antora/modules/raddb/pages/sites-available/eap-aka-sim.adoc b/doc/antora/modules/raddb/pages/sites-available/eap-aka-sim.adoc index d7c4ebc90cb..0d2a81d4f11 100644 --- a/doc/antora/modules/raddb/pages/sites-available/eap-aka-sim.adoc +++ b/doc/antora/modules/raddb/pages/sites-available/eap-aka-sim.adoc @@ -98,7 +98,7 @@ required. The following actions are associated with the various `Identity-Type` values: - `Permanent`:: The current `&Identity` value will be copied to - `&session-state:Permanent-Identity`. The hint byte + `&session-state.Permanent-Identity`. The hint byte will be stripped if the hint matches the current EAP-Method. If the hint byte does not match the current EAP-Method the complete value of @@ -555,7 +555,7 @@ You should restore the contents of the following attributes using NOTE: If you're using 3GPP style encrypted pseudonyms, you should decrypt the pseudonym here, and store the decrypted value in -`&session-state:Permanent-Identity`. +`&session-state.Permanent-Identity`. @@ -574,11 +574,11 @@ If when sending a Reauthentication-Request a `&reply.Next-Reauth-Id` attribute is found, this section will be called. You should restore the contents of the following attributes using -`&session-state:Session-ID` or `&reply.Next-Reauth-Id` as a key: +`&session-state.Session-ID` or `&reply.Next-Reauth-Id` as a key: -- `&session-state:Counter`:: How many times this session has +- `&session-state.Counter`:: How many times this session has been resumed. -- `&session-state:Session-Data`:: The master session key. +- `&session-state.Session-Data`:: The master session key. - `&session-State:Permanent-Identity`::(optionally) the permanent identity of the user. @@ -597,11 +597,11 @@ provide a unified session store. This section will be called prior to attempting re-authentication. You should restore the contents of the following attributes using -`&session-state:Session-ID` or `&reply.Next-Reauth-Id` as a key: +`&session-state.Session-ID` or `&reply.Next-Reauth-Id` as a key: -- `&session-state:Counter`:: How many times this session has +- `&session-state.Counter`:: How many times this session has been resumed. -- `&session-state:Session-Data`:: The master session key. +- `&session-state.Session-Data`:: The master session key. - `&session-State:Permanent-Identity`::(optionally) the permanent identity of the user. diff --git a/doc/antora/modules/raddb/pages/sites-available/tacacs.adoc b/doc/antora/modules/raddb/pages/sites-available/tacacs.adoc index d00764274a1..4dd33afa974 100644 --- a/doc/antora/modules/raddb/pages/sites-available/tacacs.adoc +++ b/doc/antora/modules/raddb/pages/sites-available/tacacs.adoc @@ -86,7 +86,7 @@ server tacacs { recv Authentication { if (&TACACS-Sequence-Number > 1) { update request { - TACACS-Authentication-Type = &session-state:TACACS-Authentication-Type + TACACS-Authentication-Type = &session-state.TACACS-Authentication-Type } } switch &TACACS-Authentication-Type { @@ -97,8 +97,8 @@ server tacacs { } } else { update request { - User-Name = &session-state:User-Name - User-Password = &session-state:User-Password + User-Name = &session-state.User-Name + User-Password = &session-state.User-Password } } if (!&User-Name) { @@ -144,7 +144,7 @@ server tacacs { } } else { update request { - User-Name = &session-state:User-Name + User-Name = &session-state.User-Name } } if (!&User-Password) { diff --git a/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc b/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc index a31cd69d5d8..ea7a7873b07 100644 --- a/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc +++ b/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc @@ -17,7 +17,7 @@ the following attributes are also created in the session-state list: This section is run whenever the server needs to read an entry from the TLS session cache. -It should read the attribute &session-state:TLS-Session-Data +It should read the attribute &session-state.TLS-Session-Data from the cache, along with any other attributes which were in the cache @@ -31,7 +31,7 @@ and will just cause the server to emit a warning. This section is run whenever the server needs to write an entry to the TLS session cache. -It should write the attribute &session-state:Session-Data +It should write the attribute &session-state.Session-Data to the cache, along with any other attributes which need to be cached. diff --git a/doc/antora/modules/unlang/pages/list.adoc b/doc/antora/modules/unlang/pages/list.adoc index 3ece4ac9004..ef713bb175a 100644 --- a/doc/antora/modules/unlang/pages/list.adoc +++ b/doc/antora/modules/unlang/pages/list.adoc @@ -52,4 +52,4 @@ finishes, it is deleted, and is no longer accessible to the parent. .Examples `&parent.request.User-Name` + `&parent.reply.Reply-Message` + -`&parent.parent.session-state:Filter-Id` +`&parent.parent.session-state.Filter-Id` diff --git a/raddb/mods-available/cache_tls b/raddb/mods-available/cache_tls index c1068093494..2d31ffe0791 100644 --- a/raddb/mods-available/cache_tls +++ b/raddb/mods-available/cache_tls @@ -54,7 +54,7 @@ cache cache_tls_session { # update
{ ... }:: # update { - &session-state:Session-Data := &session-state:Session-Data + &session-state.Session-Data := &session-state.Session-Data # # NOTE: If you want to store authorization attributes too, consider @@ -85,7 +85,7 @@ cache cache_ocsp { # # key:: `cache` key. # - key = &session-state:TLS-Client-Cert-Serial + key = &session-state.TLS-Client-Cert-Serial # # update
{ ... }:: diff --git a/raddb/mods-available/eap b/raddb/mods-available/eap index f05ca7e020e..ed45a98d4af 100644 --- a/raddb/mods-available/eap +++ b/raddb/mods-available/eap @@ -569,7 +569,7 @@ eap { # # If using the default `tls-cache` virtual server and # cache module config, policy attributes may be stored in the - # `&session-state:` list. + # `&session-state.` list. # cache { # diff --git a/raddb/policy.d/debug b/raddb/policy.d/debug index eba6350945d..56fd964a44f 100644 --- a/raddb/policy.d/debug +++ b/raddb/policy.d/debug @@ -38,7 +38,7 @@ debug_reply { # Outputs the contents of the session state list in debugging (-X) mode # debug_session_state { - if ("%{debug_attr:session-state:[*]}" == '') { + if ("%{debug_attr:session-state.[*]}" == '') { noop } } diff --git a/raddb/policy.d/filter b/raddb/policy.d/filter index 39327dc9d66..f8443a4171c 100644 --- a/raddb/policy.d/filter +++ b/raddb/policy.d/filter @@ -18,16 +18,16 @@ deny_realms { filter_username { if (&State) { if (&User-Name) { - if (!&session-state:Session-State-User-Name) { + if (!&session-state.Session-State-User-Name) { update request { - &Module-Failure-Message += 'No cached session-state:Session-State-User-Name' + &Module-Failure-Message += 'No cached session-state.Session-State-User-Name' } reject } - if (&User-Name != &session-state:Session-State-User-Name) { + if (&User-Name != &session-state.Session-State-User-Name) { update request { - &Module-Failure-Message += 'User-Name does not match cached session-state:Session-State-User-Name' + &Module-Failure-Message += 'User-Name does not match cached session-state.Session-State-User-Name' } reject } diff --git a/raddb/sites-available/challenge b/raddb/sites-available/challenge index 67a8a18358a..37e2a5f4d2f 100644 --- a/raddb/sites-available/challenge +++ b/raddb/sites-available/challenge @@ -37,7 +37,7 @@ recv Access-Request { # update control { Auth-Type := Step2 - Cleartext-Password := &session-state:Tmp-Integer-0 + Cleartext-Password := &session-state.Tmp-Integer-0 } } } @@ -55,7 +55,7 @@ authenticate step1 { Tmp-Integer-0 := "%{randstr:n}" } update reply { - Reply-Message := &session-state:Tmp-Integer-0 + Reply-Message := &session-state.Tmp-Integer-0 } # diff --git a/raddb/sites-available/eap-aka-sim b/raddb/sites-available/eap-aka-sim index 8b23a0f8f15..0a6d1ef48c8 100644 --- a/raddb/sites-available/eap-aka-sim +++ b/raddb/sites-available/eap-aka-sim @@ -109,7 +109,7 @@ server eap-aka-sim { # The following actions are associated with the various # `Identity-Type` values: # - `Permanent`:: The current `&Identity` value will be copied to - # `&session-state:Permanent-Identity`. The hint byte + # `&session-state.Permanent-Identity`. The hint byte # will be stripped if the hint matches the current # EAP-Method. If the hint byte does not match # the current EAP-Method the complete value of @@ -623,7 +623,7 @@ server eap-aka-sim { # # NOTE: If you're using 3GPP style encrypted pseudonyms, you should # decrypt the pseudonym here, and store the decrypted value in - # `&session-state:Permanent-Identity`. + # `&session-state.Permanent-Identity`. # load pseudonym { ok @@ -648,11 +648,11 @@ server eap-aka-sim { # attribute is found, this section will be called. # # You should restore the contents of the following attributes using - # `&session-state:Session-ID` or `&reply.Next-Reauth-Id` as a key: + # `&session-state.Session-ID` or `&reply.Next-Reauth-Id` as a key: # - # - `&session-state:Counter`:: How many times this session has + # - `&session-state.Counter`:: How many times this session has # been resumed. - # - `&session-state:Session-Data`:: The master session key. + # - `&session-state.Session-Data`:: The master session key. # - `&session-State:Permanent-Identity`::(optionally) the permanent # identity of the user. # @@ -674,11 +674,11 @@ server eap-aka-sim { # This section will be called prior to attempting re-authentication. # # You should restore the contents of the following attributes using - # `&session-state:Session-ID` or `&reply.Next-Reauth-Id` as a key: + # `&session-state.Session-ID` or `&reply.Next-Reauth-Id` as a key: # - # - `&session-state:Counter`:: How many times this session has + # - `&session-state.Counter`:: How many times this session has # been resumed. - # - `&session-state:Session-Data`:: The master session key. + # - `&session-state.Session-Data`:: The master session key. # - `&session-State:Permanent-Identity`::(optionally) the permanent # identity of the user. # diff --git a/raddb/sites-available/tls-cache b/raddb/sites-available/tls-cache index 6dbc70ceb19..b76cd5ff416 100644 --- a/raddb/sites-available/tls-cache +++ b/raddb/sites-available/tls-cache @@ -34,7 +34,7 @@ server tls-cache { # This section is run whenever the server needs to read an # entry from the TLS session cache. # - # It should read the attribute &session-state:TLS-Session-Data + # It should read the attribute &session-state.TLS-Session-Data # from the cache, along with any other attributes which # were in the cache # @@ -54,7 +54,7 @@ server tls-cache { # This section is run whenever the server needs to write an # entry to the TLS session cache. # - # It should write the attribute &session-state:Session-Data + # It should write the attribute &session-state.Session-Data # to the cache, along with any other attributes which # need to be cached. # diff --git a/src/lib/eap_aka_sim/state_machine.c b/src/lib/eap_aka_sim/state_machine.c index c6cba546318..ee35885bcda 100644 --- a/src/lib/eap_aka_sim/state_machine.c +++ b/src/lib/eap_aka_sim/state_machine.c @@ -350,7 +350,7 @@ static int identity_req_pairs_add(REQUEST *request, eap_aka_sim_session_t *eap_a * to form the real permanent ID. * * Otherwise copy the entire incoming Identity to the - * &session-state:Permanent-Identity attribute. + * &session-state.Permanent-Identity attribute. * * @param[in] request The current request. * @param[in] in current identity. @@ -419,7 +419,7 @@ static int identity_to_permanent_identity(REQUEST *request, VALUE_PAIR *in, eap_ fr_aka_sim_hint_byte(AKA_SIM_ID_TYPE_PERMANENT, expected_method), fr_aka_sim_hint_byte(our_type, our_method)); RINDENT(); - RDEBUG2("&session-state:%pP", vp); + RDEBUG2("&session-state.%pP", vp); REXDENT(); } else { /* @@ -435,7 +435,7 @@ static int identity_to_permanent_identity(REQUEST *request, VALUE_PAIR *in, eap_ RDEBUG2("Stripping 'hint' byte from %s", attr_eap_aka_sim_permanent_identity->name); RINDENT(); - RDEBUG2("&session-state:%pP", vp); + RDEBUG2("&session-state.%pP", vp); REXDENT(); } diff --git a/src/lib/eap_aka_sim/vector.c b/src/lib/eap_aka_sim/vector.c index 4c2bd5fba5b..e439b400261 100644 --- a/src/lib/eap_aka_sim/vector.c +++ b/src/lib/eap_aka_sim/vector.c @@ -831,7 +831,7 @@ int fr_aka_sim_vector_gsm_umts_kdf_0_reauth_from_attrs(REQUEST *request, VALUE_P */ counter_vp = fr_pair_find_by_da(vps, attr_eap_aka_sim_counter); if (!counter_vp) { - RDEBUG2("No &session-state:%s attribute found, can't calculate re-auth keys", + RDEBUG2("No &session-state.%s attribute found, can't calculate re-auth keys", attr_eap_aka_sim_counter->name); return 1; } @@ -840,13 +840,13 @@ int fr_aka_sim_vector_gsm_umts_kdf_0_reauth_from_attrs(REQUEST *request, VALUE_P mk_vp = fr_pair_find_by_da(vps, attr_session_data); if (!mk_vp) mk_vp = fr_pair_find_by_da(vps, attr_eap_aka_sim_mk); if (!mk_vp) { - RDEBUG2("Neither &session-state:%s or &session-state:%s attributes found, " + RDEBUG2("Neither &session-state.%s or &session-state.%s attributes found, " "can't calculate re-auth keys", attr_session_data->name, attr_eap_aka_sim_mk->name); return 1; } if (mk_vp->vp_length != AKA_SIM_MK_SIZE) { - REDEBUG("&session-state:%s incorrect length. Expected " + REDEBUG("&session-state.%s incorrect length. Expected " STRINGIFY(AKA_SIM_MK_SIZE) " bytes, got %zu bytes", attr_eap_aka_sim_mk->name, mk_vp->vp_length); return -1; @@ -881,7 +881,7 @@ int fr_aka_sim_vector_umts_kdf_1_reauth_from_attrs(REQUEST *request, VALUE_PAIR */ counter_vp = fr_pair_find_by_da(vps, attr_eap_aka_sim_counter); if (!counter_vp) { - RDEBUG2("No &session-state:%s attribute found, can't calculate re-auth keys", + RDEBUG2("No &session-state.%s attribute found, can't calculate re-auth keys", attr_eap_aka_sim_counter->name); return 1; } @@ -890,13 +890,13 @@ int fr_aka_sim_vector_umts_kdf_1_reauth_from_attrs(REQUEST *request, VALUE_PAIR k_re_vp = fr_pair_find_by_da(vps, attr_session_data); if (!k_re_vp) k_re_vp = fr_pair_find_by_da(vps, attr_eap_aka_sim_k_re); if (!k_re_vp) { - RDEBUG2("Neither &session-state:%s or &session-sate:%s attributes found, " + RDEBUG2("Neither &session-state.%s or &session-sate:%s attributes found, " "can't calculate re-auth keys", attr_session_data->name, attr_eap_aka_sim_k_re->name); return 1; } if (k_re_vp->vp_length != AKA_SIM_K_RE_SIZE) { - REDEBUG("&session-state:%s incorrect length. Expected " + REDEBUG("&session-state.%s incorrect length. Expected " STRINGIFY(AKA_SIM_K_RE_SIZE) " bytes, got %zu bytes", attr_eap_aka_sim_mk->name, k_re_vp->vp_length); return -1; diff --git a/src/lib/server/state.c b/src/lib/server/state.c index 2b942dcd287..9889439110b 100644 --- a/src/lib/server/state.c +++ b/src/lib/server/state.c @@ -647,7 +647,7 @@ void fr_state_to_request(fr_state_tree_t *state, REQUEST *request) if (request->state) { RDEBUG2("Restored &session-state"); - log_request_pair_list(L_DBG_LVL_2, request, request->state, "&session-state:"); + log_request_pair_list(L_DBG_LVL_2, request, request->state, "&session-state."); } /* @@ -682,7 +682,7 @@ int fr_request_to_state(fr_state_tree_t *state, REQUEST *request) if (request->state) { RDEBUG2("Saving &session-state"); - log_request_pair_list(L_DBG_LVL_2, request, request->state, "&session-state:"); + log_request_pair_list(L_DBG_LVL_2, request, request->state, "&session-state."); } vp = fr_pair_find_by_da(request->packet->vps, state->da); diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c index 733e1656649..89bb1dd0f4b 100644 --- a/src/lib/tls/cache.c +++ b/src/lib/tls/cache.c @@ -285,7 +285,7 @@ int fr_tls_cache_write(REQUEST *request, fr_tls_session_t *tls_session) MEM(vp = fr_pair_afrom_da(request->state_ctx, attr_tls_session_data)); fr_pair_value_memdup(vp, tls_session->session_blob, talloc_array_length(tls_session->session_blob), false); RINDENT(); - RDEBUG2("&session-state:%pP", vp); + RDEBUG2("&session-state.%pP", vp); REXDENT(); fr_pair_add(&request->state, vp); diff --git a/src/lib/tls/session.c b/src/lib/tls/session.c index cd00fa7cc05..f0e32b49611 100644 --- a/src/lib/tls/session.c +++ b/src/lib/tls/session.c @@ -1442,7 +1442,7 @@ int fr_tls_session_handshake(REQUEST *request, fr_tls_session_t *session) fr_pair_value_strdup(vp, SSL_CIPHER_get_name(cipher)); fr_pair_add(&request->state, vp); RINDENT(); - RDEBUG2("&session-state:%pP", vp); + RDEBUG2("&session-state.%pP", vp); REXDENT(); } @@ -1458,7 +1458,7 @@ int fr_tls_session_handshake(REQUEST *request, fr_tls_session_t *session) fr_pair_value_strdup(vp, version); fr_pair_add(&request->state, vp); RINDENT(); - RDEBUG2("&session-state:TLS-Session-Version := \"%s\"", version); + RDEBUG2("&session-state.TLS-Session-Version := \"%s\"", version); REXDENT(); } diff --git a/src/lib/tls/validate.c b/src/lib/tls/validate.c index 23c689548b9..94aa4defee2 100644 --- a/src/lib/tls/validate.c +++ b/src/lib/tls/validate.c @@ -159,7 +159,7 @@ int fr_tls_validate_cert_cb(int ok, X509_STORE_CTX *x509_ctx) /* * Print out all the pairs we have so far */ - log_request_pair_list(L_DBG_LVL_2, request, cert_vps, "&session-state:"); + log_request_pair_list(L_DBG_LVL_2, request, cert_vps, "&session-state."); /* * cert_vps have a different talloc parent, so we diff --git a/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime b/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime index fb2d8191352..e03df85ebb5 100644 --- a/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime +++ b/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime @@ -13,7 +13,7 @@ cache eap_aka_prime_cache { # update
{ ... }:: # update { - &session-state:Session-Data := &session-state:Session-Data - &session-state:Counter := &session-state:Counter + &session-state.Session-Data := &session-state.Session-Data + &session-state.Counter := &session-state.Counter } } \ No newline at end of file diff --git a/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime b/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime index 14bc5e9f2d6..d735dc57b1c 100644 --- a/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime +++ b/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime @@ -2,8 +2,8 @@ server eap-aka-prime { namespace = eap-aka-prime recv Identity-Response { - "%{debug_attr:&session-state:}" - if (!&session-state:Tmp-String-0) { + "%{debug_attr:&session-state.}" + if (!&session-state.Tmp-String-0) { update reply { &Any-ID-Req := yes } diff --git a/src/tests/eapol_test/config/aka/mods-enabled/aka b/src/tests/eapol_test/config/aka/mods-enabled/aka index 6dfde3c2f9f..84d1d82fcfb 100644 --- a/src/tests/eapol_test/config/aka/mods-enabled/aka +++ b/src/tests/eapol_test/config/aka/mods-enabled/aka @@ -13,7 +13,7 @@ cache eap_aka_cache { # update
{ ... }:: # update { - &session-state:Session-Data := &session-state:Session-Data - &session-state:Counter := &session-state:Counter + &session-state.Session-Data := &session-state.Session-Data + &session-state.Counter := &session-state.Counter } } \ No newline at end of file diff --git a/src/tests/eapol_test/config/aka/sites-enabled/aka b/src/tests/eapol_test/config/aka/sites-enabled/aka index f0771d6e6d3..e316dc969d0 100644 --- a/src/tests/eapol_test/config/aka/sites-enabled/aka +++ b/src/tests/eapol_test/config/aka/sites-enabled/aka @@ -3,8 +3,8 @@ server eap-aka { namespace = eap-aka recv Identity-Response { - "%{debug_attr:&session-state:}" - if (!&session-state:Tmp-String-0) { + "%{debug_attr:&session-state.}" + if (!&session-state.Tmp-String-0) { update reply { &Any-ID-Req := yes } diff --git a/src/tests/eapol_test/config/sim/mods-enabled/sim b/src/tests/eapol_test/config/sim/mods-enabled/sim index 673ee720021..dcd6203e0a7 100644 --- a/src/tests/eapol_test/config/sim/mods-enabled/sim +++ b/src/tests/eapol_test/config/sim/mods-enabled/sim @@ -13,7 +13,7 @@ cache eap_sim_cache { # update
{ ... }:: # update { - &session-state:Session-Data := &session-state:Session-Data - &session-state:Counter := &session-state:Counter + &session-state.Session-Data := &session-state.Session-Data + &session-state.Counter := &session-state.Counter } } \ No newline at end of file diff --git a/src/tests/eapol_test/config/sim/sites-enabled/sim b/src/tests/eapol_test/config/sim/sites-enabled/sim index 9e5ae5b4277..321e2788107 100644 --- a/src/tests/eapol_test/config/sim/sites-enabled/sim +++ b/src/tests/eapol_test/config/sim/sites-enabled/sim @@ -2,8 +2,8 @@ server eap-sim { namespace = eap-sim recv Identity-Response { - "%{debug_attr:&session-state:}" - if (!&session-state:Tmp-String-0) { + "%{debug_attr:&session-state.}" + if (!&session-state.Tmp-String-0) { update reply { &Any-ID-Req := yes } diff --git a/src/tests/keywords/list-existence b/src/tests/keywords/list-existence index 92ff385dd45..56b3cde722a 100644 --- a/src/tests/keywords/list-existence +++ b/src/tests/keywords/list-existence @@ -1,15 +1,15 @@ # # List existence checks are "is the list empty" checks. # -if (&session-state:) { +if (&session-state.) { test_fail } -if (&session-state:[*]) { +if (&session-state.[*]) { test_fail } -if (&session-state:) { +if (&session-state.) { test_fail } @@ -17,11 +17,11 @@ update session-state { &User-Name := 'foo' } -if (!&session-state:) { +if (!&session-state.) { test_fail } -if (!&session-state:[*]) { +if (!&session-state.[*]) { test_fail } diff --git a/src/tests/modules/cache_rbtree/cache-update.unlang b/src/tests/modules/cache_rbtree/cache-update.unlang index d2c73203d3b..5ff4637936f 100644 --- a/src/tests/modules/cache_rbtree/cache-update.unlang +++ b/src/tests/modules/cache_rbtree/cache-update.unlang @@ -46,14 +46,14 @@ else { test_fail } -if (&session-state:Reply-Message[0] == 'hello') { +if (&session-state.Reply-Message[0] == 'hello') { test_pass } else { test_fail } -if (&session-state:Reply-Message[1] == 'goodbye') { +if (&session-state.Reply-Message[1] == 'goodbye') { test_pass } else { diff --git a/src/tests/modules/unit_test_module.conf b/src/tests/modules/unit_test_module.conf index e20392f1249..fdca8b42271 100644 --- a/src/tests/modules/unit_test_module.conf +++ b/src/tests/modules/unit_test_module.conf @@ -91,7 +91,7 @@ policy { # Outputs the contents of the session state list in debugging (-X) mode # debug_session_state { - if("%{debug_attr:session-state:[*]}" == '') { + if("%{debug_attr:session-state.[*]}" == '') { noop } }