archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8230407: SocketPermission and FilePermission action list allows leading comma

Browse source 
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Reviewed-by: chegar
This commit is contained in:
Ivan Gerasimov 2019-10-16 14:32:17 -07:00
parent 7e6ebde13c
commit 31afddccae
4 changed files with 94 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/java.base/share/classes/java/io/FilePermission.java
View file

@ -480,9 +480,9 @@ public final class FilePermission extends Permission implements Serializable {
* @param path the pathname of the file/directory. * @param path the pathname of the file/directory.
* @param actions the action string. * @param actions the action string.
* *
* @throws IllegalArgumentException * @throws IllegalArgumentException if actions is {@code null}, empty,
* If actions is {@code null}, empty or contains an action * malformed or contains an action other than the specified
* other than the specified possible actions. * possible actions
*/ */
public FilePermission(String path, String actions) { public FilePermission(String path, String actions) {
super(path); super(path);
@ -935,17 +935,18 @@ public final class FilePermission extends Permission implements Serializable {
} }
// make sure we didn't just match the tail of a word // make sure we didn't just match the tail of a word
// like "ackbarfaccept". Also, skip to the comma. // like "ackbarfdelete". Also, skip to the comma.
boolean seencomma = false; boolean seencomma = false;
while (i >= matchlen && !seencomma) { while (i >= matchlen && !seencomma) {
switch(a[i-matchlen]) { switch (c = a[i-matchlen]) {
case ',':
seencomma = true;
break;
case ' ': case '\r': case '\n': case ' ': case '\r': case '\n':
case '\f': case '\t': case '\f': case '\t':
break; break;
default: default:
if (c == ',' && i > matchlen) {
seencomma = true;
break;
}
throw new IllegalArgumentException( throw new IllegalArgumentException(
"invalid permission: " + actions); "invalid permission: " + actions);
} }
@ -1141,10 +1142,10 @@ final class FilePermissionCollection extends PermissionCollection
* *
* @param permission the Permission object to add. * @param permission the Permission object to add.
* *
* @throws IllegalArgumentException - if the permission is not a * @throws IllegalArgumentException if the permission is not a
* FilePermission * FilePermission
* *
* @throws SecurityException - if this FilePermissionCollection object * @throws SecurityException if this FilePermissionCollection object
* has been marked readonly * has been marked readonly
*/ */
@Override @Override

14
src/java.base/share/classes/java/net/SocketPermission.java
View file

@ -287,6 +287,11 @@ public final class SocketPermission extends Permission
* @param host the hostname or IP address of the computer, optionally * @param host the hostname or IP address of the computer, optionally
* including a colon followed by a port or port range. * including a colon followed by a port or port range.
* @param action the action string. * @param action the action string.
*
* @throws NullPointerException if any parameters are null
* @throws IllegalArgumentException if the format of {@code host} is
* invalid, or if the {@code action} string is empty, malformed, or
* contains an action other than the specified possible actions
*/ */
public SocketPermission(String host, String action) { public SocketPermission(String host, String action) {
super(getHost(host)); super(getHost(host));
@ -589,14 +594,15 @@ public final class SocketPermission extends Permission
// like "ackbarfaccept". Also, skip to the comma. // like "ackbarfaccept". Also, skip to the comma.
boolean seencomma = false; boolean seencomma = false;
while (i >= matchlen && !seencomma) { while (i >= matchlen && !seencomma) {
switch(a[i-matchlen]) { switch (c = a[i-matchlen]) {
case ',':
seencomma = true;
break;
case ' ': case '\r': case '\n': case ' ': case '\r': case '\n':
case '\f': case '\t': case '\f': case '\t':
break; break;
default: default:
if (c == ',' && i > matchlen) {
seencomma = true;
break;
}
throw new IllegalArgumentException( throw new IllegalArgumentException(
"invalid permission: " + action); "invalid permission: " + action);
} }

32
test/jdk/java/io/FilePermission/SpecTests.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -22,11 +22,10 @@
*/ */
/** /**
*
* @test * @test
* @bug 4955804 * @bug 4955804 8230407
* @summary Tests for FilePermission constructor spec for null * @summary Tests for FilePermission constructor spec for null,
* and empty String parameters * empty and misformated String parameters
*/ */
import java.io.*; import java.io.*;
@ -37,10 +36,11 @@ public class SpecTests {
String ILE = "java.lang.IllegalArgumentException"; String ILE = "java.lang.IllegalArgumentException";
String NPE = "java.lang.NullPointerException"; String NPE = "java.lang.NullPointerException";
String names[] = {"", null, "foo", "foo", "foo", "foo"}; String names[] = {"", null, "foo", "foo", "foo", "foo", "foo"};
String actions[] = {"read", "read", "", null, "junk", String actions[] = {"read", "read", "", null, "junk",
"read,write,execute,delete,rename"}; "read,write,execute,delete,rename",
String exps[] = { null, NPE, ILE, ILE, ILE, ILE }; ",read"};
String exps[] = { null, NPE, ILE, ILE, ILE, ILE, ILE };
FilePermission permit; FilePermission permit;
for (int i = 0; i < names.length; i++) { for (int i = 0; i < names.length; i++) {
@ -54,15 +54,19 @@ public class SpecTests {
" for name:" + names[i] + " for name:" + names[i] +
" actions:" + actions[i]); " actions:" + actions[i]);
} else { } else {
System.out.println(names[i] + ", [" + actions[i] + "] " + System.out.println(names[i] + ", [" + actions[i] + "] " +
"resulted in " + exps[i] + " as Expected"); "resulted in " + exps[i] + " as Expected");
continue;
} }
} }
if (exps[i] == null) { if (exps[i] == null) {
System.out.println(names[i] + ", [" + actions[i] + "] " + System.out.println(names[i] + ", [" + actions[i] + "] " +
"resulted in No Exception as Expected"); "resulted in No Exception as Expected");
} else {
throw new Exception("Expecting: " + exps[i] +
" for name:" + names[i] +
" actions:" + actions[i]);
} }
} }
} }
} }

