Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-9401: NPE in TestPKIAuthenticationPlugin. tests would retry for timeout

This commit is contained in:
Noble Paul 2017-03-02 20:50:06 +10:30
parent d1d73bfbea
commit f57d829fa0
1 changed files with 84 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java
View File

@ -38,10 +38,18 @@ import org.apache.solr.util.CryptoKeys;
import static org.mockito.Mockito.*;
public class TestPKIAuthenticationPlugin extends SolrTestCaseJ4 {
HttpServletRequest mockReq;
FilterChain filterChain;
final AtomicReference<ServletRequest> wrappedRequestByFilter = new AtomicReference<>();
final AtomicReference<Header> header = new AtomicReference<>();
AtomicReference<Principal> principal = new AtomicReference<>();
BasicHttpRequest request;
static class MockPKIAuthenticationPlugin extends PKIAuthenticationPlugin {
SolrRequestInfo solrRequestInfo;
Map<String, PublicKey> remoteKeys = new HashMap<>();
public MockPKIAuthenticationPlugin(CoreContainer cores, String node) {
@ -70,7 +78,6 @@ public class TestPKIAuthenticationPlugin extends SolrTestCaseJ4 {
}
public void test() throws Exception {
AtomicReference<Principal> principal = new AtomicReference<>();
String nodeName = "node_x_233";
final MockPKIAuthenticationPlugin mock = new MockPKIAuthenticationPlugin(null, nodeName);
@ -85,21 +92,23 @@ public class TestPKIAuthenticationPlugin extends SolrTestCaseJ4 {
principal.set(new BasicUserPrincipal("solr"));
mock.solrRequestInfo = new SolrRequestInfo(localSolrQueryRequest, new SolrQueryResponse());
BasicHttpRequest request = new BasicHttpRequest("GET", "http://localhost:56565");
request = new BasicHttpRequest("GET", "http://localhost:56565");
mock.setHeader(request);
final AtomicReference<Header> header = new AtomicReference<>();
header.set(request.getFirstHeader(PKIAuthenticationPlugin.HEADER));
assertNotNull(header.get());
assertTrue(header.get().getValue().startsWith(nodeName));
final AtomicReference<ServletRequest> wrappedRequestByFilter = new AtomicReference<>();
HttpServletRequest mockReq = createMockRequest(header);
FilterChain filterChain = (servletRequest, servletResponse) -> wrappedRequestByFilter.set(servletRequest);
mock.doAuthenticate(mockReq, null, filterChain);
mockReq = createMockRequest(header);
filterChain = (servletRequest, servletResponse) -> wrappedRequestByFilter.set(servletRequest);
run("solr", () -> {
mock.doAuthenticate(mockReq, null, filterChain);
});
assertNotNull(wrappedRequestByFilter.get());
assertEquals("solr", ((HttpServletRequest) wrappedRequestByFilter.get()).getUserPrincipal().getName());
//test 2
run(null, () -> {
principal.set(null); // no user
header.set(null);
wrappedRequestByFilter.set(null);//
@ -107,10 +116,10 @@ public class TestPKIAuthenticationPlugin extends SolrTestCaseJ4 {
mock.setHeader(request);
assertNull(request.getFirstHeader(PKIAuthenticationPlugin.HEADER));
mock.doAuthenticate(mockReq, null, filterChain);
assertNotNull(wrappedRequestByFilter.get());
assertNull(((HttpServletRequest) wrappedRequestByFilter.get()).getUserPrincipal());
});
//test 3 . No user request . Request originated from Solr
run("$", () -> {
mock.solrRequestInfo = null;
header.set(null);
wrappedRequestByFilter.set(null);
@ -119,15 +128,21 @@ public class TestPKIAuthenticationPlugin extends SolrTestCaseJ4 {
header.set(request.getFirstHeader(PKIAuthenticationPlugin.HEADER));
assertNotNull(header.get());
assertTrue(header.get().getValue().startsWith(nodeName));
mock.doAuthenticate(mockReq, null, filterChain);
assertNotNull(wrappedRequestByFilter.get());
assertEquals("$", ((HttpServletRequest) wrappedRequestByFilter.get()).getUserPrincipal().getName());
});
run("$", () -> {
mock.solrRequestInfo = null;
header.set(null);
wrappedRequestByFilter.set(null);
request = new BasicHttpRequest("GET", "http://localhost:56565");
mock.setHeader(request);
header.set(request.getFirstHeader(PKIAuthenticationPlugin.HEADER));
assertNotNull(header.get());
assertTrue(header.get().getValue().startsWith(nodeName));
MockPKIAuthenticationPlugin mock1 = new MockPKIAuthenticationPlugin(null, nodeName) {
int called = 0;
@Override
PublicKey getRemotePublicKey(String nodename) {
try {
@ -138,14 +153,36 @@ public class TestPKIAuthenticationPlugin extends SolrTestCaseJ4 {
}
};
mock1.doAuthenticate(mockReq, null,filterChain );
mock1.doAuthenticate(mockReq, null, filterChain);
});
}
interface Runnable {
void run() throws Exception;
}
private void run(String expected, Runnable r) throws Exception {
int failures = 0;
for (; ; ) {
r.run();
if (expected == null) {
assertTrue(wrappedRequestByFilter.get() == null || ((HttpServletRequest) wrappedRequestByFilter.get()).getUserPrincipal() == null);
} else {
assertNotNull(wrappedRequestByFilter.get());
assertEquals("$", ((HttpServletRequest) wrappedRequestByFilter.get()).getUserPrincipal().getName());
if (((HttpServletRequest) wrappedRequestByFilter.get()).getUserPrincipal() == null) {
//may be timed out
if (++failures < 3) continue;
else
fail("No principal obtained");
}
assertEquals(expected, ((HttpServletRequest) wrappedRequestByFilter.get()).getUserPrincipal().getName());
}
return;
}
}
private HttpServletRequest createMockRequest(final AtomicReference<Header> header) {
HttpServletRequest mockReq = mock(HttpServletRequest.class);