for built-in dialogs, there is no m_peer instance, and still we might have a Refresh...

[wxWidgets.git] / src / unix / snglinst.cpp

diff --git a/src/unix/snglinst.cpp b/src/unix/snglinst.cpp
index 9cc4155e80ec11481daa02f0a1410c13f18dfb7d..66d616c32ad7dec460244710587d5dd795b7c616 100644 (file)
--- a/src/unix/snglinst.cpp
+++ b/src/unix/snglinst.cpp
@@ -7,7 +7,7 @@
 // Created:     09.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     09.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -18,7 +18,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "snglinst.h"
 #endif
 
     #pragma implementation "snglinst.h"
 #endif
 


@@ -35,9 +35,9 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"

-    #include "wx/file.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

+#include "wx/file.h"

 #include "wx/utils.h"           // wxGetHomeDir()
 
 #include "wx/snglinst.h"
 #include "wx/utils.h"           // wxGetHomeDir()
 
 #include "wx/snglinst.h"


@@ -151,7 +151,7 @@ private:
 LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
 {
     // try to open the file
 LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
 {
     // try to open the file

-    m_fdLock = open(m_nameLock,
+    m_fdLock = open(m_nameLock.fn_str(),

                     O_WRONLY | O_CREAT | O_EXCL,
                     S_IRUSR | S_IWUSR);
 
                     O_WRONLY | O_CREAT | O_EXCL,
                     S_IRUSR | S_IWUSR);
 


@@ -180,6 +180,17 @@ LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
 
             fsync(m_fdLock);
 
 
             fsync(m_fdLock);
 

+            // change file's permission so that only this user can access it:
+            if ( chmod(m_nameLock.fn_str(), S_IRUSR | S_IWUSR) != 0 )
+            {
+                wxLogSysError(_("Failed to set permissions on lock file '%s'"),
+                              m_nameLock.c_str());
+
+                Unlock();
+                
+                return LOCK_ERROR;
+            }
+

             return LOCK_CREATED;
         }
         else // failure: see what exactly happened
             return LOCK_CREATED;
         }
         else // failure: see what exactly happened


@@ -192,7 +203,7 @@ LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
                 wxLogSysError(_("Failed to lock the lock file '%s'"),
                               m_nameLock.c_str());
 
                 wxLogSysError(_("Failed to lock the lock file '%s'"),
                               m_nameLock.c_str());
 

-                unlink(m_nameLock);
+                unlink(m_nameLock.fn_str());

 
                 return LOCK_ERROR;
             }
 
                 return LOCK_ERROR;
             }


@@ -226,6 +237,26 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
             return FALSE;
     }
 
             return FALSE;
     }
 

+    // Check if the file is owned by current user and has 0600 permissions.
+    // If it doesn't, it's a fake file, possibly meant as a DoS attack, and
+    // so we refuse to touch it:
+    wxStructStat stats;
+    if ( wxStat(name, &stats) != 0 )
+    {
+        wxLogSysError(_("Failed to inspect the lock file '%s'"), name.c_str());
+        return false;
+    }
+    if ( stats.st_uid != getuid() )
+    {
+        wxLogError(_("Lock file '%s' has incorrect owner."), name.c_str());
+        return false;
+    }
+    if ( stats.st_mode != (S_IFREG | S_IRUSR | S_IWUSR) )
+    {
+        wxLogError(_("Lock file '%s' has incorrect permissions."), name.c_str());
+        return false;
+    }
+

     // try to open the file for reading and get the PID of the process
     // which has it
     wxFile file(name, wxFile::read);
     // try to open the file for reading and get the PID of the process
     // which has it
     wxFile file(name, wxFile::read);


@@ -257,7 +288,7 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
         {
             if ( kill(m_pidLocker, 0) != 0 )
             {
         {
             if ( kill(m_pidLocker, 0) != 0 )
             {

-                if ( unlink(name) != 0 )
+                if ( unlink(name.fn_str()) != 0 )

                 {
                     wxLogError(_("Failed to remove stale lock file '%s'."),
                                name.c_str());
                 {
                     wxLogError(_("Failed to remove stale lock file '%s'."),
                                name.c_str());


@@ -291,7 +322,7 @@ void wxSingleInstanceCheckerImpl::Unlock()
 {
     if ( m_fdLock != -1 )
     {
 {
     if ( m_fdLock != -1 )
     {

-        if ( unlink(m_nameLock) != 0 )
+        if ( unlink(m_nameLock.fn_str()) != 0 )

         {
             wxLogSysError(_("Failed to remove lock file '%s'"),
                           m_nameLock.c_str());
         {
             wxLogSysError(_("Failed to remove lock file '%s'"),
                           m_nameLock.c_str());