Security-59306.61.1.tar.gz

[apple/security.git] / OSX / libsecurity_filedb / lib / AtomicFile.cpp

diff --git a/OSX/libsecurity_filedb/lib/AtomicFile.cpp b/OSX/libsecurity_filedb/lib/AtomicFile.cpp
index 6095fb0fa065047c2be038f1a63d94b6c0da45a8..6c21d12d2ab272967dd019f3802627475467881f 100644 (file)
--- a/OSX/libsecurity_filedb/lib/AtomicFile.cpp
+++ b/OSX/libsecurity_filedb/lib/AtomicFile.cpp
@@ -18,10 +18,10 @@
 
 #include <security_filedb/AtomicFile.h>
 
 
 #include <security_filedb/AtomicFile.h>
 

-#include <security_utilities/devrandom.h>

 #include <CommonCrypto/CommonDigest.h>
 #include <security_cdsa_utilities/cssmerrors.h>
 #include <Security/cssm.h>
 #include <CommonCrypto/CommonDigest.h>
 #include <security_cdsa_utilities/cssmerrors.h>
 #include <Security/cssm.h>

+#include <Security/SecRandom.h>

 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>


@@ -90,7 +90,7 @@ AtomicFile::~AtomicFile()
 {
 }
 
 {
 }
 

-// Aquire the write lock and remove the file.
+// Acquire the write lock and remove the file.

 void
 AtomicFile::performDelete()
 {
 void
 AtomicFile::performDelete()
 {


@@ -98,7 +98,7 @@ AtomicFile::performDelete()
        if (::unlink(mPath.c_str()) != 0)
        {
                int error = errno;
        if (::unlink(mPath.c_str()) != 0)
        {
                int error = errno;

-               secnotice("atomicfile", "unlink %s: %s", mPath.c_str(), strerror(error));
+               secinfo("atomicfile", "unlink %s: %s", mPath.c_str(), strerror(error));

         if (error == ENOENT)
                        CssmError::throwMe(CSSMERR_DL_DATASTORE_DOESNOT_EXIST);
                else
         if (error == ENOENT)
                        CssmError::throwMe(CSSMERR_DL_DATASTORE_DOESNOT_EXIST);
                else


@@ -109,7 +109,7 @@ AtomicFile::performDelete()
        ::unlink(mLockFilePath.c_str());
 }
 
        ::unlink(mLockFilePath.c_str());
 }
 

-// Aquire the write lock and rename the file (and bump the version and stuff).
+// Acquire the write lock and rename the file (and bump the version and stuff).

 void
 AtomicFile::rename(const std::string &inNewPath)
 {
 void
 AtomicFile::rename(const std::string &inNewPath)
 {


@@ -121,7 +121,7 @@ AtomicFile::rename(const std::string &inNewPath)
        if (::rename(path, newPath) != 0)
        {
                int error = errno;
        if (::rename(path, newPath) != 0)
        {
                int error = errno;

-               secnotice("atomicfile", "rename(%s, %s): %s", path, newPath, strerror(error));
+               secinfo("atomicfile", "rename(%s, %s): %s", path, newPath, strerror(error));

                UnixError::throwMe(error);
        }
 }
                UnixError::throwMe(error);
        }
 }


@@ -140,7 +140,7 @@ AtomicFile::create(mode_t mode)
     if (fileRef == -1)
     {
         int error = errno;
     if (fileRef == -1)
     {
         int error = errno;

-               secnotice("atomicfile", "open %s: %s", path, strerror(error));
+               secinfo("atomicfile", "open %s: %s", path, strerror(error));

 
         // Do the obvious error code translations here.
                // @@@ Consider moving these up a level.
 
         // Do the obvious error code translations here.
                // @@@ Consider moving these up a level.


@@ -158,7 +158,7 @@ AtomicFile::create(mode_t mode)
                // Now that we have created the lock and the new db file create a tempfile
                // object.
                RefPointer<AtomicTempFile> temp(new AtomicTempFile(*this, lock, mode));
                // Now that we have created the lock and the new db file create a tempfile
                // object.
                RefPointer<AtomicTempFile> temp(new AtomicTempFile(*this, lock, mode));

-               secnotice("atomicfile", "%p created %s", this, path);
+               secinfo("atomicfile", "%p created %s", this, path);

                return temp;
        }
        catch (...)
                return temp;
        }
        catch (...)


@@ -202,7 +202,7 @@ AtomicFile::mode() const
        if (::stat(path, &st) == -1)
        {
                int error = errno;
        if (::stat(path, &st) == -1)
        {
                int error = errno;

-               secnotice("atomicfile", "stat %s: %s", path, strerror(error));
+               secinfo("atomicfile", "stat %s: %s", path, strerror(error));

                UnixError::throwMe(error);
        }
        return st.st_mode;
                UnixError::throwMe(error);
        }
        return st.st_mode;


@@ -338,6 +338,7 @@ AtomicFile::ropen(const char *const name, int flags, mode_t mode)
             int result = sandbox_check(getpid(), "file-read-data", (sandbox_filter_type) (SANDBOX_FILTER_PATH | SANDBOX_CHECK_NO_REPORT), name);
             if (result != 0)
             {
             int result = sandbox_check(getpid(), "file-read-data", (sandbox_filter_type) (SANDBOX_FILTER_PATH | SANDBOX_CHECK_NO_REPORT), name);
             if (result != 0)
             {

+                secdebug("atomicfile", "sandboxing rejected read access to %s", name);

                 return -1;
             }
         }
                 return -1;
             }
         }


