liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: ldap allow disable cert check + icon

Browse Source
This commit is contained in:
NGPixel 2020-04-24 00:29:49 -04:00
parent ec2d10c7f2
commit d1dd1f195b
6 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/components/admin/admin-analytics.vue
View File

@ -63,7 +63,7 @@
:key='cfg.key' :key='cfg.key'
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
:class='cfg.value.hint ? "mb-2" : ""' :class='cfg.value.hint ? "mb-2" : ""'
@ -74,7 +74,7 @@
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
color='primary' color='primary'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
inset inset
@ -85,7 +85,7 @@
:key='cfg.key' :key='cfg.key'
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
:class='cfg.value.hint ? "mb-2" : ""' :class='cfg.value.hint ? "mb-2" : ""'
@ -96,7 +96,7 @@
:key='cfg.key' :key='cfg.key'
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
:class='cfg.value.hint ? "mb-2" : ""' :class='cfg.value.hint ? "mb-2" : ""'

8
client/components/admin/admin-auth.vue
View File

@ -99,7 +99,7 @@
:key='cfg.key' :key='cfg.key'
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
:class='cfg.value.hint ? "mb-2" : ""' :class='cfg.value.hint ? "mb-2" : ""'
@ -110,7 +110,7 @@
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
color='primary' color='primary'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
inset inset
@ -121,7 +121,7 @@
:key='cfg.key' :key='cfg.key'
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
:class='cfg.value.hint ? "mb-2" : ""' :class='cfg.value.hint ? "mb-2" : ""'
@ -132,7 +132,7 @@
:key='cfg.key' :key='cfg.key'
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
:class='cfg.value.hint ? "mb-2" : ""' :class='cfg.value.hint ? "mb-2" : ""'

8
client/components/admin/admin-search.vue
View File

@ -55,7 +55,7 @@
:key='cfg.key' :key='cfg.key'
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
:class='cfg.value.hint ? "mb-2" : ""' :class='cfg.value.hint ? "mb-2" : ""'
@ -66,7 +66,7 @@
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
color='primary' color='primary'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
inset inset
@ -77,7 +77,7 @@
:key='cfg.key' :key='cfg.key'
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
:class='cfg.value.hint ? "mb-2" : ""' :class='cfg.value.hint ? "mb-2" : ""'
@ -88,7 +88,7 @@
:key='cfg.key' :key='cfg.key'
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
:class='cfg.value.hint ? "mb-2" : ""' :class='cfg.value.hint ? "mb-2" : ""'

8
client/components/admin/admin-storage.vue
View File

@ -111,7 +111,7 @@
:key='cfg.key' :key='cfg.key'
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
:class='cfg.value.hint ? "mb-2" : ""' :class='cfg.value.hint ? "mb-2" : ""'
@ -122,7 +122,7 @@
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
color='primary' color='primary'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
inset inset
@ -133,7 +133,7 @@
:key='cfg.key' :key='cfg.key'
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
:class='cfg.value.hint ? "mb-2" : ""' :class='cfg.value.hint ? "mb-2" : ""'
@ -144,7 +144,7 @@
:key='cfg.key' :key='cfg.key'
:label='cfg.value.title' :label='cfg.value.title'
v-model='cfg.value.value' v-model='cfg.value.value'
prepend-icon='mdi-settings-box' prepend-icon='mdi-cog-box'
:hint='cfg.value.hint ? cfg.value.hint : ""' :hint='cfg.value.hint ? cfg.value.hint : ""'
persistent-hint persistent-hint
:class='cfg.value.hint ? "mb-2" : ""' :class='cfg.value.hint ? "mb-2" : ""'

1
server/modules/authentication/ldap/authentication.js
View File

@ -19,6 +19,7 @@ module.exports = {
searchBase: conf.searchBase, searchBase: conf.searchBase,
searchFilter: conf.searchFilter, searchFilter: conf.searchFilter,
tlsOptions: (conf.tlsEnabled) ? { tlsOptions: (conf.tlsEnabled) ? {
rejectUnauthorized: conf.verifyTLSCertificate,
ca: [ ca: [
fs.readFileSync(conf.tlsCertPath) fs.readFileSync(conf.tlsCertPath)
] ]

15
server/modules/authentication/ldap/definition.yml
View File

@ -42,32 +42,37 @@ props:
type: Boolean type: Boolean
default: false default: false
order: 6 order: 6
verifyTLSCertificate:
title: Verify TLS Certificate
type: Boolean
default: true
order: 7
tlsCertPath: tlsCertPath:
title: TLS Certificate Path title: TLS Certificate Path
type: String type: String
hint: Absolute path to the TLS certificate on the server. hint: Absolute path to the TLS certificate on the server.
order: 7 order: 8
mappingUID: mappingUID:
title: Unique ID Field Mapping title: Unique ID Field Mapping
type: String type: String
default: 'uid' default: 'uid'
hint: The field storing the user unique identifier. Usually "uid" or "sAMAccountName". hint: The field storing the user unique identifier. Usually "uid" or "sAMAccountName".
order: 8 order: 20
mappingEmail: mappingEmail:
title: Email Field Mapping title: Email Field Mapping
type: String type: String
default: 'mail' default: 'mail'
hint: The field storing the user email. Usually "mail". hint: The field storing the user email. Usually "mail".
order: 9 order: 21
mappingDisplayName: mappingDisplayName:
title: Display Name Field Mapping title: Display Name Field Mapping
type: String type: String
default: 'displayName' default: 'displayName'
hint: The field storing the user display name. Usually "displayName" or "cn". hint: The field storing the user display name. Usually "displayName" or "cn".
order: 10 order: 22
mappingPicture: mappingPicture:
title: Avatar Picture Field Mapping title: Avatar Picture Field Mapping
type: String type: String
default: 'jpegPhoto' default: 'jpegPhoto'
hint: The field storing the user avatar picture. Usually "jpegPhoto" or "thumbnailPhoto". hint: The field storing the user avatar picture. Usually "jpegPhoto" or "thumbnailPhoto".
order: 11 order: 23