Skip to content
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

Adds support for multiple LDAP groups #318

Merged
merged 5 commits into from
Sep 9, 2024
Merged

Adds support for multiple LDAP groups #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55643a2
fix(ldap): fixes #210
bl4ko Aug 28, 2024
a6a0c2b
fix comment indent and reset chart.lock
bl4ko Aug 28, 2024
45123cd
update chart version
bl4ko Aug 28, 2024
aac39d3
fix trailing spaces in values.yaml
bl4ko Aug 29, 2024
29d4598
Merge branch 'develop' into develop
LeoColomb Sep 5, 2024
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
2 changes: 1 addition & 1 deletion charts/netbox/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: netbox
version: 5.0.0-beta.86
version: 5.0.0-beta.87
appVersion: "v4.0.11"
type: application
kubeVersion: ^1.25.0-0
Expand Down
31 changes: 26 additions & 5 deletions charts/netbox/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ data:
ldap_config.py: |-
from importlib import import_module
from django_auth_ldap.config import LDAPSearch
from django_auth_ldap.config import LDAPSearch, LDAPGroupQuery
import ldap
Expand Down Expand Up @@ -275,12 +275,33 @@ data:
"(objectClass=" + AUTH_LDAP_GROUP_SEARCH_CLASS + ")",
)
AUTH_LDAP_GROUP_TYPE = _import_group_type(AUTH_LDAP_GROUP_TYPE)
# Required groups to be able to login to Netbox
AUTH_LDAP_REQUIRE_GROUP = (
{{- range $index, $group := $.Values.remoteAuth.ldap.requireGroupDn }}
LDAPGroupQuery({{ $group | quote }}){{ if ne (add $index 1) (len $.Values.remoteAuth.ldap.requireGroupDn) }} | {{ end }}
{{- end }}
)
# Define special user types using groups. Exercise great caution when assigning superuser status.
AUTH_LDAP_USER_FLAGS_BY_GROUP = {
"is_active": AUTH_LDAP_REQUIRE_GROUP,
"is_staff": {{ $.Values.remoteAuth.ldap.isAdminDn | quote }},
"is_superuser": {{ $.Values.remoteAuth.ldap.isSuperUserDn | quote }},
"is_active": (
{{- range $index, $group := $.Values.remoteAuth.ldap.requireGroupDn }}
LDAPGroupQuery({{ $group | quote }}){{ if ne (add $index 1) (len $.Values.remoteAuth.ldap.requireGroupDn) }} | {{ end }}
{{- end }}
),
"is_staff": (
{{- range $index, $group := $.Values.remoteAuth.ldap.isAdminDn }}
LDAPGroupQuery({{ $group | quote }}){{ if ne (add $index 1) (len $.Values.remoteAuth.ldap.isAdminDn) }} | {{ end }}
{{- end }}
),
"is_superuser": (
{{- range $index, $group := $.Values.remoteAuth.ldap.isSuperUserDn }}
LDAPGroupQuery({{ $group | quote }}){{ if ne (add $index 1) (len $.Values.remoteAuth.ldap.isSuperUserDn) }} | {{ end }}
{{- end }}
),
}
# Populate the Django user from the LDAP directory.
AUTH_LDAP_USER_ATTR_MAP = {
"first_name": {{ $.Values.remoteAuth.ldap.attrFirstName | quote }},
Expand All @@ -302,11 +323,11 @@ data:
AUTH_LDAP_GROUP_SEARCH_BASEDN: {{ $.Values.remoteAuth.ldap.groupSearchBaseDn | quote }}
AUTH_LDAP_GROUP_SEARCH_CLASS: {{ $.Values.remoteAuth.ldap.groupSearchClass | quote }}
AUTH_LDAP_GROUP_TYPE: {{ $.Values.remoteAuth.ldap.groupType | quote }}
AUTH_LDAP_REQUIRE_GROUP: {{ $.Values.remoteAuth.ldap.requireGroupDn | quote }}
AUTH_LDAP_FIND_GROUP_PERMS: {{ toJson $.Values.remoteAuth.ldap.findGroupPerms }}
AUTH_LDAP_MIRROR_GROUPS: {{ toJson $.Values.remoteAuth.ldap.mirrorGroups }}
AUTH_LDAP_MIRROR_GROUPS_EXCEPT: {{ toJson $.Values.remoteAuth.ldap.mirrorGroupsExcept }}
AUTH_LDAP_CACHE_TIMEOUT: {{ int $.Values.remoteAuth.ldap.cacheTimeout }}
{{- if $.Values.remoteAuth.ldap.caCertData }}
ldap_ca.crt: {{- toYaml $.Values.remoteAuth.ldap.caCertData | indent 4 }}
{{- end }}
Expand Down
10 changes: 7 additions & 3 deletions charts/netbox/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,13 +377,17 @@ remoteAuth:
# groupSearchBaseDn: 'OU=Groups,OU=MyCompany,DC=domain,dc=com'
# groupSearchClass: 'group'
# groupType: 'GroupOfNamesType'
# requireGroupDn: ''
# requireGroupDn:
# - 'CN=Network Configuration Operators,CN=Builtin,DC=domain,dc=com'
# - 'CN=Domain Admins,CN=Users,DC=domain,dc=com'
# isAdminDn:
# - 'CN=Domain Admins,CN=Users,DC=domain,dc=com'
# isSuperUserDn:
# - 'CN=Domain Admins,CN=Users,DC=domain,dc=com'
# findGroupPerms: true
# mirrorGroups: true
# mirrorGroupsExcept: null
# cacheTimeout: 3600
# isAdminDn: 'CN=Network Configuration Operators,CN=Builtin,DC=domain,dc=com'
# isSuperUserDn: 'CN=Domain Admins,CN=Users,DC=domain,dc=com'
# attrFirstName: 'givenName'
# attrLastName: 'sn'
# attrMail: 'mail'
Expand Down