Skip to content
This repository was archived by the owner on Mar 25, 2024. It is now read-only.

[Forwardport] Add custom ldapsearchfilter #1015

Open
mrajashree wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Forwardport] Add custom ldapsearchfilter #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1826f87
Add custom search filter field for openldap and freeipa
mrajashree Sep 18, 2019
062d221
Generated changes
mrajashree Sep 18, 2019
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: 2 additions & 0 deletions apis/management.cattle.io/v3/authn_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,15 @@ type LdapConfig struct {
UserDisabledBitMask int64 `json:"userDisabledBitMask,omitempty"`
UserSearchBase string `json:"userSearchBase,omitempty" norman:"notnullable,required"`
UserSearchAttribute string `json:"userSearchAttribute,omitempty" norman:"default=uid|sn|givenName,notnullable,required"`
UserSearchFilter string `json:"userSearchFilter,omitempty"`
UserLoginAttribute string `json:"userLoginAttribute,omitempty" norman:"default=uid,notnullable,required"`
UserObjectClass string `json:"userObjectClass,omitempty" norman:"default=inetOrgPerson,notnullable,required"`
UserNameAttribute string `json:"userNameAttribute,omitempty" norman:"default=cn,notnullable,required"`
UserMemberAttribute string `json:"userMemberAttribute,omitempty" norman:"default=memberOf,notnullable,required"`
UserEnabledAttribute string `json:"userEnabledAttribute,omitempty"`
GroupSearchBase string `json:"groupSearchBase,omitempty"`
GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" norman:"default=cn,notnullable,required"`
GroupSearchFilter string `json:"groupSearchFilter,omitempty"`
GroupObjectClass string `json:"groupObjectClass,omitempty" norman:"default=groupOfNames,notnullable,required"`
GroupNameAttribute string `json:"groupNameAttribute,omitempty" norman:"default=cn,notnullable,required"`
GroupDNAttribute string `json:"groupDNAttribute,omitempty" norman:"default=entryDN,notnullable"`
Expand Down
4 changes: 4 additions & 0 deletions client/management/v3/zz_generated_free_ipa_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const (
FreeIpaConfigFieldGroupObjectClass = "groupObjectClass"
FreeIpaConfigFieldGroupSearchAttribute = "groupSearchAttribute"
FreeIpaConfigFieldGroupSearchBase = "groupSearchBase"
FreeIpaConfigFieldGroupSearchFilter = "groupSearchFilter"
FreeIpaConfigFieldLabels = "labels"
FreeIpaConfigFieldName = "name"
FreeIpaConfigFieldOwnerReferences = "ownerReferences"
Expand All @@ -36,6 +37,7 @@ const (
FreeIpaConfigFieldUserObjectClass = "userObjectClass"
FreeIpaConfigFieldUserSearchAttribute = "userSearchAttribute"
FreeIpaConfigFieldUserSearchBase = "userSearchBase"
FreeIpaConfigFieldUserSearchFilter = "userSearchFilter"
)

type FreeIpaConfig struct {
Expand All @@ -54,6 +56,7 @@ type FreeIpaConfig struct {
GroupObjectClass string `json:"groupObjectClass,omitempty" yaml:"groupObjectClass,omitempty"`
GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" yaml:"groupSearchAttribute,omitempty"`
GroupSearchBase string `json:"groupSearchBase,omitempty" yaml:"groupSearchBase,omitempty"`
GroupSearchFilter string `json:"groupSearchFilter,omitempty" yaml:"groupSearchFilter,omitempty"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
Name string `json:"name,omitempty" yaml:"name,omitempty"`
OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"`
Expand All @@ -73,4 +76,5 @@ type FreeIpaConfig struct {
UserObjectClass string `json:"userObjectClass,omitempty" yaml:"userObjectClass,omitempty"`
UserSearchAttribute string `json:"userSearchAttribute,omitempty" yaml:"userSearchAttribute,omitempty"`
UserSearchBase string `json:"userSearchBase,omitempty" yaml:"userSearchBase,omitempty"`
UserSearchFilter string `json:"userSearchFilter,omitempty" yaml:"userSearchFilter,omitempty"`
}
4 changes: 4 additions & 0 deletions client/management/v3/zz_generated_ldap_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const (
LdapConfigFieldGroupObjectClass = "groupObjectClass"
LdapConfigFieldGroupSearchAttribute = "groupSearchAttribute"
LdapConfigFieldGroupSearchBase = "groupSearchBase"
LdapConfigFieldGroupSearchFilter = "groupSearchFilter"
LdapConfigFieldLabels = "labels"
LdapConfigFieldName = "name"
LdapConfigFieldNestedGroupMembershipEnabled = "nestedGroupMembershipEnabled"
Expand All @@ -41,6 +42,7 @@ const (
LdapConfigFieldUserObjectClass = "userObjectClass"
LdapConfigFieldUserSearchAttribute = "userSearchAttribute"
LdapConfigFieldUserSearchBase = "userSearchBase"
LdapConfigFieldUserSearchFilter = "userSearchFilter"
)

type LdapConfig struct {
Expand All @@ -60,6 +62,7 @@ type LdapConfig struct {
GroupObjectClass string `json:"groupObjectClass,omitempty" yaml:"groupObjectClass,omitempty"`
GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" yaml:"groupSearchAttribute,omitempty"`
GroupSearchBase string `json:"groupSearchBase,omitempty" yaml:"groupSearchBase,omitempty"`
GroupSearchFilter string `json:"groupSearchFilter,omitempty" yaml:"groupSearchFilter,omitempty"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
Name string `json:"name,omitempty" yaml:"name,omitempty"`
NestedGroupMembershipEnabled bool `json:"nestedGroupMembershipEnabled,omitempty" yaml:"nestedGroupMembershipEnabled,omitempty"`
Expand All @@ -80,6 +83,7 @@ type LdapConfig struct {
UserObjectClass string `json:"userObjectClass,omitempty" yaml:"userObjectClass,omitempty"`
UserSearchAttribute string `json:"userSearchAttribute,omitempty" yaml:"userSearchAttribute,omitempty"`
UserSearchBase string `json:"userSearchBase,omitempty" yaml:"userSearchBase,omitempty"`
UserSearchFilter string `json:"userSearchFilter,omitempty" yaml:"userSearchFilter,omitempty"`
}

type LdapConfigCollection struct {
Expand Down
4 changes: 4 additions & 0 deletions client/management/v3/zz_generated_open_ldap_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const (
OpenLdapConfigFieldGroupObjectClass = "groupObjectClass"
OpenLdapConfigFieldGroupSearchAttribute = "groupSearchAttribute"
OpenLdapConfigFieldGroupSearchBase = "groupSearchBase"
OpenLdapConfigFieldGroupSearchFilter = "groupSearchFilter"
OpenLdapConfigFieldLabels = "labels"
OpenLdapConfigFieldName = "name"
OpenLdapConfigFieldNestedGroupMembershipEnabled = "nestedGroupMembershipEnabled"
Expand All @@ -37,6 +38,7 @@ const (
OpenLdapConfigFieldUserObjectClass = "userObjectClass"
OpenLdapConfigFieldUserSearchAttribute = "userSearchAttribute"
OpenLdapConfigFieldUserSearchBase = "userSearchBase"
OpenLdapConfigFieldUserSearchFilter = "userSearchFilter"
)

type OpenLdapConfig struct {
Expand All @@ -55,6 +57,7 @@ type OpenLdapConfig struct {
GroupObjectClass string `json:"groupObjectClass,omitempty" yaml:"groupObjectClass,omitempty"`
GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" yaml:"groupSearchAttribute,omitempty"`
GroupSearchBase string `json:"groupSearchBase,omitempty" yaml:"groupSearchBase,omitempty"`
GroupSearchFilter string `json:"groupSearchFilter,omitempty" yaml:"groupSearchFilter,omitempty"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
Name string `json:"name,omitempty" yaml:"name,omitempty"`
NestedGroupMembershipEnabled bool `json:"nestedGroupMembershipEnabled,omitempty" yaml:"nestedGroupMembershipEnabled,omitempty"`
Expand All @@ -75,4 +78,5 @@ type OpenLdapConfig struct {
UserObjectClass string `json:"userObjectClass,omitempty" yaml:"userObjectClass,omitempty"`
UserSearchAttribute string `json:"userSearchAttribute,omitempty" yaml:"userSearchAttribute,omitempty"`
UserSearchBase string `json:"userSearchBase,omitempty" yaml:"userSearchBase,omitempty"`
UserSearchFilter string `json:"userSearchFilter,omitempty" yaml:"userSearchFilter,omitempty"`
}