From: Nick Porter Date: Fri, 22 Sep 2023 12:59:27 +0000 (+0100) Subject: ci: Use different data in each LDAP user profile X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a154b80ed0e6e0c3e53f3f62cd4a371ec2a35430;p=thirdparty%2Ffreeradius-server.git ci: Use different data in each LDAP user profile So we are sure the right thing happened --- diff --git a/src/tests/modules/ldap/xlat_profile.attrs b/src/tests/modules/ldap/xlat_profile.attrs index f3054470fc1..cba4c84c55d 100644 --- a/src/tests/modules/ldap/xlat_profile.attrs +++ b/src/tests/modules/ldap/xlat_profile.attrs @@ -10,6 +10,6 @@ NAS-IP-Address = 1.2.3.5 # Expected answer # Packet-Type == Access-Accept -Framed-IP-Netmask == 255.255.0.0 -Acct-Interim-Interval == 1800 +Framed-IP-Netmask == 255.255.128.0 +Acct-Interim-Interval == 3600 Reply-Message == "User-Suspended" diff --git a/src/tests/modules/ldap/xlat_profile.unlang b/src/tests/modules/ldap/xlat_profile.unlang index a79cadee341..3471ea63d3c 100644 --- a/src/tests/modules/ldap/xlat_profile.unlang +++ b/src/tests/modules/ldap/xlat_profile.unlang @@ -2,11 +2,11 @@ if (!%(ldap.profile:ldap:///cn=profile2,ou=profiles,dc=example,dc=com)) { test_fail } -if (!((&reply.Framed-IP-Netmask == 255.255.0.0) && \ - (&reply.Acct-Interim-Interval == 1800) && \ +if (!((&reply.Framed-IP-Netmask == 255.255.128.0) && \ + (&reply.Acct-Interim-Interval == 3600) && \ (&request.Service-Type == ::Framed-User) && \ - (&control.Framed-IP-Address == 1.2.3.4) && \ - (&control.Reply-Message == 'Hello world'))) { + (&control.Framed-IP-Address == 1.2.3.5) && \ + (&control.Reply-Message == 'Bonjour'))) { test_fail } diff --git a/src/tests/salt-test-server/salt/ldap/base.ldif b/src/tests/salt-test-server/salt/ldap/base.ldif index 5a9453fc3c0..0ac7e41901a 100644 --- a/src/tests/salt-test-server/salt/ldap/base.ldif +++ b/src/tests/salt-test-server/salt/ldap/base.ldif @@ -82,12 +82,12 @@ radiusControlAttribute: Reply-Message := "Hello world" dn: cn=profile2,ou=profiles,dc=example,dc=com objectClass: freeradiusPolicy objectClass: radiusprofile -cn: profile1 -radiusReplyAttribute: Framed-IP-Netmask := 255.255.0.0 -radiusReplyAttribute: Acct-Interim-Interval := 1800 +cn: profile2 +radiusReplyAttribute: Framed-IP-Netmask := 255.255.128.0 +radiusReplyAttribute: Acct-Interim-Interval := 3600 radiusRequestAttribute: Service-Type := 'Framed-User' -radiusControlAttribute: Framed-IP-Address := 1.2.3.4 -radiusControlAttribute: Reply-Message := "Hello world" +radiusControlAttribute: Framed-IP-Address := 1.2.3.5 +radiusControlAttribute: Reply-Message := "Bonjour" dn: cn=suspended,ou=profiles,dc=example,dc=com objectClass: freeradiusPolicy