Skip to content

freeradius: add configurable LDAP group membership mode #5430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jkolo wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −1
Open

freeradius: add configurable LDAP group membership mode #5430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/ldap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,10 @@
<type>text</type>
<help>Filter for group objects, should match all available group objects a user might be a member of.</help>
</field>
<field>
<id>ldap.group_membership_mode</id>
<label>Group Membership Mode</label>
<type>dropdown</type>
<help>How FreeRADIUS checks LDAP group membership. Use "member filter" for Active Directory or Samba 4 with nested groups (uses LDAP_MATCHING_RULE_IN_CHAIN OID for transitive lookup).</help>
</field>
</form>
10 changes: 9 additions & 1 deletion net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Ldap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<model>
<mount>//OPNsense/freeradius/ldap</mount>
<description>LDAP configuration</description>
<version>1.0.1</version>
<version>1.0.2</version>
<items>
<innertunnel type="BooleanField">
<Default>0</Default>
Expand Down Expand Up @@ -47,5 +47,13 @@
<Default>(objectClass=posixGroup)</Default>
<Required>N</Required>
</group_filter>
<group_membership_mode type="OptionField">
<Default>attribute</Default>
<Required>Y</Required>
<OptionValues>
<attribute>memberOf attribute (POSIX / flat groups)</attribute>
<filter>member filter (Active Directory / Samba 4 nested groups)</filter>
</OptionValues>
</group_membership_mode>
</items>
</model>
4 changes: 4 additions & 0 deletions net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/mods-enabled-ldap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,11 @@ ldap {
{% if helpers.exists('OPNsense.freeradius.ldap.group_filter') and OPNsense.freeradius.ldap.group_filter != '' %}
filter = "{{ OPNsense.freeradius.ldap.group_filter }}"
{% endif %}
{% if helpers.exists('OPNsense.freeradius.ldap.group_membership_mode') and OPNsense.freeradius.ldap.group_membership_mode == 'filter' %}
membership_filter = "(member:1.2.840.113556.1.4.1941:=%{control:Ldap-UserDn})"
{% else %}
membership_attribute = 'memberOf'
{% endif %}
}
profile {
}
Expand Down