Skip to content
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

Build against Spring Security #49

Merged
merged 52 commits into from
Nov 17, 2020
Merged

Build against Spring Security #49

Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
9bf71eb
Trying to compile against Spring Security
jglick Jul 31, 2020
bc478a4
Some more progress
jglick Jul 31, 2020
c2cab64
Merge branch 'spring-5303' into spring-5303-new
jglick Aug 24, 2020
6463be1
Using an incremental jenkins.version
jglick Aug 24, 2020
d600c62
Got LDAPUserDetailsService to be compilable
jglick Aug 24, 2020
5b3de91
Reusing DelegatedLdapUserDetails to keep track of Attributes, otherwi…
jglick Aug 24, 2020
7b876e8
More strongly type some stuff as DelegatedLdapUserDetails
jglick Aug 24, 2020
f345adf
Making tests compilable
jglick Aug 24, 2020
ffe7187
Missing call to AbstractContextSource.afterPropertiesSet
jglick Aug 25, 2020
7dcddf3
Missing call to LdapUserDetailsImpl.Essence.setUsername
jglick Aug 25, 2020
03a4aaf
Various uses of Acegi Security in tests
jglick Aug 25, 2020
d62654c
Cargo cult programming
jglick Aug 25, 2020
a1f1f4d
LDAPConfiguration.createApplicationContext already configures Authori…
jglick Aug 25, 2020
d145884
Stray reference to DataAccessException
jglick Aug 26, 2020
17feb1a
DataAccessException has been replaced by AuthenticationServiceExcepti…
jglick Aug 26, 2020
8d576b9
Merge branch 'spring-5303' into spring-5303-new
jglick Sep 3, 2020
0f8b360
Core bump
jglick Sep 3, 2020
9993b9b
Found something to do with extraEnvVars, but LDAPEmbeddedTest#usingEn…
jglick Sep 3, 2020
a0943f4
Got LDAPEmbeddedTest#validate to pass by threading an LdapUserSearch …
jglick Sep 3, 2020
270cffc
Merge branch 'spring-5303' into spring-5303-new
jglick Sep 14, 2020
4b99b0b
Merge branch 'master' of github.com:jenkinsci/ldap-plugin into spring…
jglick Sep 15, 2020
c1e4287
Merge branch 'master' of github.com:jenkinsci/ldap-plugin into spring…
jglick Sep 15, 2020
8159c83
Picking up some core fixes
jglick Sep 15, 2020
a9dc4e4
AuthoritiesPopulatorImpl handling of rolePrefix and convertToUpperCas…
jglick Sep 15, 2020
68f6252
Less intrusive import rearrangement
jglick Sep 15, 2020
c08f374
Javadoc errors
jglick Sep 15, 2020
e7e4064
Failures in LdapMultiEmbeddedTest related to AuthenticationServiceExc…
jglick Sep 15, 2020
8ce42d8
Updated parent
jglick Sep 15, 2020
b876e54
Fixing some more failures in LdapMultiEmbeddedTest.
jglick Sep 15, 2020
fdc1ec0
Fixing LdapMultiEmbedded2Test.login by returning DelegatedLdapAuthent…
jglick Sep 15, 2020
7c00268
Found DefaultSpringSecurityContextSource.setBaseEnvironmentProperties…
jglick Sep 15, 2020
87b0e14
LDAPSecurityRealmTest was passing invalid rootDN values; syntax is no…
jglick Sep 15, 2020
53f75aa
SpotBugs
jglick Sep 15, 2020
74a81d6
No need to bundle all of Spring & Spring Security, just the LDAP-spec…
jglick Sep 16, 2020
f95183c
Noting that MailAddressResolver already works, and indeed still works…
jglick Sep 16, 2020
e15835f
Got LDAPSecurityRealmTest.sessionStressTest to compile, and figured o…
jglick Sep 16, 2020
474aa6d
Reimplemented LDAPUserDetailsService.attributesCache
jglick Sep 16, 2020
4a3a73d
Despite the name, LdapUserDetailsImpl.Essence.dn should really be Dir…
jglick Sep 16, 2020
92b0950
No need to clone ldapUser if it is the first one using a given NameAw…
jglick Sep 16, 2020
321a357
Was doing too much work—no need to clone the DirContextAdapter.
jglick Sep 16, 2020
e530174
There is no real reason to enforce use of NameAwareAttributes.
jglick Sep 16, 2020
e8a2a6a
Introduced SetContextClassLoader to fix class loading errors (see JEN…
jglick Sep 17, 2020
2935db9
Reordering some imports
jglick Sep 17, 2020
b994caf
Non-ACI agents not working out
jglick Sep 17, 2020
9577fe6
Forgot that ACI agents are not going to be able to run Dockerized tests.
jglick Sep 17, 2020
69fa05a
https://github.com/jenkinsci/ldap-plugin/pull/49#discussion_r495065425
jglick Sep 25, 2020
f779469
Merge branch 'master' of github.com:jenkinsci/ldap-plugin into spring…
jglick Sep 28, 2020
5ae8750
Finally found a way to make LDAPEmbeddedTest.usingEnvironmentProperti…
jglick Sep 28, 2020
03d10b1
https://github.com/jenkinsci/ldap-plugin/pull/49#discussion_r496120420
jglick Sep 28, 2020
93d8489
https://docs.oracle.com/javase/8/docs/technotes/guides/jndi/jndi-ldap…
jglick Oct 7, 2020
475a03b
Merge branch 'master' of https://github.com/jenkinsci/ldap-plugin int…
jglick Nov 10, 2020
d46b981
Can now use 2.266
jglick Nov 10, 2020
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
1 change: 1 addition & 0 deletions src/main/java/hudson/security/LDAPSecurityRealm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1336,6 +1336,7 @@ public DelegatedLdapUserDetails loadUserByUsername(String username) throws Usern
// Add those, as done in LdapAuthenticationProvider.createUserDetails().
LdapUserDetailsImpl.Essence user = new LdapUserDetailsImpl.Essence(ldapUser);
user.setUsername(username);
user.setDn(ldapUser.getNameInNamespace()); // otherwise the DN is missing the DC
jglick marked this conversation as resolved.
Show resolved Hide resolved

/* TODO DirContextAdapter has no setAttributes method, and anyway it looks to be of type NameAwareAttributes not BasicAttributes, so attributesCache may need to be reworked:
jglick marked this conversation as resolved.
Show resolved Hide resolved
// intern attributes
Expand Down