65
test/jdk/java/net/SocketPermission/Ctor.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,19 +23,64 @@
/* /*
* @test * @test
* @bug 4391898 * @bug 4391898 8230407
* @summary SocketPermission(":",...) throws ArrayIndexOutOfBoundsException * @summary SocketPermission(":",...) throws ArrayIndexOutOfBoundsException
* SocketPermission constructor argument checks
* @run testng Ctor
*/ */
import java.net.*; import java.net.SocketPermission;
import org.testng.annotations.Test;
import static java.lang.System.out;
import static org.testng.Assert.*;
public class Ctor { public class Ctor {
public static void main(String[] args) {
try { static final Class<NullPointerException> NPE = NullPointerException.class;
SocketPermission sp = new java.net.SocketPermission(":", "connect"); static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
} catch (java.lang.ArrayIndexOutOfBoundsException e) {
throw new RuntimeException(e); @Test
} public void positive() {
System.out.println("Test passed!!!"); // ArrayIndexOutOfBoundsException is the bug, 4391898, exists
SocketPermission sp1 = new SocketPermission(":", "connect");
}
@Test
public void npe() {
NullPointerException e;
e = expectThrows(NPE, () -> new SocketPermission(null, null));
out.println("caught expected NPE: " + e);
e = expectThrows(NPE, () -> new SocketPermission("foo", null));
out.println("caught expected NPE: " + e);
e = expectThrows(NPE, () -> new SocketPermission(null, "connect"));
out.println("caught expected NPE: " + e);
}
@Test
public void iae() {
IllegalArgumentException e;
// host
e = expectThrows(IAE, () -> new SocketPermission("1:2:3:4", "connect"));
out.println("caught expected IAE: " + e);
e = expectThrows(IAE, () -> new SocketPermission("foo:5-4", "connect"));
out.println("caught expected IAE: " + e);
// actions
e = expectThrows(IAE, () -> new SocketPermission("foo", ""));
out.println("caught expected IAE: " + e);
e = expectThrows(IAE, () -> new SocketPermission("foo", "badAction"));
out.println("caught expected IAE: " + e);
e = expectThrows(IAE, () -> new SocketPermission("foo", "badAction,connect"));
out.println("caught expected IAE: " + e);
e = expectThrows(IAE, () -> new SocketPermission("foo", "badAction,,connect"));
out.println("caught expected IAE: " + e);
e = expectThrows(IAE, () -> new SocketPermission("foo", ",connect"));
out.println("caught expected IAE: " + e);
e = expectThrows(IAE, () -> new SocketPermission("foo", ",,connect"));
out.println("caught expected IAE: " + e);
e = expectThrows(IAE, () -> new SocketPermission("foo", "connect,"));
out.println("caught expected IAE: " + e);
e = expectThrows(IAE, () -> new SocketPermission("foo", "connect,,"));
out.println("caught expected IAE: " + e);
} }
} }