@@ -347,6 +348,7 @@ AtomicFile::ropen(const char *const name, int flags, mode_t mode)
             int result = sandbox_check(getpid(), "file-write-data", (sandbox_filter_type) (SANDBOX_FILTER_PATH | SANDBOX_CHECK_NO_REPORT), name);
             if (result != 0)
             {
             int result = sandbox_check(getpid(), "file-write-data", (sandbox_filter_type) (SANDBOX_FILTER_PATH | SANDBOX_CHECK_NO_REPORT), name);
             if (result != 0)
             {

+                secdebug("atomicfile", "sandboxing rejected write access to %s", name);

                 return -1;
             }
         }
                 return -1;
             }
         }


@@ -392,12 +394,12 @@ AtomicBufferedFile::~AtomicBufferedFile()
                // In release mode, the assert() is compiled out so rv may be unused.
                __unused int rv = AtomicFile::rclose(mFileRef);
                assert(rv == 0);
                // In release mode, the assert() is compiled out so rv may be unused.
                __unused int rv = AtomicFile::rclose(mFileRef);
                assert(rv == 0);

-               secnotice("atomicfile", "%p closed %s", this, mPath.c_str());
+               secinfo("atomicfile", "%p closed %s", this, mPath.c_str());

        }
 
        if (mBuffer)
        {
        }
 
        if (mBuffer)
        {

-               secnotice("atomicfile", "%p free %s buffer %p", this, mPath.c_str(), mBuffer);
+               secinfo("atomicfile", "%p free %s buffer %p", this, mPath.c_str(), mBuffer);

                unloadBuffer();
        }
 }
                unloadBuffer();
        }
 }


@@ -411,7 +413,7 @@ AtomicBufferedFile::open()
        const char *path = mPath.c_str();
        if (mFileRef >= 0)
        {
        const char *path = mPath.c_str();
        if (mFileRef >= 0)
        {

-               secnotice("atomicfile", "open %s: already open, closing and reopening", path);
+               secinfo("atomicfile", "open %s: already open, closing and reopening", path);

                close();
        }
 
                close();
        }
 


@@ -419,7 +421,7 @@ AtomicBufferedFile::open()
     if (mFileRef == -1)
     {
         int error = errno;
     if (mFileRef == -1)
     {
         int error = errno;

-               secnotice("atomicfile", "open %s: %s", path, strerror(error));
+               secinfo("atomicfile", "open %s: %s", path, strerror(error));

 
         // Do the obvious error code translations here.
                // @@@ Consider moving these up a level.
 
         // Do the obvious error code translations here.
                // @@@ Consider moving these up a level.


@@ -440,13 +442,13 @@ AtomicBufferedFile::open()
        else
        {
                int error = errno;
        else
        {
                int error = errno;

-               secnotice("atomicfile", "lseek(%s, END): %s", path, strerror(error));
+               secinfo("atomicfile", "lseek(%s, END): %s", path, strerror(error));

                AtomicFile::rclose(mFileRef);
                mFileRef = -1;
                UnixError::throwMe(error);
        }
 
                AtomicFile::rclose(mFileRef);
                mFileRef = -1;
                UnixError::throwMe(error);
        }
 

-       secnotice("atomicfile", "%p opened %s: %qd bytes", this, path, mLength);
+       secinfo("atomicfile", "%p opened %s: %qd bytes", this, path, mLength);

 
        return mLength;
 }
 
        return mLength;
 }


