Skip to content

ldap configuration should be a option #5

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
mengzhaopeng wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ldap configuration should be a option #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 init.groovy.d/ldap.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ def env = System.getenv()
// Variables
def ldap_server = env['LDAP_SERVER']
def ldap_rootDN = env['LDAP_ROOTDN']
def ldap_inhibitInferRootDN = env['LDAP_INHIBIT_INFER_ROOTDN'].toBoolean()
Copy link
Contributor

@thinkernel thinkernel Sep 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this line is not a good idea.

def configXmlFile = "/var/jenkins_home/config.xml"

// Constants
Expand All @@ -22,6 +21,7 @@ Thread.start {
sleep 10000

if (ldap_server && (ldap_rootDN || ldap_inhibitInferRootDN)) {
Copy link
Contributor

@thinkernel thinkernel Sep 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ldap_inhibitInferRootDN would be NULL here which makes this logic useless and would be dangerous.

def ldap_inhibitInferRootDN = env['LDAP_INHIBIT_INFER_ROOTDN'].toBoolean()
init_ldap_parameter = true
def configXmlString = new File(configXmlFile).getText('UTF-8')
def rootNode = new XmlSlurper().parseText(configXmlString)
Expand Down