github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(ldap): enable user/group setting in custom ldap (#5855)

pull/5859/head
Chaim Lev-Ari 2021-10-08 00:43:04 +03:00 committed by GitHub
parent dad762de9f
commit ed89587cb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
app/portainer/settings/authentication/ldap/ldap-custom-group-search/ldap-custom-group-search.html
View File

@ -16,17 +16,7 @@
<portainer-tooltip position="bottom" message="The distinguished name of the element from which the LDAP server will search for groups."></portainer-tooltip> <portainer-tooltip position="bottom" message="The distinguished name of the element from which the LDAP server will search for groups."></portainer-tooltip>
</label> </label>
<div class="col-sm-8 col-md-4"> <div class="col-sm-8 col-md-4">
<input <input type="text" class="form-control" id="ldap_group_basedn_{{ $index }}" ng-model="config.GroupBaseDN" placeholder="dc=ldap,dc=domain,dc=tld" />
type="text"
class="form-control"
id="ldap_group_basedn_{{ $index }}"
ng-model="config.GroupBaseDN"
placeholder="dc=ldap,dc=domain,dc=tld"
limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
limited-feature-class="limited-be no-border"
limited-feature-disabled
limited-feature-tabindex="-1"
/>
</div> </div>
<label for="ldap_group_att_{{ $index }}" class="col-sm-4 col-md-2 control-label text-left"> <label for="ldap_group_att_{{ $index }}" class="col-sm-4 col-md-2 control-label text-left">
@ -34,17 +24,7 @@
<portainer-tooltip position="bottom" message="LDAP attribute which denotes the group membership."></portainer-tooltip> <portainer-tooltip position="bottom" message="LDAP attribute which denotes the group membership."></portainer-tooltip>
</label> </label>
<div class="col-sm-8 col-md-4"> <div class="col-sm-8 col-md-4">
<input <input type="text" class="form-control" id="ldap_group_att_{{ $index }}" ng-model="config.GroupAttribute" placeholder="member" />
type="text"
class="form-control"
id="ldap_group_att_{{ $index }}"
ng-model="config.GroupAttribute"
placeholder="member"
limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
limited-feature-class="limited-be no-border"
limited-feature-disabled
limited-feature-tabindex="-1"
/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -53,27 +33,10 @@
<portainer-tooltip position="bottom" message="The LDAP search filter used to select group elements, optional."></portainer-tooltip> <portainer-tooltip position="bottom" message="The LDAP search filter used to select group elements, optional."></portainer-tooltip>
</label> </label>
<div ng-class="{ 'col-sm-7 col-md-9': $index, 'col-sm-8 col-md-10': !$index }"> <div ng-class="{ 'col-sm-7 col-md-9': $index, 'col-sm-8 col-md-10': !$index }">
<input <input type="text" class="form-control" id="ldap_group_filter_{{ $index }}" ng-model="config.GroupFilter" placeholder="(objectClass=account)" />
type="text"
class="form-control"
id="ldap_group_filter_{{ $index }}"
ng-model="config.GroupFilter"
placeholder="(objectClass=account)"
limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
limited-feature-class="limited-be no-border"
limited-feature-disabled
limited-feature-tabindex="-1"
/>
</div> </div>
<div class="col-sm-1" ng-if="$index > 0"> <div class="col-sm-1" ng-if="$index > 0">
<button <button class="btn btn-sm btn-danger" type="button" ng-click="$ctrl.onRemoveClick($index)">
class="btn btn-sm btn-danger"
type="button"
ng-click="$ctrl.onRemoveClick($index)"
limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
limited-feature-disabled
limited-feature-tabindex="-1"
>
<i class="fa fa-trash" aria-hidden="true"></i> <i class="fa fa-trash" aria-hidden="true"></i>
</button> </button>
</div> </div>
@ -83,14 +46,7 @@
<div class="form-group" style="margin-top: 10px;"> <div class="form-group" style="margin-top: 10px;">
<div class="col-sm-12"> <div class="col-sm-12">
<button <button class="label label-default interactive" style="border: 0;" ng-click="$ctrl.onAddClick()">
class="label label-default interactive"
style="border: 0;"
ng-click="$ctrl.onAddClick()"
limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
limited-feature-tabindex="-1"
limited-feature-disabled
>
<i class="fa fa-plus-circle" aria-hidden="true"></i> add group search configuration <i class="fa fa-plus-circle" aria-hidden="true"></i> add group search configuration
</button> </button>
</div> </div>

54
app/portainer/settings/authentication/ldap/ldap-custom-user-search/ldap-custom-user-search.html
View File

@ -16,17 +16,7 @@
<portainer-tooltip position="bottom" message="The distinguished name of the element from which the LDAP server will search for users."></portainer-tooltip> <portainer-tooltip position="bottom" message="The distinguished name of the element from which the LDAP server will search for users."></portainer-tooltip>
</label> </label>
<div class="col-sm-8 col-md-4"> <div class="col-sm-8 col-md-4">
<input <input type="text" class="form-control" id="ldap_basedn_{{ $index }}" ng-model="config.BaseDN" placeholder="dc=ldap,dc=domain,dc=tld" />
type="text"
class="form-control"
id="ldap_basedn_{{ $index }}"
ng-model="config.BaseDN"
placeholder="dc=ldap,dc=domain,dc=tld"
limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
limited-feature-class="limited-be no-border"
limited-feature-tabindex="-1"
limited-feature-disabled
/>
</div> </div>
<label for="ldap_username_att_{{ $index }}" class="col-sm-4 col-md-3 col-lg-2 control-label text-left"> <label for="ldap_username_att_{{ $index }}" class="col-sm-4 col-md-3 col-lg-2 control-label text-left">
@ -34,17 +24,7 @@
<portainer-tooltip position="bottom" message="LDAP attribute which denotes the username."></portainer-tooltip> <portainer-tooltip position="bottom" message="LDAP attribute which denotes the username."></portainer-tooltip>
</label> </label>
<div class="col-sm-8 col-md-3 col-lg-4"> <div class="col-sm-8 col-md-3 col-lg-4">
<input <input type="text" class="form-control" id="ldap_username_att_{{ $index }}" ng-model="config.UserNameAttribute" placeholder="uid" />
type="text"
class="form-control"
id="ldap_username_att_{{ $index }}"
ng-model="config.UserNameAttribute"
placeholder="uid"
limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
limited-feature-class="limited-be no-border"
limited-feature-tabindex="-1"
limited-feature-disabled
/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -53,27 +33,10 @@
<portainer-tooltip position="bottom" message="The LDAP search filter used to select user elements, optional."></portainer-tooltip> <portainer-tooltip position="bottom" message="The LDAP search filter used to select user elements, optional."></portainer-tooltip>
</label> </label>
<div ng-class="{ 'col-sm-7 col-md-9': $index, 'col-sm-8 col-md-10': !$index }"> <div ng-class="{ 'col-sm-7 col-md-9': $index, 'col-sm-8 col-md-10': !$index }">
<input <input type="text" class="form-control" id="ldap_filter_{{ $index }}" ng-model="config.Filter" placeholder="(objectClass=account)" />
type="text"
class="form-control"
id="ldap_filter_{{ $index }}"
ng-model="config.Filter"
placeholder="(objectClass=account)"
limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
limited-feature-class="limited-be no-border"
limited-feature-tabindex="-1"
limited-feature-disabled
/>
</div> </div>
<div class="col-sm-1" ng-if="$index > 0"> <div class="col-sm-1" ng-if="$index > 0">
<button <button class="btn btn-sm btn-danger" type="button" ng-click="$ctrl.onRemoveClick($index)">
class="btn btn-sm btn-danger"
type="button"
ng-click="$ctrl.onRemoveClick($index)"
limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
limited-feature-tabindex="-1"
limited-feature-disabled
>
<i class="fa fa-trash" aria-hidden="true"></i> <i class="fa fa-trash" aria-hidden="true"></i>
</button> </button>
</div> </div>
@ -83,14 +46,7 @@
<div class="form-group" style="margin-top: 10px;"> <div class="form-group" style="margin-top: 10px;">
<div class="col-sm-12"> <div class="col-sm-12">
<button <button class="label label-default interactive" style="border: 0;" ng-click="$ctrl.onAddClick()">
class="label label-default interactive"
style="border: 0;"
ng-click="$ctrl.onAddClick()"
limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
limited-feature-tabindex="-1"
limited-feature-disabled
>
<i class="fa fa-plus-circle" aria-hidden="true"></i> add user search configuration <i class="fa fa-plus-circle" aria-hidden="true"></i> add user search configuration
</button> </button>
</div> </div>