Skip to content

avoid rejecting user login if listLdapConfiguration is not allowed #13152

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
sudo87 wants to merge 2 commits into
base: 4.20
Choose a base branch
from
+11 −10
Open

avoid rejecting user login if listLdapConfiguration is not allowed #13152

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
843151c
avoid rejecting user login if listLdapConfiguration is not allowed
sudo87 May 13, 2026
d9b85ef
Harden LDAP config discovery during login
andrijapanicsb May 14, 2026
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
17 changes: 9 additions & 8 deletions ui/src/store/modules/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ const user = {
commit('SET_PROJECT', {})
commit('SET_HEADER_NOTICES', [])
commit('SET_FEATURES', {})
commit('SET_LDAP', {})
commit('SET_LDAP', false)
commit('SET_CLOUDIAN', {})
commit('SET_DOMAIN_STORE', {})
commit('SET_LOGOUT_FLAG', false)
Expand Down Expand Up @@ -268,7 +268,7 @@ const user = {
commit('SET_PROJECT', {})
commit('SET_HEADER_NOTICES', [])
commit('SET_FEATURES', {})
commit('SET_LDAP', {})
commit('SET_LDAP', false)
commit('SET_CLOUDIAN', {})
commit('SET_DOMAIN_STORE', {})
commit('SET_LOGOUT_FLAG', false)
Expand Down Expand Up @@ -420,10 +420,10 @@ const user = {
})

api('listLdapConfigurations').then(response => {
const ldapEnable = (response.ldapconfigurationresponse.count > 0)
const ldapEnable = ((response && response.ldapconfigurationresponse && response.ldapconfigurationresponse.count) || 0) > 0
commit('SET_LDAP', ldapEnable)
}).catch(error => {
reject(error)
}).catch(ignored => {
Comment thread
sudo87 marked this conversation as resolved.
commit('SET_LDAP', false)
})

api('cloudianIsEnabled').then(response => {
Expand All @@ -448,7 +448,7 @@ const user = {
commit('SET_PROJECT', {})
commit('SET_HEADER_NOTICES', [])
commit('SET_FEATURES', {})
commit('SET_LDAP', {})
commit('SET_LDAP', false)
commit('SET_CLOUDIAN', {})
commit('RESET_THEME')
commit('SET_DOMAIN_STORE', {})
Expand Down Expand Up @@ -551,11 +551,12 @@ const user = {
}
})
},
UpdateConfiguration ({ commit }) {
UpdateLdapConfigurationFlag ({ commit }) {
return new Promise((resolve, reject) => {
api('listLdapConfigurations').then(response => {
const ldapEnable = (response.ldapconfigurationresponse.count > 0)
const ldapEnable = ((response && response.ldapconfigurationresponse && response.ldapconfigurationresponse.count) || 0) > 0
commit('SET_LDAP', ldapEnable)
resolve(ldapEnable)
}).catch(error => {
reject(error)
})
Expand Down
2 changes: 1 addition & 1 deletion ui/src/utils/request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const err = (error) => {
})
}
if (response.status === 401) {
if (response.config && response.config.params && ['forgotPassword', 'listIdps', 'cloudianIsEnabled'].includes(response.config.params.command)) {
if (response.config && response.config.params && ['forgotPassword', 'listIdps', 'cloudianIsEnabled', 'listLdapConfigurations'].includes(response.config.params.command)) {
return
}
const originalPath = router.currentRoute.value.fullPath
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/AutogenView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1600,7 +1600,7 @@ export default {
}
}
if (['addLdapConfiguration', 'deleteLdapConfiguration'].includes(action.api)) {
this.$store.dispatch('UpdateConfiguration')
this.$store.dispatch('UpdateLdapConfigurationFlag')
}
if (jobId) {
eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource, state: 'InProgress', jobid: jobId })
Expand Down
Loading