6449574: Invalid ldap filter is accepted and processed
Reviewed-by: vinnie
This commit is contained in:
Xue-Lei Andrew Fan
parent
4d07a8cfb9
commit
a51137d942
@ -93,9 +93,7 @@ final class Filter {
|
||||
|
||||
int filtOffset[] = new int[1];
|
||||
|
||||
for (filtOffset[0] = filterStart;
|
||||
filtOffset[0] < filterEnd;
|
||||
filtOffset[0]++) {
|
||||
for (filtOffset[0] = filterStart; filtOffset[0] < filterEnd;) {
|
||||
switch (filter[filtOffset[0]]) {
|
||||
case '(':
|
||||
filtOffset[0]++;
|
||||
@ -104,18 +102,21 @@ final class Filter {
|
||||
case '&':
|
||||
encodeComplexFilter(ber, filter,
|
||||
LDAP_FILTER_AND, filtOffset, filterEnd);
|
||||
// filtOffset[0] has pointed to char after right paren
|
||||
parens--;
|
||||
break;
|
||||
|
||||
case '|':
|
||||
encodeComplexFilter(ber, filter,
|
||||
LDAP_FILTER_OR, filtOffset, filterEnd);
|
||||
// filtOffset[0] has pointed to char after right paren
|
||||
parens--;
|
||||
break;
|
||||
|
||||
case '!':
|
||||
encodeComplexFilter(ber, filter,
|
||||
LDAP_FILTER_NOT, filtOffset, filterEnd);
|
||||
// filtOffset[0] has pointed to char after right paren
|
||||
parens--;
|
||||
break;
|
||||
|
||||
@ -143,8 +144,8 @@ final class Filter {
|
||||
|
||||
encodeSimpleFilter(ber, filter, filtOffset[0], nextOffset);
|
||||
|
||||
// points to right parens; for loop will increment beyond parens
|
||||
filtOffset[0] = nextOffset;
|
||||
// points to the char after right paren.
|
||||
filtOffset[0] = nextOffset + 1;
|
||||
|
||||
parens--;
|
||||
break;
|
||||
@ -170,9 +171,14 @@ final class Filter {
|
||||
filtOffset[0] = filterEnd; // force break from outer
|
||||
break;
|
||||
}
|
||||
|
||||
if (parens < 0) {
|
||||
throw new InvalidSearchFilterException(
|
||||
"Unbalanced parenthesis");
|
||||
}
|
||||
}
|
||||
|
||||
if (parens > 0) {
|
||||
if (parens != 0) {
|
||||
throw new InvalidSearchFilterException("Unbalanced parenthesis");
|
||||
}
|
||||
|
||||
|
||||
236
jdk/test/com/sun/jndi/ldap/BalancedParentheses.java
Normal file
236
jdk/test/com/sun/jndi/ldap/BalancedParentheses.java
Normal file
@ -0,0 +1,236 @@
|
||||
/**
|
||||
* @test
|
||||
* @bug 6449574
|
||||
* @summary Invalid ldap filter is accepted and processed
|
||||
*/
|
||||
|
||||
import java.io.*;
|
||||
import javax.naming.*;
|
||||
import javax.naming.directory.*;
|
||||
import java.util.Properties;
|
||||
import java.util.Hashtable;
|
||||
|
||||
import java.net.Socket;
|
||||
import java.net.ServerSocket;
|
||||
|
||||
public class BalancedParentheses {
|
||||
// Should we run the client or server in a separate thread?
|
||||
//
|
||||
// Both sides can throw exceptions, but do you have a preference
|
||||
// as to which side should be the main thread.
|
||||
static boolean separateServerThread = true;
|
||||
|
||||
// use any free port by default
|
||||
volatile int serverPort = 0;
|
||||
|
||||
// Is the server ready to serve?
|
||||
volatile static boolean serverReady = false;
|
||||
|
||||
// Define the server side of the test.
|
||||
//
|
||||
// If the server prematurely exits, serverReady will be set to true
|
||||
// to avoid infinite hangs.
|
||||
void doServerSide() throws Exception {
|
||||
ServerSocket serverSock = new ServerSocket(serverPort);
|
||||
|
||||
// signal client, it's ready to accecpt connection
|
||||
serverPort = serverSock.getLocalPort();
|
||||
serverReady = true;
|
||||
|
||||
// accept a connection
|
||||
Socket socket = serverSock.accept();
|
||||
System.out.println("Server: Connection accepted");
|
||||
|
||||
InputStream is = socket.getInputStream();
|
||||
OutputStream os = socket.getOutputStream();
|
||||
|
||||
// read the bindRequest
|
||||
while (is.read() != -1) {
|
||||
// ignore
|
||||
is.skip(is.available());
|
||||
break;
|
||||
}
|
||||
|
||||
byte[] bindResponse = {0x30, 0x0C, 0x02, 0x01, 0x01, 0x61, 0x07, 0x0A,
|
||||
0x01, 0x00, 0x04, 0x00, 0x04, 0x00};
|
||||
// write bindResponse
|
||||
os.write(bindResponse);
|
||||
os.flush();
|
||||
|
||||
// ignore any more request.
|
||||
while (is.read() != -1) {
|
||||
// ignore
|
||||
is.skip(is.available());
|
||||
}
|
||||
|
||||
is.close();
|
||||
os.close();
|
||||
socket.close();
|
||||
serverSock.close();
|
||||
}
|
||||
|
||||
// Define the client side of the test.
|
||||
//
|
||||
// If the server prematurely exits, serverReady will be set to true
|
||||
// to avoid infinite hangs.
|
||||
void doClientSide() throws Exception {
|
||||
// Wait for server to get started.
|
||||
while (!serverReady) {
|
||||
Thread.sleep(50);
|
||||
}
|
||||
|
||||
// set up the environment for creating the initial context
|
||||
Hashtable<Object, Object> env = new Hashtable<Object, Object>();
|
||||
env.put(Context.INITIAL_CONTEXT_FACTORY,
|
||||
"com.sun.jndi.ldap.LdapCtxFactory");
|
||||
env.put(Context.PROVIDER_URL, "ldap://localhost:" + serverPort);
|
||||
env.put("com.sun.jndi.ldap.read.timeout", "1000");
|
||||
|
||||
// env.put(Context.SECURITY_AUTHENTICATION, "simple");
|
||||
// env.put(Context.SECURITY_PRINCIPAL,"cn=root");
|
||||
// env.put(Context.SECURITY_CREDENTIALS,"root");
|
||||
|
||||
// create initial context
|
||||
DirContext context = new InitialDirContext(env);
|
||||
|
||||
// searching
|
||||
SearchControls scs = new SearchControls();
|
||||
scs.setSearchScope(SearchControls.SUBTREE_SCOPE);
|
||||
|
||||
try {
|
||||
NamingEnumeration answer = context.search(
|
||||
"o=sun,c=us", "(&(cn=Bob)))", scs);
|
||||
} catch (InvalidSearchFilterException isfe) {
|
||||
// ignore, it is the expected filter exception.
|
||||
System.out.println("Expected exception: " + isfe.getMessage());
|
||||
} catch (NamingException ne) {
|
||||
// maybe a read timeout exception, as the server does not response.
|
||||
throw new Exception("Expect a InvalidSearchFilterException", ne);
|
||||
}
|
||||
|
||||
try {
|
||||
NamingEnumeration answer = context.search(
|
||||
"o=sun,c=us", ")(&(cn=Bob)", scs);
|
||||
} catch (InvalidSearchFilterException isfe) {
|
||||
// ignore, it is the expected filter exception.
|
||||
System.out.println("Expected exception: " + isfe.getMessage());
|
||||
} catch (NamingException ne) {
|
||||
// maybe a read timeout exception, as the server does not response.
|
||||
throw new Exception("Expect a InvalidSearchFilterException", ne);
|
||||
}
|
||||
|
||||
try {
|
||||
NamingEnumeration answer = context.search(
|
||||
"o=sun,c=us", "(&(cn=Bob))", scs);
|
||||
} catch (InvalidSearchFilterException isfe) {
|
||||
// ignore, it is the expected filter exception.
|
||||
throw new Exception("Unexpected ISFE", isfe);
|
||||
} catch (NamingException ne) {
|
||||
// maybe a read timeout exception, as the server does not response.
|
||||
System.out.println("Expected exception: " + ne.getMessage());
|
||||
}
|
||||
|
||||
context.close();
|
||||
}
|
||||
|
||||
/*
|
||||
* ============================================================
|
||||
* The remainder is just support stuff
|
||||
*/
|
||||
|
||||
// client and server thread
|
||||
Thread clientThread = null;
|
||||
Thread serverThread = null;
|
||||
|
||||
// client and server exceptions
|
||||
volatile Exception serverException = null;
|
||||
volatile Exception clientException = null;
|
||||
|
||||
void startServer(boolean newThread) throws Exception {
|
||||
if (newThread) {
|
||||
serverThread = new Thread() {
|
||||
public void run() {
|
||||
try {
|
||||
doServerSide();
|
||||
} catch (Exception e) {
|
||||
/*
|
||||
* Our server thread just died.
|
||||
*
|
||||
* Release the client, if not active already...
|
||||
*/
|
||||
System.err.println("Server died...");
|
||||
System.err.println(e);
|
||||
serverReady = true;
|
||||
serverException = e;
|
||||
}
|
||||
}
|
||||
};
|
||||
serverThread.start();
|
||||
} else {
|
||||
doServerSide();
|
||||
}
|
||||
}
|
||||
|
||||
void startClient(boolean newThread) throws Exception {
|
||||
if (newThread) {
|
||||
clientThread = new Thread() {
|
||||
public void run() {
|
||||
try {
|
||||
doClientSide();
|
||||
} catch (Exception e) {
|
||||
/*
|
||||
* Our client thread just died.
|
||||
*/
|
||||
System.err.println("Client died...");
|
||||
clientException = e;
|
||||
}
|
||||
}
|
||||
};
|
||||
clientThread.start();
|
||||
} else {
|
||||
doClientSide();
|
||||
}
|
||||
}
|
||||
|
||||
// Primary constructor, used to drive remainder of the test.
|
||||
BalancedParentheses() throws Exception {
|
||||
if (separateServerThread) {
|
||||
startServer(true);
|
||||
startClient(false);
|
||||
} else {
|
||||
startClient(true);
|
||||
startServer(false);
|
||||
}
|
||||
|
||||
/*
|
||||
* Wait for other side to close down.
|
||||
*/
|
||||
if (separateServerThread) {
|
||||
serverThread.join();
|
||||
} else {
|
||||
clientThread.join();
|
||||
}
|
||||
|
||||
/*
|
||||
* When we get here, the test is pretty much over.
|
||||
*
|
||||
* If the main thread excepted, that propagates back
|
||||
* immediately. If the other thread threw an exception, we
|
||||
* should report back.
|
||||
*/
|
||||
if (serverException != null) {
|
||||
System.out.print("Server Exception:");
|
||||
throw serverException;
|
||||
}
|
||||
if (clientException != null) {
|
||||
System.out.print("Client Exception:");
|
||||
throw clientException;
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
// start the test
|
||||
new BalancedParentheses();
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user