Skip to content
Permalink
Browse files

Merge pull request #17 from rsandell/multi-ou

[JENKINS-21475] Multi server/OU support
  • Loading branch information
rsandell committed Jun 7, 2017
2 parents 2b3521b + 2fbf81c commit a9a1067a5e839f6b097a7f9e8f3a5edf3772ad35
Showing with 2,299 additions and 392 deletions.
  1. +7 −1 pom.xml
  2. +628 −320 src/main/java/hudson/security/LDAPSecurityRealm.java
  3. +521 −0 src/main/java/jenkins/security/plugins/ldap/LDAPConfiguration.java
  4. +1 −1 src/main/resources/hudson/security/LDAPBindSecurityRealm.groovy
  5. +23 −38 src/main/resources/hudson/security/LDAPSecurityRealm/config.jelly
  6. +1 −0 src/main/resources/hudson/security/LDAPSecurityRealm/config.properties
  7. +10 −0 src/main/resources/hudson/security/LDAPSecurityRealm/help.html
  8. +41 −0 src/main/resources/jenkins/security/plugins/ldap/LDAPConfiguration/config.jelly
  9. 0 ...curityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-displayNameAttributeName.html
  10. 0 ...ty/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-groupSearchBase.html
  11. 0 ...LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-groupSearchBase_de.html
  12. 0 ...LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-groupSearchBase_fr.html
  13. 0 ...LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-groupSearchBase_ja.html
  14. 0 ...LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-groupSearchBase_tr.html
  15. 0 ...PSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-groupSearchBase_zh_TW.html
  16. 0 .../LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-groupSearchFilter.html
  17. 0 ...curityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-mailAddressAttributeName.html
  18. 0 ...security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerDN.html
  19. 0 ...urity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerDN_de.html
  20. 0 ...urity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerDN_fr.html
  21. 0 ...urity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerDN_ja.html
  22. 0 ...ty/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerDN_pt_BR.html
  23. 0 ...urity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerDN_tr.html
  24. 0 ...ty/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerDN_zh_TW.html
  25. 0 ...PSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerPasswordSecret.html
  26. 0 ...curityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerPasswordSecret_de.html
  27. 0 ...curityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerPasswordSecret_fr.html
  28. 0 ...curityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerPasswordSecret_ja.html
  29. 0 ...ityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerPasswordSecret_pt_BR.html
  30. 0 ...curityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerPasswordSecret_tr.html
  31. 0 ...ityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-managerPasswordSecret_zh_TW.html
  32. 0 ...on/security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-rootDN.html
  33. 0 ...security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-rootDN_de.html
  34. 0 ...security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-rootDN_fr.html
  35. 0 ...security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-rootDN_ja.html
  36. 0 ...urity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-rootDN_pt_BR.html
  37. 0 ...security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-rootDN_ru.html
  38. 0 ...security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-rootDN_tr.html
  39. 0 ...urity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-rootDN_zh_TW.html
  40. 0 ...on/security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-server.html
  41. 0 ...security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-server_de.html
  42. 0 ...security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-server_fr.html
  43. 0 ...security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-server_ja.html
  44. 0 ...urity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-server_pt_BR.html
  45. 0 ...security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-server_ru.html
  46. 0 ...security/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-server_tr.html
  47. 0 ...urity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-server_zh_TW.html
  48. 0 ...ecurity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearch.html
  49. 0 ...ity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearchBase.html
  50. 0 .../LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearchBase_de.html
  51. 0 .../LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearchBase_fr.html
  52. 0 .../LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearchBase_ja.html
  53. 0 ...APSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearchBase_pt_BR.html
  54. 0 .../LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearchBase_ru.html
  55. 0 .../LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearchBase_tr.html
  56. 0 ...APSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearchBase_zh_TW.html
  57. 0 ...rity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearch_de.html
  58. 0 ...rity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearch_fr.html
  59. 0 ...rity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearch_ja.html
  60. 0 ...y/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearch_pt_BR.html
  61. 0 ...rity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearch_ru.html
  62. 0 ...rity/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearch_tr.html
  63. 0 ...y/LDAPSecurityRealm → jenkins/security/plugins/ldap/LDAPConfiguration}/help-userSearch_zh_TW.html
  64. +3 −0 src/main/resources/jenkins/security/plugins/ldap/Messages.properties
  65. +2 −2 src/test/java/hudson/security/LDAPEmbeddedTest.java
  66. +315 −22 src/test/java/hudson/security/LDAPSecurityRealmTest.java
  67. +131 −0 src/test/java/hudson/security/LdapMultiEmbedded2Test.java
  68. +138 −0 src/test/java/hudson/security/LdapMultiEmbeddedTest.java
  69. +113 −0 src/test/java/hudson/security/docker/MultiServerTest.java
  70. +54 −0 src/test/java/hudson/security/docker/PlanetExpressTest.java
  71. +93 −0 src/test/java/jenkins/security/plugins/ldap/LDAPConfigurationTest.java
  72. +3 −3 src/test/java/jenkins/security/plugins/ldap/LDAPRule.java
  73. +1 −1 src/test/java/jenkins/security/plugins/ldap/{LDAPConfiguration.java → LDAPTestConfiguration.java}
  74. +1 −0 src/test/resources/hudson/security/docker/PlanetExpressTest/PlanetExpress/Dockerfile
  75. +36 −4 src/test/resources/hudson/security/planetexpress.ldif
  76. +177 −0 src/test/resources/hudson/security/planetexpressWithHNelson.ldif
@@ -52,7 +52,13 @@
<artifactId>mailer</artifactId>
<version>1.20</version>
</dependency>

<dependency>
<groupId>org.jenkins-ci.test</groupId>
<artifactId>docker-fixtures</artifactId>
<version>1.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>bouncycastle-api</artifactId>

Large diffs are not rendered by default.

0 comments on commit a9a1067

Please sign in to comment.
You can’t perform that action at this time.