Commit d28f3078 by Tom Tromey Committed by Tom Tromey

* java/io/FilePermission.java: Reindented.

From-SVN: r90201
parent 7771b8da
2004-11-06 Tom Tromey <tromey@redhat.com> 2004-11-06 Tom Tromey <tromey@redhat.com>
* java/io/FilePermission.java: Reindented.
2004-11-06 Tom Tromey <tromey@redhat.com>
* java/io/ObjectOutputStream.java (currentObjectStreamClass): Now * java/io/ObjectOutputStream.java (currentObjectStreamClass): Now
package-private. package-private.
(setBlockDataMode): Likewise. (setBlockDataMode): Likewise.
......
...@@ -46,50 +46,51 @@ public final class FilePermission extends Permission implements Serializable ...@@ -46,50 +46,51 @@ public final class FilePermission extends Permission implements Serializable
private static final String CURRENT_DIRECTORY = private static final String CURRENT_DIRECTORY =
System.getProperty("user.dir"); System.getProperty("user.dir");
private boolean readPerm = false; private boolean readPerm = false;
private boolean writePerm = false; private boolean writePerm = false;
private boolean executePerm = false; private boolean executePerm = false;
private boolean deletePerm = false; private boolean deletePerm = false;
private final String actionsString; private final String actionsString;
// Checks and caches the actions // Checks and caches the actions
private void checkPerms() throws IllegalArgumentException private void checkPerms() throws IllegalArgumentException
{ {
String action; String action;
int i = actionsString.indexOf(','); int i = actionsString.indexOf(',');
int startI = 0; int startI = 0;
while(i != -1) while (i != -1)
{ {
action = actionsString.substring(startI,i).trim().toLowerCase(); action = actionsString.substring(startI, i).trim().toLowerCase();
if(action.equals("read")) if (action.equals("read"))
readPerm = true; readPerm = true;
else if(action.equals("write")) else if (action.equals("write"))
writePerm = true; writePerm = true;
else if(action.equals("execute")) else if (action.equals("execute"))
executePerm = true; executePerm = true;
else if(action.equals("delete")) else if (action.equals("delete"))
deletePerm = true; deletePerm = true;
else else
throw new IllegalArgumentException("Unknown action: " + action); throw new IllegalArgumentException("Unknown action: " + action);
startI = i+1; startI = i + 1;
i = actionsString.indexOf(',',startI); i = actionsString.indexOf(',', startI);
} }
action = actionsString.substring(startI).trim().toLowerCase(); action = actionsString.substring(startI).trim().toLowerCase();
if(action.equals("read")) if (action.equals("read"))
readPerm = true; readPerm = true;
else if(action.equals("write")) else if (action.equals("write"))
writePerm = true; writePerm = true;
else if(action.equals("execute")) else if (action.equals("execute"))
executePerm = true; executePerm = true;
else if(action.equals("delete")) else if (action.equals("delete"))
deletePerm = true; deletePerm = true;
else else
throw new IllegalArgumentException("Unknown action: " + action); throw new IllegalArgumentException("Unknown action: " + action);
} }
/* /**
* Create a new FilePermission. * Create a new FilePermission.
* *
* @param pathExpression an expression specifying the paths this * @param pathExpression an expression specifying the paths this
...@@ -97,11 +98,10 @@ public final class FilePermission extends Permission implements Serializable ...@@ -97,11 +98,10 @@ public final class FilePermission extends Permission implements Serializable
* @param actionsString a comma-separated list of the actions this * @param actionsString a comma-separated list of the actions this
* permission represents. The actions must be "read", "write", * permission represents. The actions must be "read", "write",
* "execute" and/or "delete". * "execute" and/or "delete".
*
* FIXME: what to do when the file string is malformed?
*/ */
public FilePermission(String pathExpression, String actionsString) public FilePermission(String pathExpression, String actionsString)
{ {
// FIXME: what to do when the file string is malformed?
super(pathExpression); super(pathExpression);
if (pathExpression == null) if (pathExpression == null)
throw new NullPointerException("pathExpression"); throw new NullPointerException("pathExpression");
...@@ -111,195 +111,179 @@ public final class FilePermission extends Permission implements Serializable ...@@ -111,195 +111,179 @@ public final class FilePermission extends Permission implements Serializable
checkPerms(); checkPerms();
} }
/** Get the actions this FilePermission supports. /**
** @return the String representing the actions this FilePermission supports. * Get the actions this FilePermission supports.
**/ * @return the String representing the actions this FilePermission supports.
*/
public String getActions() public String getActions()
{ {
return actionsString; return actionsString;
} }
/** Get the hash code for this Object.<P> /**
** FilePermission's hash code is calculated as the exclusive or of the * Get the hash code for this Object.<P>
** target * FilePermission's hash code is calculated as the exclusive or of the
** String's hash code and the action String's hash code. * target
** @specnote Sun did not specify how to calculate the hash code; * String's hash code and the action String's hash code.
** I made this up. * @specnote Sun did not specify how to calculate the hash code;
** @return the hash code for this Object. * I made this up.
**/ * @return the hash code for this Object.
*/
public int hashCode() public int hashCode()
{ {
return getName().hashCode() ^ actionsString.hashCode(); return getName().hashCode() ^ actionsString.hashCode();
} }
/** Check two FilePermissions for semantic equality. /**
** Two FilePermissions are exactly equivalent if they have identical path * Check two FilePermissions for semantic equality.
** expressions and have exactly the same access permissions. * Two FilePermissions are exactly equivalent if they have identical path
** @param o the Object to compare to. * expressions and have exactly the same access permissions.
** @return whether the Objects are semantically equivalent. * @param o the Object to compare to.
**/ * @return whether the Objects are semantically equivalent.
*/
public boolean equals(Object o) public boolean equals(Object o)
{ {
if(!(o instanceof FilePermission)) if (! (o instanceof FilePermission))
return false; return false;
FilePermission p = (FilePermission)o; FilePermission p = (FilePermission) o;
String f1 = getName(); String f1 = getName();
String f2 = p.getName(); String f2 = p.getName();
/* Compare names, taking into account if they refer to a // Compare names, taking into account if they refer to a directory
* directory and one has a separator and the other does not. // and one has a separator and the other does not.
*/ if (f1.length() > 0 && f1.charAt(f1.length() - 1) == File.separatorChar)
if(f1.length() > 0 && f1.charAt(f1.length() - 1) == File.separatorChar)
{ {
if(f2.length() > 0 if (f2.length() > 0
&& f2.charAt(f2.length() - 1) == File.separatorChar) && f2.charAt(f2.length() - 1) == File.separatorChar)
{ {
if(!f2.equals(f1)) if (! f2.equals(f1))
return false; return false;
} }
else else
{ {
if(!f2.equals(f1.substring(0,f1.length()-1))) if (! f2.equals(f1.substring(0, f1.length() - 1)))
return false; return false;
} }
} }
else else
{ {
if(f2.length() > 0 if (f2.length() > 0
&& f2.charAt(f2.length() - 1) == File.separatorChar) && f2.charAt(f2.length() - 1) == File.separatorChar)
{ {
if(!f1.equals(f2.substring(0,f2.length()-1))) if (! f1.equals(f2.substring(0, f2.length() - 1)))
return false; return false;
} }
else else
{ {
if(!f1.equals(f2)) if (! f1.equals(f2))
return false; return false;
} }
} }
return readPerm == p.readPerm && writePerm == p.writePerm && executePerm == p.executePerm && deletePerm == p.deletePerm; return (readPerm == p.readPerm
&& writePerm == p.writePerm
&& executePerm == p.executePerm
&& deletePerm == p.deletePerm);
} }
/** Check to see if this permission implies another. /**
** Permission A implies permission B if these things are all true: * Check to see if this permission implies another.
** <OL> * Permission A implies permission B if these things are all true:
** <LI>A and B are both FilePermissions.</LI> * <OL>
** <LI>All possible files in B are included in A * <LI>A and B are both FilePermissions.</LI>
** (possibly more are in A).</LI> * <LI>All possible files in B are included in A
** <LI>All actions B supports, A also supports.</LI> * (possibly more are in A).</LI>
** </OL> * <LI>All actions B supports, A also supports.</LI>
** @param p the Permission to compare against. * </OL>
** @return whether this Permission implies p * @param p the Permission to compare against.
**/ * @return whether this Permission implies p
*/
public boolean implies(Permission p) public boolean implies(Permission p)
{ {
FilePermission fp; FilePermission fp;
if(!(p instanceof FilePermission)) if (! (p instanceof FilePermission))
return false; return false;
fp = (FilePermission)p; fp = (FilePermission) p;
String f1 = getName(); String f1 = getName();
String f2 = fp.getName(); String f2 = fp.getName();
if(f1.charAt(0) != File.separatorChar) if (f1.charAt(0) != File.separatorChar)
{ f1 = CURRENT_DIRECTORY + f1;
f1 = CURRENT_DIRECTORY + f1; if (f2.charAt(0) != File.separatorChar)
} f2 = CURRENT_DIRECTORY + f2;
if(f2.charAt(0) != File.separatorChar)
{
f2 = CURRENT_DIRECTORY + f2;
}
String sub1; String sub1;
switch(f1.charAt(f1.length() - 1)) switch (f1.charAt(f1.length() - 1))
{ {
case '*': case '*':
sub1 = f1.substring(0,f1.length() - 1); // chop off "*" sub1 = f1.substring(0, f1.length() - 1); // chop off "*"
if(f2.length() <= sub1.length()) if (f2.length() <= sub1.length())
{ {
/* If it's smaller, there is no way it could be part of this // If it's smaller, there is no way it could be part of
* directory. // this directory. If it's the same (or length - 1), it
* If it's the same (or length - 1), it could be the same // could be the same directory but specifies access to
* directory but // the directory rather than the files in it.
* specifies access to the directory rather than the files in it. return false;
*/ }
return false; else if (f2.charAt(sub1.length() - 1) == File.separatorChar)
} {
else if(f2.charAt(sub1.length() - 1) == File.separatorChar) // Make sure the part before the "/" is the same.
{ if (! f2.substring(0, sub1.length()).equals(sub1))
/* Make sure the part before the "/" is the same */
if(!f2.substring(0,sub1.length()).equals(sub1))
return false;
/* Make sure there are no subdirectories specified
underneath this one */
if(f2.substring(sub1.length()+1).indexOf(File.separatorChar)
!= -1)
return false;
}
else
{
/* Obviously not equal: f2 is either not a directory or is not
* the same directory (its name continues further than we want)
*/
return false;
}
break;
case '-':
sub1 = f1.substring(0,f1.length() - 2); // chop off "/-"
if(f2.length() < sub1.length())
{
/* If it's smaller, there is no way it could be part of
* this directory. */
return false; return false;
} // Make sure there are no subdirectories specified
else if(f2.length() > sub1.length() && f2.charAt(sub1.length()) // underneath this one.
!= File.separatorChar) if (f2.substring(sub1.length() + 1).indexOf(File.separatorChar)
{ != -1)
return false; return false;
}
} else
else if(!f2.substring(0,sub1.length()).equals(sub1)) {
// Obviously not equal: f2 is either not a directory or
// is not the same directory (its name continues further
// than we want).
return false;
}
break;
case '-':
// Chop off "/-".
sub1 = f1.substring(0, f1.length() - 2);
if (f2.length() < sub1.length())
{
// If it's smaller, there is no way it could be part of
// this directory.
return false; return false;
break; }
/* Looks redundant with default case and won't compile anyway - arenn else if (f2.length() > sub1.length()
case File.separatorChar: && f2.charAt(sub1.length()) != File.separatorChar)
if(f2.charAt(f2.length()) == File.separatorChar) {
if(!f2.equals(f1))
return false; return false;
} else { else if (! f2.substring(0, sub1.length()).equals(sub1))
if(!f2.equals(f1.substring(0,f1.length()-1)))
return false; return false;
break;
default:
if (f2.charAt(f2.length() - 1) == File.separatorChar)
{
if (! f1.equals(f2.substring(0, f2.length() - 1)))
return false;
}
else if (!f1.equals(f2))
return false;
break;
} }
break;
*/ if (readPerm && ! fp.readPerm)
default:
if(f2.charAt(f2.length() - 1) == File.separatorChar)
{
if(!f1.equals(f2.substring(0,f2.length() - 1)))
return false;
}
else
{
if(!f1.equals(f2))
return false;
}
break;
}
if(readPerm && !fp.readPerm)
return false; return false;
if(writePerm && !fp.writePerm) if (writePerm && ! fp.writePerm)
return false; return false;
if(executePerm && !fp.executePerm) if (executePerm && ! fp.executePerm)
return false; return false;
if(deletePerm && !fp.deletePerm) if (deletePerm && ! fp.deletePerm)
return false; return false;
return true; return true;
} }
} // class FilePermission }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment