@@ -69,10 +69,11 @@ public class ActiveDirectoryLdapAuthenticationProviderTests {
69
69
ActiveDirectoryLdapAuthenticationProvider provider ;
70
70
71
71
UsernamePasswordAuthenticationToken joe = UsernamePasswordAuthenticationToken .unauthenticated ("joe" , "password" );
72
-
72
+ DirContext ctx ;
73
73
@ BeforeEach
74
74
public void setUp () {
75
75
this .provider = new ActiveDirectoryLdapAuthenticationProvider ("mydomain.eu" , "ldap://192.168.1.200/" );
76
+ ctx = mock (DirContext .class );
76
77
}
77
78
78
79
@ Test
@@ -90,8 +91,6 @@ public void successfulAuthenticationProducesExpectedAuthorities() throws Excepti
90
91
@ Test
91
92
public void customSearchFilterIsUsedForSuccessfulAuthentication () throws Exception {
92
93
String customSearchFilter = "(&(objectClass=user)(sAMAccountName={0}))" ;
93
- DirContext ctx = mock (DirContext .class );
94
- given (ctx .getNameInNamespace ()).willReturn ("" );
95
94
DirContextAdapter dca = new DirContextAdapter ();
96
95
SearchResult sr = new SearchResult ("CN=Joe Jannsen,CN=Users" , dca , dca .getAttributes ());
97
96
given (ctx .search (any (Name .class ), eq (customSearchFilter ), any (Object [].class ), any (SearchControls .class )))
@@ -107,8 +106,6 @@ public void customSearchFilterIsUsedForSuccessfulAuthentication() throws Excepti
107
106
@ Test
108
107
public void defaultSearchFilter () throws Exception {
109
108
final String defaultSearchFilter = "(&(objectClass=user)(userPrincipalName={0}))" ;
110
- DirContext ctx = mock (DirContext .class );
111
- given (ctx .getNameInNamespace ()).willReturn ("" );
112
109
DirContextAdapter dca = new DirContextAdapter ();
113
110
SearchResult sr = new SearchResult ("CN=Joe Jannsen,CN=Users" , dca , dca .getAttributes ());
114
111
given (ctx .search (any (Name .class ), eq (defaultSearchFilter ), any (Object [].class ), any (SearchControls .class )))
@@ -126,8 +123,6 @@ public void defaultSearchFilter() throws Exception {
126
123
public void bindPrincipalAndUsernameUsed () throws Exception {
127
124
final String defaultSearchFilter = "(&(objectClass=user)(userPrincipalName={0}))" ;
128
125
ArgumentCaptor <Object []> captor = ArgumentCaptor .forClass (Object [].class );
129
- DirContext ctx = mock (DirContext .class );
130
- given (ctx .getNameInNamespace ()).willReturn ("" );
131
126
DirContextAdapter dca = new DirContextAdapter ();
132
127
SearchResult sr = new SearchResult ("CN=Joe Jannsen,CN=Users" , dca , dca .getAttributes ());
133
128
given (ctx .search (any (Name .class ), eq (defaultSearchFilter ), captor .capture (), any (SearchControls .class )))
@@ -153,8 +148,6 @@ public void setSearchFilterEmpty() {
153
148
@ Test
154
149
public void nullDomainIsSupportedIfAuthenticatingWithFullUserPrincipal () throws Exception {
155
150
this .provider = new ActiveDirectoryLdapAuthenticationProvider (null , "ldap://192.168.1.200/" );
156
- DirContext ctx = mock (DirContext .class );
157
- given (ctx .getNameInNamespace ()).willReturn ("" );
158
151
DirContextAdapter dca = new DirContextAdapter ();
159
152
SearchResult sr = new SearchResult ("CN=Joe Jannsen,CN=Users" , dca , dca .getAttributes ());
160
153
given (ctx .search (eq (LdapNameBuilder .newInstance ("DC=mydomain,DC=eu" ).build ()), any (String .class ),
@@ -167,8 +160,6 @@ public void nullDomainIsSupportedIfAuthenticatingWithFullUserPrincipal() throws
167
160
168
161
@ Test
169
162
public void failedUserSearchCausesBadCredentials () throws Exception {
170
- DirContext ctx = mock (DirContext .class );
171
- given (ctx .getNameInNamespace ()).willReturn ("" );
172
163
given (ctx .search (any (Name .class ), any (String .class ), any (Object [].class ), any (SearchControls .class )))
173
164
.willThrow (new NameNotFoundException ());
174
165
this .provider .contextFactory = createContextFactoryReturning (ctx );
@@ -178,8 +169,6 @@ public void failedUserSearchCausesBadCredentials() throws Exception {
178
169
// SEC-2017
179
170
@ Test
180
171
public void noUserSearchCausesUsernameNotFound () throws Exception {
181
- DirContext ctx = mock (DirContext .class );
182
- given (ctx .getNameInNamespace ()).willReturn ("" );
183
172
given (ctx .search (any (Name .class ), any (String .class ), any (Object [].class ), any (SearchControls .class )))
184
173
.willReturn (new EmptyEnumeration <>());
185
174
this .provider .contextFactory = createContextFactoryReturning (ctx );
@@ -196,8 +185,6 @@ public void sec2500PreventAnonymousBind() {
196
185
@ Test
197
186
@ SuppressWarnings ("unchecked" )
198
187
public void duplicateUserSearchCausesError () throws Exception {
199
- DirContext ctx = mock (DirContext .class );
200
- given (ctx .getNameInNamespace ()).willReturn ("" );
201
188
NamingEnumeration <SearchResult > searchResults = mock (NamingEnumeration .class );
202
189
given (searchResults .hasMore ()).willReturn (true , true , false );
203
190
SearchResult searchResult = mock (SearchResult .class );
@@ -209,7 +196,6 @@ public void duplicateUserSearchCausesError() throws Exception {
209
196
assertThatExceptionOfType (IncorrectResultSizeDataAccessException .class )
210
197
.isThrownBy (() -> this .provider .authenticate (this .joe ));
211
198
}
212
-
213
199
static final String msg = "[LDAP: error code 49 - 80858585: LdapErr: DSID-DECAFF0, comment: AcceptSecurityContext error, data " ;
214
200
215
201
@ Test
@@ -357,8 +343,6 @@ DirContext createContext(Hashtable<?, ?> env) {
357
343
358
344
private void checkAuthentication (String rootDn , ActiveDirectoryLdapAuthenticationProvider provider )
359
345
throws NamingException {
360
- DirContext ctx = mock (DirContext .class );
361
- given (ctx .getNameInNamespace ()).willReturn ("" );
362
346
DirContextAdapter dca = new DirContextAdapter ();
363
347
SearchResult sr = new SearchResult ("CN=Joe Jannsen,CN=Users" , dca , dca .getAttributes ());
364
348
@ SuppressWarnings ("deprecation" )
0 commit comments