@@ -459,6 +461,7 @@ AtomicBufferedFile::unloadBuffer()
 {
     if(mBuffer) {
         delete [] mBuffer;
 {
     if(mBuffer) {
         delete [] mBuffer;

+        mBuffer = NULL;

     }
 }
 
     }
 }
 


@@ -468,10 +471,10 @@ void
 AtomicBufferedFile::loadBuffer()
 {
     // make a buffer big enough to hold the entire file
 AtomicBufferedFile::loadBuffer()
 {
     // make a buffer big enough to hold the entire file

-    mBuffer = new uint8[mLength];
+    mBuffer = new uint8[(size_t) mLength];

     if(lseek(mFileRef, 0, SEEK_SET) < 0) {
         int error = errno;
     if(lseek(mFileRef, 0, SEEK_SET) < 0) {
         int error = errno;

-        secnotice("atomicfile", "lseek(%s, BEGINNING): %s", mPath.c_str(), strerror(error));
+        secinfo("atomicfile", "lseek(%s, BEGINNING): %s", mPath.c_str(), strerror(error));

         UnixError::throwMe(error);
     }
     ssize_t pos = 0;
         UnixError::throwMe(error);
     }
     ssize_t pos = 0;


@@ -485,11 +488,9 @@ AtomicBufferedFile::loadBuffer()
             if (errno != EINTR)
             {
                 int error = errno;
             if (errno != EINTR)
             {
                 int error = errno;

-                secnotice("atomicfile", "read(%s, %zd): %s", mPath.c_str(), bytesToRead, strerror(error));
-                if (mFileRef >= 0) {
-                    AtomicFile::rclose(mFileRef);
-                    mFileRef = -1;
-                }
+                secinfo("atomicfile", "read(%s, %zd): %s", mPath.c_str(), bytesToRead, strerror(error));
+                AtomicFile::rclose(mFileRef);
+                mFileRef = -1;

                 UnixError::throwMe(error);
             }
         }
                 UnixError::throwMe(error);
             }
         }


@@ -514,20 +515,20 @@ AtomicBufferedFile::read(off_t inOffset, off_t inLength, off_t &outLength)
 {
        if (mFileRef < 0)
        {
 {
        if (mFileRef < 0)
        {

-               secnotice("atomicfile", "read %s: file yet not opened, opening", mPath.c_str());
+               secinfo("atomicfile", "read %s: file yet not opened, opening", mPath.c_str());

                open();
        }
 
        off_t bytesLeft = inLength;
        if (mBuffer)
        {
                open();
        }
 
        off_t bytesLeft = inLength;
        if (mBuffer)
        {

-               secnotice("atomicfile", "%p free %s buffer %p", this, mPath.c_str(), mBuffer);
+               secinfo("atomicfile", "%p free %s buffer %p", this, mPath.c_str(), mBuffer);

                unloadBuffer();
        }
 
        loadBuffer();
        
                unloadBuffer();
        }
 
        loadBuffer();
        

-       secnotice("atomicfile", "%p allocated %s buffer %p size %qd", this, mPath.c_str(), mBuffer, bytesLeft);
+       secinfo("atomicfile", "%p allocated %s buffer %p size %qd", this, mPath.c_str(), mBuffer, bytesLeft);

        
        off_t maxEnd = inOffset + inLength;
        if (maxEnd > mLength)
        
        off_t maxEnd = inOffset + inLength;
        if (maxEnd > mLength)


@@ -545,7 +546,7 @@ AtomicBufferedFile::close()
 {
        if (mFileRef < 0)
        {
 {
        if (mFileRef < 0)
        {

-               secnotice("atomicfile", "close %s: already closed", mPath.c_str());
+               secinfo("atomicfile", "close %s: already closed", mPath.c_str());

        }
        else
        {
        }
        else
        {


@@ -558,7 +559,7 @@ AtomicBufferedFile::close()
                        UnixError::throwMe(error);
                }
 
                        UnixError::throwMe(error);
                }
 

-               secnotice("atomicfile", "%p closed %s", this, mPath.c_str());
+               secinfo("atomicfile", "%p closed %s", this, mPath.c_str());

        }
 }
 
        }
 }
 


