diff options
Diffstat (limited to 'libjava/java/io')
| -rw-r--r-- | libjava/java/io/File.h | 12 | ||||
| -rw-r--r-- | libjava/java/io/File.java | 184 | ||||
| -rw-r--r-- | libjava/java/io/ObjectInputStream.h | 12 | ||||
| -rw-r--r-- | libjava/java/io/ObjectOutputStream.h | 3 | ||||
| -rw-r--r-- | libjava/java/io/natFilePosix.cc | 55 | ||||
| -rw-r--r-- | libjava/java/io/natFileWin32.cc | 25 |
6 files changed, 283 insertions, 8 deletions
diff --git a/libjava/java/io/File.h b/libjava/java/io/File.h index 35ca3b7..92cfbb7 100644 --- a/libjava/java/io/File.h +++ b/libjava/java/io/File.h @@ -31,6 +31,7 @@ class java::io::File : public ::java::lang::Object public: virtual jboolean canRead(); virtual jboolean canWrite(); + virtual jboolean canExecute(); private: jboolean performCreate(); public: @@ -93,6 +94,15 @@ private: public: static ::java::io::File * createTempFile(::java::lang::String *, ::java::lang::String *, ::java::io::File *); private: + jboolean setFilePermissions(jboolean, jboolean, jint); +public: + virtual jboolean setReadable(jboolean); + virtual jboolean setReadable(jboolean, jboolean); + virtual jboolean setWritable(jboolean); + virtual jboolean setWritable(jboolean, jboolean); + virtual jboolean setExecutable(jboolean); + virtual jboolean setExecutable(jboolean, jboolean); +private: jboolean performSetReadOnly(); public: virtual jboolean setReadOnly(); @@ -114,6 +124,7 @@ public: private: void checkWrite(); void checkRead(); + void checkExec(); public: virtual void deleteOnExit(); private: @@ -123,6 +134,7 @@ private: static const jint READ = 0; static const jint WRITE = 1; static const jint EXISTS = 2; + static const jint EXEC = 3; static const jint DIRECTORY = 0; static const jint ISFILE = 1; static const jint ISHIDDEN = 2; diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java index 33776ab..0026ffa 100644 --- a/libjava/java/io/File.java +++ b/libjava/java/io/File.java @@ -67,6 +67,7 @@ public class File implements Serializable, Comparable private final static int READ = 0; private final static int WRITE = 1; private final static int EXISTS = 2; + private final static int EXEC = 3; // QUERY arguments to stat function. private final static int DIRECTORY = 0; @@ -182,6 +183,27 @@ public class File implements Serializable, Comparable return _access (WRITE); } + /** + * This method tests whether or not the current thread is allowed to + * to execute the file pointed to by this object. This will be true if and + * and only if 1) the file exists and 2) the <code>SecurityManager</code> + * (if any) allows access to the file via it's <code>checkExec</code> + * method 3) the file is executable. + * + * @return <code>true</code> if execution is allowed, + * <code>false</code> otherwise + * + * @exception SecurityException If the <code>SecurityManager</code> + * does not allow access to the file + */ + public boolean canExecute() + { + if (!exists()) + return false; + checkExec(); + return _access (EXEC); + } + private native boolean performCreate() throws IOException; /** @@ -1139,6 +1161,159 @@ public class File implements Serializable, Comparable } /* + * This native method sets file permissions. + */ + private native boolean setFilePermissions(boolean enable, boolean ownerOnly, + int permissions); + + /** + * This method sets the owner's read permission for the File represented by + * this object. + * + * It is the same as calling <code>setReadable(readable, true)</code>. + * + * @param <code>readable</code> <code>true</code> to set read permission, + * <code>false</code> to unset the read permission. + * @return <code>true</code> if the file permissions are changed, + * <code>false</code> otherwise. + * @exception SecurityException If write access of the file is not permitted. + * @see #setReadable(boolean, boolean) + * @since 1.6 + */ + public boolean setReadable(boolean readable) + { + return setReadable(readable, true); + } + + /** + * This method sets the read permissions for the File represented by + * this object. + * + * If <code>ownerOnly</code> is set to <code>true</code> then only the + * read permission bit for the owner of the file is changed. + * + * If <code>ownerOnly</code> is set to <code>false</code>, the file + * permissions are changed so that the file can be read by everyone. + * + * On unix like systems this sets the <code>user</code>, <code>group</code> + * and <code>other</code> read bits and is equal to call + * <code>chmod a+r</code> on the file. + * + * @param <code>readable</code> <code>true</code> to set read permission, + * <code>false</code> to unset the read permission. + * @param <code>ownerOnly</code> <code>true</code> to set read permission + * for owner only, <code>false</code> for all. + * @return <code>true</code> if the file permissions are changed, + * <code>false</code> otherwise. + * @exception SecurityException If write access of the file is not permitted. + * @see #setReadable(boolean) + * @since 1.6 + */ + public boolean setReadable(boolean readable, boolean ownerOnly) + { + checkWrite(); + return setFilePermissions(readable, ownerOnly, READ); + } + + /** + * This method sets the owner's write permission for the File represented by + * this object. + * + * It is the same as calling <code>setWritable(readable, true)</code>. + * + * @param <code>writable</code> <code>true</code> to set write permission, + * <code>false</code> to unset write permission. + * @return <code>true</code> if the file permissions are changed, + * <code>false</code> otherwise. + * @exception SecurityException If write access of the file is not permitted. + * @see #setWritable(boolean, boolean) + * @since 1.6 + */ + public boolean setWritable(boolean writable) + { + return setWritable(writable, true); + } + + /** + * This method sets the write permissions for the File represented by + * this object. + * + * If <code>ownerOnly</code> is set to <code>true</code> then only the + * write permission bit for the owner of the file is changed. + * + * If <code>ownerOnly</code> is set to <code>false</code>, the file + * permissions are changed so that the file can be written by everyone. + * + * On unix like systems this set the <code>user</code>, <code>group</code> + * and <code>other</code> write bits and is equal to call + * <code>chmod a+w</code> on the file. + * + * @param <code>writable</code> <code>true</code> to set write permission, + * <code>false</code> to unset write permission. + * @param <code>ownerOnly</code> <code>true</code> to set write permission + * for owner only, <code>false</code> for all. + * @return <code>true</code> if the file permissions are changed, + * <code>false</code> otherwise. + * @exception SecurityException If write access of the file is not permitted. + * @see #setWritable(boolean) + * @since 1.6 + */ + public boolean setWritable(boolean writable, boolean ownerOnly) + { + checkWrite(); + return setFilePermissions(writable, ownerOnly, WRITE); + } + + /** + * This method sets the owner's execute permission for the File represented + * by this object. + * + * It is the same as calling <code>setExecutable(readable, true)</code>. + * + * @param <code>executable</code> <code>true</code> to set execute permission, + * <code>false</code> to unset execute permission. + * @return <code>true</code> if the file permissions are changed, + * <code>false</code> otherwise. + * @exception SecurityException If write access of the file is not permitted. + * @see #setExecutable(boolean, boolean) + * @since 1.6 + */ + public boolean setExecutable(boolean executable) + { + return setExecutable(executable, true); + } + + /** + * This method sets the execute permissions for the File represented by + * this object. + * + * If <code>ownerOnly</code> is set to <code>true</code> then only the + * execute permission bit for the owner of the file is changed. + * + * If <code>ownerOnly</code> is set to <code>false</code>, the file + * permissions are changed so that the file can be executed by everyone. + * + * On unix like systems this set the <code>user</code>, <code>group</code> + * and <code>other</code> write bits and is equal to call + * <code>chmod a+x</code> on the file. + * + * @param <code>executable</code> <code>true</code> to set write permission, + * <code>false</code> to unset write permission. + * @param <code>ownerOnly</code> <code>true</code> to set write permission + * for owner only, <code>false</code> for all. + * @return <code>true</code> if the file permissions are changed, + * <code>false</code> otherwise. + * @exception SecurityException If write access of the file is not permitted. + * @see #setExecutable(boolean) + * @since 1.6 + */ + public boolean setExecutable(boolean executable, boolean ownerOnly) + { + checkWrite(); + return setFilePermissions(executable, ownerOnly, EXEC); + } + + /* * This native method sets the permissions to make the file read only. */ private native boolean performSetReadOnly(); @@ -1372,6 +1547,15 @@ public class File implements Serializable, Comparable s.checkRead(path); } + private void checkExec() + { + // Check the SecurityManager + SecurityManager s = System.getSecurityManager(); + + if (s != null) + s.checkExec(path); + } + /** * Calling this method requests that the file represented by this object * be deleted when the virtual machine exits. Note that this request cannot diff --git a/libjava/java/io/ObjectInputStream.h b/libjava/java/io/ObjectInputStream.h index eedf6c4..ab7c47d 100644 --- a/libjava/java/io/ObjectInputStream.h +++ b/libjava/java/io/ObjectInputStream.h @@ -16,8 +16,10 @@ class java::io::ObjectInputStream : public ::java::io::InputStream public: ObjectInputStream(::java::io::InputStream *); virtual ::java::lang::Object * readObject(); + virtual ::java::lang::Object * readUnshared(); private: - ::java::lang::Object * parseContent(jbyte); + ::java::lang::Object * readObject(jboolean); + ::java::lang::Object * parseContent(jbyte, jboolean); void checkTypeConsistency(::java::lang::String *, JArray< ::java::io::ObjectStreamField * > *, JArray< ::java::io::ObjectStreamField * > *); public: // actually protected virtual ::java::io::ObjectStreamClass * readClassDescriptor(); @@ -60,10 +62,10 @@ public: // actually protected ObjectInputStream(); virtual ::java::lang::Object * readObjectOverride(); private: - jint assignNewHandle(::java::lang::Object *); - void rememberHandle(::java::lang::Object *, jint); + jint assignNewHandle(::java::lang::Object *, jboolean); + void rememberHandle(::java::lang::Object *, jboolean, jint); ::java::lang::Object * lookupHandle(jint); - ::java::lang::Object * processResolution(::java::io::ObjectStreamClass *, ::java::lang::Object *, jint); + ::java::lang::Object * processResolution(::java::io::ObjectStreamClass *, ::java::lang::Object *, jint, jboolean); void clearHandles(); void readNextBlock(); void readNextBlock(jbyte); @@ -86,7 +88,7 @@ private: jboolean useSubclassMethod; jint nextOID; jboolean resolveEnabled; - ::java::util::Vector * objectLookupTable; + ::java::util::Map * handles; ::java::lang::Object * currentObject; ::java::io::ObjectStreamClass * currentObjectStreamClass; ::java::util::TreeSet * currentObjectValidators; diff --git a/libjava/java/io/ObjectOutputStream.h b/libjava/java/io/ObjectOutputStream.h index 496da4e..fe6f88f 100644 --- a/libjava/java/io/ObjectOutputStream.h +++ b/libjava/java/io/ObjectOutputStream.h @@ -36,6 +36,9 @@ class java::io::ObjectOutputStream : public ::java::io::OutputStream public: ObjectOutputStream(::java::io::OutputStream *); virtual void writeObject(::java::lang::Object *); + virtual void writeUnshared(::java::lang::Object *); +private: + void writeObject(::java::lang::Object *, jboolean); public: // actually protected virtual void writeClassDescriptor(::java::io::ObjectStreamClass *); public: diff --git a/libjava/java/io/natFilePosix.cc b/libjava/java/io/natFilePosix.cc index c9bf858..d63625f 100644 --- a/libjava/java/io/natFilePosix.cc +++ b/libjava/java/io/natFilePosix.cc @@ -43,15 +43,18 @@ java::io::File::_access (jint query) char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (path) + 1); jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf); buf[total] = '\0'; - JvAssert (query == READ || query == WRITE || query == EXISTS); + JvAssert (query == READ || query == WRITE || query == EXISTS + || query == EXEC); #ifdef HAVE_ACCESS int mode; if (query == READ) mode = R_OK; else if (query == WRITE) mode = W_OK; - else + else if (query == EXISTS) mode = F_OK; + else + mode = X_OK; return ::access (buf, mode) == 0; #else return false; @@ -344,6 +347,54 @@ java::io::File::performMkdir (void) } jboolean +java::io::File::setFilePermissions (jboolean enable, + jboolean ownerOnly, + jint permissions) +{ + char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (path) + 1); + jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf); + buf[total] = '\0'; + JvAssert (permissions == READ || permissions == WRITE || permissions == EXEC); +#if defined (HAVE_STAT) && defined (HAVE_CHMOD) + mode_t mode = 0; + + struct stat sb; + if (::stat (buf, &sb)) + return false; + + if (ownerOnly) + { + if (permissions == READ) + mode |= S_IRUSR; + else if (permissions == WRITE) + mode |= S_IWUSR; + else if (permissions == EXEC) + mode |= S_IXUSR; + } + else + { + if (permissions == READ) + mode |= (S_IRUSR | S_IRGRP | S_IROTH); + else if (permissions == WRITE) + mode |= (S_IWUSR | S_IWGRP | S_IWOTH); + else if (permissions == EXEC) + mode |= (S_IXUSR | S_IXGRP | S_IXOTH); + } + + if (enable) + mode = sb.st_mode | mode; + else + mode = sb.st_mode & ~mode; + + if (::chmod(buf, mode) < 0) + return false; + return true; +#else + return false; +#endif +} + +jboolean java::io::File::performSetReadOnly (void) { char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (path) + 1); diff --git a/libjava/java/io/natFileWin32.cc b/libjava/java/io/natFileWin32.cc index cff86dd..316977b 100644 --- a/libjava/java/io/natFileWin32.cc +++ b/libjava/java/io/natFileWin32.cc @@ -44,13 +44,17 @@ java::io::File::_access (jint query) if (!canon) return false; - JvAssert (query == READ || query == WRITE || query == EXISTS); + JvAssert (query == READ || query == WRITE || query == EXISTS + || query == EXEC); // FIXME: Is it possible to differentiate between existing and reading? // If the file exists but cannot be read because of the secuirty attributes // on an NTFS disk this wont work (it reports it can be read but cant) // Could we use something from the security API? DWORD attributes = GetFileAttributes (canon); + // FIXME: handle EXEC + if (query == EXEC) + return false; if ((query == EXISTS) || (query == READ)) return (attributes == 0xffffffff) ? false : true; else @@ -212,6 +216,25 @@ java::io::File::performList (java::io::FilenameFilter *filter, } jboolean +java::io::File::setFilePermissions (jboolean enable, + jboolean ownerOnly, + jint permissions) +{ + JV_TEMP_STRING_WIN32 (canon, getCanonicalPath()); + if (!canon) + return false; + + DWORD attrs = GetFileAttributes (canon); + if (attrs != INVALID_FILE_ATTRIBUTES) + { + // FIXME: implement + return false; + } + else + return false; +} + +jboolean java::io::File::performMkdir (void) { JV_TEMP_STRING_WIN32 (cpath, path); |