16 |
|
|
17 |
|
public class ExecutorsTest extends JSR166TestCase { |
18 |
|
public static void main(String[] args) { |
19 |
< |
junit.textui.TestRunner.run (suite()); |
19 |
> |
junit.textui.TestRunner.run(suite()); |
20 |
|
} |
21 |
|
public static Test suite() { |
22 |
|
return new TestSuite(ExecutorsTest.class); |
258 |
|
*/ |
259 |
|
public void testDefaultThreadFactory() throws Exception { |
260 |
|
final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); |
261 |
< |
Runnable r = new Runnable() { |
262 |
< |
public void run() { |
263 |
< |
try { |
264 |
< |
Thread current = Thread.currentThread(); |
265 |
< |
threadAssertTrue(!current.isDaemon()); |
266 |
< |
threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
267 |
< |
ThreadGroup g = current.getThreadGroup(); |
268 |
< |
SecurityManager s = System.getSecurityManager(); |
269 |
< |
if (s != null) |
270 |
< |
threadAssertTrue(g == s.getThreadGroup()); |
271 |
< |
else |
272 |
< |
threadAssertTrue(g == egroup); |
273 |
< |
String name = current.getName(); |
274 |
< |
threadAssertTrue(name.endsWith("thread-1")); |
275 |
< |
} catch (SecurityException ok) { |
276 |
< |
// Also pass if not allowed to change setting |
277 |
< |
} |
261 |
> |
Runnable r = new CheckedRunnable() { |
262 |
> |
public void realRun() { |
263 |
> |
try { |
264 |
> |
Thread current = Thread.currentThread(); |
265 |
> |
assertTrue(!current.isDaemon()); |
266 |
> |
assertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
267 |
> |
ThreadGroup g = current.getThreadGroup(); |
268 |
> |
SecurityManager s = System.getSecurityManager(); |
269 |
> |
if (s != null) |
270 |
> |
assertTrue(g == s.getThreadGroup()); |
271 |
> |
else |
272 |
> |
assertTrue(g == egroup); |
273 |
> |
String name = current.getName(); |
274 |
> |
assertTrue(name.endsWith("thread-1")); |
275 |
> |
} catch (SecurityException ok) { |
276 |
> |
// Also pass if not allowed to change setting |
277 |
|
} |
278 |
< |
}; |
278 |
> |
}}; |
279 |
|
ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory()); |
280 |
|
|
281 |
|
e.execute(r); |
297 |
|
* access control context and context class loader |
298 |
|
*/ |
299 |
|
public void testPrivilegedThreadFactory() throws Exception { |
300 |
< |
Policy savedPolicy = null; |
301 |
< |
try { |
302 |
< |
savedPolicy = Policy.getPolicy(); |
303 |
< |
AdjustablePolicy policy = new AdjustablePolicy(); |
304 |
< |
policy.addPermission(new RuntimePermission("getContextClassLoader")); |
305 |
< |
policy.addPermission(new RuntimePermission("setContextClassLoader")); |
306 |
< |
Policy.setPolicy(policy); |
308 |
< |
} catch (AccessControlException ok) { |
309 |
< |
return; |
310 |
< |
} |
311 |
< |
final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); |
312 |
< |
final ClassLoader thisccl = Thread.currentThread().getContextClassLoader(); |
313 |
< |
final AccessControlContext thisacc = AccessController.getContext(); |
314 |
< |
Runnable r = new Runnable() { |
315 |
< |
public void run() { |
316 |
< |
try { |
300 |
> |
Runnable r = new CheckedRunnable() { |
301 |
> |
public void realRun() throws Exception { |
302 |
> |
final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); |
303 |
> |
final ClassLoader thisccl = Thread.currentThread().getContextClassLoader(); |
304 |
> |
final AccessControlContext thisacc = AccessController.getContext(); |
305 |
> |
Runnable r = new CheckedRunnable() { |
306 |
> |
public void realRun() { |
307 |
|
Thread current = Thread.currentThread(); |
308 |
< |
threadAssertTrue(!current.isDaemon()); |
309 |
< |
threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
308 |
> |
assertTrue(!current.isDaemon()); |
309 |
> |
assertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
310 |
|
ThreadGroup g = current.getThreadGroup(); |
311 |
|
SecurityManager s = System.getSecurityManager(); |
312 |
|
if (s != null) |
313 |
< |
threadAssertTrue(g == s.getThreadGroup()); |
313 |
> |
assertTrue(g == s.getThreadGroup()); |
314 |
|
else |
315 |
< |
threadAssertTrue(g == egroup); |
315 |
> |
assertTrue(g == egroup); |
316 |
|
String name = current.getName(); |
317 |
< |
threadAssertTrue(name.endsWith("thread-1")); |
318 |
< |
threadAssertTrue(thisccl == current.getContextClassLoader()); |
319 |
< |
threadAssertTrue(thisacc.equals(AccessController.getContext())); |
320 |
< |
} catch (SecurityException ok) { |
321 |
< |
// Also pass if not allowed to change settings |
322 |
< |
} |
323 |
< |
} |
324 |
< |
}; |
325 |
< |
ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory()); |
317 |
> |
assertTrue(name.endsWith("thread-1")); |
318 |
> |
assertSame(thisccl, current.getContextClassLoader()); |
319 |
> |
assertEquals(thisacc, AccessController.getContext()); |
320 |
> |
}}; |
321 |
> |
ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory()); |
322 |
> |
e.execute(r); |
323 |
> |
e.shutdown(); |
324 |
> |
Thread.sleep(SHORT_DELAY_MS); |
325 |
> |
joinPool(e); |
326 |
> |
}}; |
327 |
> |
|
328 |
> |
runWithPermissions(r, |
329 |
> |
new RuntimePermission("getClassLoader"), |
330 |
> |
new RuntimePermission("setContextClassLoader"), |
331 |
> |
new RuntimePermission("modifyThread")); |
332 |
> |
} |
333 |
|
|
334 |
< |
Policy.setPolicy(savedPolicy); |
335 |
< |
e.execute(r); |
336 |
< |
try { |
337 |
< |
e.shutdown(); |
338 |
< |
} catch (SecurityException ok) { |
339 |
< |
} |
340 |
< |
try { |
341 |
< |
Thread.sleep(SHORT_DELAY_MS); |
342 |
< |
} finally { |
346 |
< |
joinPool(e); |
334 |
> |
boolean haveCCLPermissions() { |
335 |
> |
SecurityManager sm = System.getSecurityManager(); |
336 |
> |
if (sm != null) { |
337 |
> |
try { |
338 |
> |
sm.checkPermission(new RuntimePermission("setContextClassLoader")); |
339 |
> |
sm.checkPermission(new RuntimePermission("getClassLoader")); |
340 |
> |
} catch (AccessControlException e) { |
341 |
> |
return false; |
342 |
> |
} |
343 |
|
} |
344 |
+ |
return true; |
345 |
|
} |
346 |
|
|
347 |
|
void checkCCL() { |
365 |
|
* privilegedCallableUsingCurrentClassLoader throws ACE |
366 |
|
*/ |
367 |
|
public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() { |
368 |
< |
Policy savedPolicy = null; |
369 |
< |
try { |
370 |
< |
savedPolicy = Policy.getPolicy(); |
371 |
< |
AdjustablePolicy policy = new AdjustablePolicy(); |
372 |
< |
Policy.setPolicy(policy); |
373 |
< |
} catch (AccessControlException ok) { |
374 |
< |
return; |
375 |
< |
} |
376 |
< |
|
380 |
< |
// Check if program still has too many permissions to run test |
381 |
< |
try { |
382 |
< |
checkCCL(); |
383 |
< |
// too many privileges to test; so return |
384 |
< |
Policy.setPolicy(savedPolicy); |
385 |
< |
return; |
386 |
< |
} catch (AccessControlException ok) { |
387 |
< |
} |
368 |
> |
Runnable r = new CheckedRunnable() { |
369 |
> |
public void realRun() throws Exception { |
370 |
> |
if (System.getSecurityManager() == null) |
371 |
> |
return; |
372 |
> |
try { |
373 |
> |
Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); |
374 |
> |
shouldThrow(); |
375 |
> |
} catch (AccessControlException success) {} |
376 |
> |
}}; |
377 |
|
|
378 |
< |
try { |
390 |
< |
Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); |
391 |
< |
shouldThrow(); |
392 |
< |
} catch (AccessControlException success) { |
393 |
< |
} finally { |
394 |
< |
Policy.setPolicy(savedPolicy); |
395 |
< |
} |
378 |
> |
runWithoutPermissions(r); |
379 |
|
} |
380 |
|
|
381 |
|
/** |
383 |
|
* privilegedCallableUsingCurrentClassLoader does not throw ACE |
384 |
|
*/ |
385 |
|
public void testprivilegedCallableUsingCCLWithPrivs() throws Exception { |
386 |
< |
Policy savedPolicy = null; |
387 |
< |
try { |
388 |
< |
savedPolicy = Policy.getPolicy(); |
389 |
< |
AdjustablePolicy policy = new AdjustablePolicy(); |
390 |
< |
policy.addPermission(new RuntimePermission("getContextClassLoader")); |
391 |
< |
policy.addPermission(new RuntimePermission("setContextClassLoader")); |
392 |
< |
Policy.setPolicy(policy); |
393 |
< |
} catch (AccessControlException ok) { |
394 |
< |
return; |
395 |
< |
} |
413 |
< |
|
414 |
< |
try { |
415 |
< |
Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); |
416 |
< |
task.call(); |
417 |
< |
} |
418 |
< |
finally { |
419 |
< |
Policy.setPolicy(savedPolicy); |
420 |
< |
} |
386 |
> |
Runnable r = new CheckedRunnable() { |
387 |
> |
public void realRun() throws Exception { |
388 |
> |
Executors.privilegedCallableUsingCurrentClassLoader |
389 |
> |
(new NoOpCallable()) |
390 |
> |
.call(); |
391 |
> |
}}; |
392 |
> |
|
393 |
> |
runWithPermissions(r, |
394 |
> |
new RuntimePermission("getClassLoader"), |
395 |
> |
new RuntimePermission("setContextClassLoader")); |
396 |
|
} |
397 |
|
|
398 |
|
/** |
399 |
|
* Without permissions, calling privilegedCallable throws ACE |
400 |
|
*/ |
401 |
|
public void testprivilegedCallableWithNoPrivs() throws Exception { |
402 |
< |
Callable task; |
403 |
< |
Policy savedPolicy = null; |
429 |
< |
AdjustablePolicy policy = null; |
430 |
< |
AccessControlContext noprivAcc = null; |
431 |
< |
try { |
432 |
< |
savedPolicy = Policy.getPolicy(); |
433 |
< |
policy = new AdjustablePolicy(); |
434 |
< |
Policy.setPolicy(policy); |
435 |
< |
noprivAcc = AccessController.getContext(); |
436 |
< |
task = Executors.privilegedCallable(new CheckCCL()); |
437 |
< |
Policy.setPolicy(savedPolicy); |
438 |
< |
} catch (AccessControlException ok) { |
439 |
< |
return; // program has too few permissions to set up test |
440 |
< |
} |
402 |
> |
// Avoid classloader-related SecurityExceptions in swingui.TestRunner |
403 |
> |
Executors.privilegedCallable(new CheckCCL()); |
404 |
|
|
405 |
< |
// Make sure that program doesn't have too many permissions |
406 |
< |
try { |
407 |
< |
AccessController.doPrivileged(new PrivilegedAction() { |
408 |
< |
public Object run() { |
409 |
< |
checkCCL(); |
410 |
< |
return null; |
411 |
< |
}}, noprivAcc); |
412 |
< |
// too many permssions; skip test |
413 |
< |
return; |
414 |
< |
} catch (AccessControlException ok) { |
452 |
< |
} |
405 |
> |
Runnable r = new CheckedRunnable() { |
406 |
> |
public void realRun() throws Exception { |
407 |
> |
if (System.getSecurityManager() == null) |
408 |
> |
return; |
409 |
> |
Callable task = Executors.privilegedCallable(new CheckCCL()); |
410 |
> |
try { |
411 |
> |
task.call(); |
412 |
> |
shouldThrow(); |
413 |
> |
} catch (AccessControlException success) {} |
414 |
> |
}}; |
415 |
|
|
416 |
< |
try { |
417 |
< |
task.call(); |
418 |
< |
shouldThrow(); |
419 |
< |
} catch (AccessControlException success) {} |
416 |
> |
runWithoutPermissions(r); |
417 |
> |
|
418 |
> |
// It seems rather difficult to test that the |
419 |
> |
// AccessControlContext of the privilegedCallable is used |
420 |
> |
// instead of its caller. Below is a failed attempt to do |
421 |
> |
// that, which does not work because the AccessController |
422 |
> |
// cannot capture the internal state of the current Policy. |
423 |
> |
// It would be much more work to differentiate based on, |
424 |
> |
// e.g. CodeSource. |
425 |
> |
|
426 |
> |
// final AccessControlContext[] noprivAcc = new AccessControlContext[1]; |
427 |
> |
// final Callable[] task = new Callable[1]; |
428 |
> |
|
429 |
> |
// runWithPermissions |
430 |
> |
// (new CheckedRunnable() { |
431 |
> |
// public void realRun() { |
432 |
> |
// if (System.getSecurityManager() == null) |
433 |
> |
// return; |
434 |
> |
// noprivAcc[0] = AccessController.getContext(); |
435 |
> |
// task[0] = Executors.privilegedCallable(new CheckCCL()); |
436 |
> |
// try { |
437 |
> |
// AccessController.doPrivileged(new PrivilegedAction<Void>() { |
438 |
> |
// public Void run() { |
439 |
> |
// checkCCL(); |
440 |
> |
// return null; |
441 |
> |
// }}, noprivAcc[0]); |
442 |
> |
// shouldThrow(); |
443 |
> |
// } catch (AccessControlException success) {} |
444 |
> |
// }}); |
445 |
> |
|
446 |
> |
// runWithPermissions |
447 |
> |
// (new CheckedRunnable() { |
448 |
> |
// public void realRun() throws Exception { |
449 |
> |
// if (System.getSecurityManager() == null) |
450 |
> |
// return; |
451 |
> |
// // Verify that we have an underprivileged ACC |
452 |
> |
// try { |
453 |
> |
// AccessController.doPrivileged(new PrivilegedAction<Void>() { |
454 |
> |
// public Void run() { |
455 |
> |
// checkCCL(); |
456 |
> |
// return null; |
457 |
> |
// }}, noprivAcc[0]); |
458 |
> |
// shouldThrow(); |
459 |
> |
// } catch (AccessControlException success) {} |
460 |
> |
|
461 |
> |
// try { |
462 |
> |
// task[0].call(); |
463 |
> |
// shouldThrow(); |
464 |
> |
// } catch (AccessControlException success) {} |
465 |
> |
// }}, |
466 |
> |
// new RuntimePermission("getClassLoader"), |
467 |
> |
// new RuntimePermission("setContextClassLoader")); |
468 |
|
} |
469 |
|
|
470 |
|
/** |
471 |
|
* With permissions, calling privilegedCallable succeeds |
472 |
|
*/ |
473 |
|
public void testprivilegedCallableWithPrivs() throws Exception { |
474 |
< |
Policy savedPolicy = null; |
475 |
< |
try { |
476 |
< |
savedPolicy = Policy.getPolicy(); |
477 |
< |
AdjustablePolicy policy = new AdjustablePolicy(); |
478 |
< |
policy.addPermission(new RuntimePermission("getContextClassLoader")); |
479 |
< |
policy.addPermission(new RuntimePermission("setContextClassLoader")); |
480 |
< |
Policy.setPolicy(policy); |
481 |
< |
} catch (AccessControlException ok) { |
472 |
< |
return; |
473 |
< |
} |
474 |
< |
|
475 |
< |
Callable task = Executors.privilegedCallable(new CheckCCL()); |
476 |
< |
try { |
477 |
< |
task.call(); |
478 |
< |
} finally { |
479 |
< |
Policy.setPolicy(savedPolicy); |
480 |
< |
} |
474 |
> |
Runnable r = new CheckedRunnable() { |
475 |
> |
public void realRun() throws Exception { |
476 |
> |
Executors.privilegedCallable(new CheckCCL()).call(); |
477 |
> |
}}; |
478 |
> |
|
479 |
> |
runWithPermissions(r, |
480 |
> |
new RuntimePermission("getClassLoader"), |
481 |
> |
new RuntimePermission("setContextClassLoader")); |
482 |
|
} |
483 |
|
|
484 |
|
/** |