@@ -625,7 +626,7 @@ AtomicTempFile::create(mode_t mode)
     if (mFileRef == -1)
     {
         int error = errno;
     if (mFileRef == -1)
     {
         int error = errno;

-               secnotice("atomicfile", "open %s: %s", path, strerror(error));
+               secnotice("atomicfile", "create %s: %s", path, strerror(error));

 
         // Do the obvious error code translations here.
                // @@@ Consider moving these up a level.
 
         // Do the obvious error code translations here.
                // @@@ Consider moving these up a level.


@@ -649,7 +650,7 @@ AtomicTempFile::create(mode_t mode)
                }
        }
 
                }
        }
 

-       secnotice("atomicfile", "%p created %s", this, path);
+       secinfo("atomicfile", "%p created %s", this, path);

 }
 
 void
 }
 
 void


@@ -752,7 +753,7 @@ AtomicTempFile::fsync()
                        UnixError::throwMe(error);
                }
 
                        UnixError::throwMe(error);
                }
 

-               secnotice("atomicfile", "%p fsynced %s", this, mPath.c_str());
+               secinfo("atomicfile", "%p fsynced %s", this, mPath.c_str());

        }
 }
 
        }
 }
 


@@ -774,7 +775,7 @@ AtomicTempFile::close()
                        UnixError::throwMe(error);
                }
 
                        UnixError::throwMe(error);
                }
 

-               secnotice("atomicfile", "%p closed %s", this, mPath.c_str());
+               secinfo("atomicfile", "%p closed %s", this, mPath.c_str());

        }
 }
 
        }
 }
 


@@ -961,7 +962,6 @@ std::string
 NetworkFileLocker::unique(mode_t mode)
 {
        static const int randomPart = 16;
 NetworkFileLocker::unique(mode_t mode)
 {
        static const int randomPart = 16;

-       DevRandomGenerator randomGen;

        std::string::size_type dirSize = mDir.size();
        std::string fullname(dirSize + randomPart + 2, '\0');
        fullname.replace(0, dirSize, mDir);
        std::string::size_type dirSize = mDir.size();
        std::string fullname(dirSize + randomPart + 2, '\0');
        fullname.replace(0, dirSize, mDir);


@@ -973,7 +973,7 @@ NetworkFileLocker::unique(mode_t mode)
        for (int retries = 0; retries < 10; ++retries)
        {
                /* Make a random filename. */
        for (int retries = 0; retries < 10; ++retries)
        {
                /* Make a random filename. */

-               randomGen.random(buf, randomPart);
+        MacOSError::check(SecRandomCopyBytes(kSecRandomDefault, randomPart, buf));

                for (int ix = 0; ix < randomPart; ++ix)
                {
                        char ch = buf[ix] & 0x3f;
                for (int ix = 0; ix < randomPart; ++ix)
                {
                        char ch = buf[ix] & 0x3f;


@@ -1112,7 +1112,7 @@ NetworkFileLocker::lock(mode_t mode)
                else
                        doSyslog = true;
 
                else
                        doSyslog = true;
 

-               secnotice("atomicfile", "Locking %s", path);          /* in order to cater for clock skew: get */
+               secinfo("atomicfile", "Locking %s", path);          /* in order to cater for clock skew: get */

                if (!xcreat(path, mode, t))    /* time t from the filesystem */
                {
                        /* lock acquired, hurray! */
                if (!xcreat(path, mode, t))    /* time t from the filesystem */
                {
                        /* lock acquired, hurray! */