Changeset 1745

Timestamp:

2/3/2010 3:37:13 AM (3 years ago)

Author:

lowjoel

Message:

Forward ported changes from trunk to r1743

Location:

branches/eraser6/CodeReview

Files:

• . (modified) (1 prop)
• Eraser.DefaultPlugins/ErasureMethods/FirstLast16KB.cs (modified) (2 diffs)
• Eraser.DefaultPlugins/FileSystems/Windows.cs (modified) (1 diff)
• Eraser.Manager/DirectExecutor.cs (modified) (4 diffs)
• Eraser.Manager/FileSystem.cs (modified) (2 diffs)
• Eraser.Manager/RemoteExecutor.cs (modified) (2 diffs)
• Eraser.Manager/Task.cs (modified) (5 diffs)
• Eraser.Util.Native/OpenHandle.NameResolver.cpp (modified) (1 diff)
• Eraser.Util/BlackBox.cs (modified) (1 diff)
• Eraser.Util/Eraser.Util.csproj (modified) (1 diff)
• Eraser.Util/Security.cs (modified) (2 diffs)
• Eraser.Util/Shell.cs (added)
• Eraser.Util/VolumeInfo.cs (modified) (1 diff)
• Eraser.msbuild (modified) (1 prop)
• Eraser/BlackBoxMainForm.it.resx (modified) (1 prop)
• Eraser/BlackBoxUploadForm.it.resx (modified) (1 prop)
• Eraser/LogForm.cs (modified) (2 diffs)
• Eraser/MainForm.cs (modified) (1 diff)
• Eraser/Program.GuiProgram.cs (modified) (1 diff)
• Eraser/ProgressForm.cs (modified) (2 diffs)
• Eraser/SchedulerPanel.cs (modified) (3 diffs)
• Eraser/Strings.NL.resx (modified) (1 diff)
• Eraser/Strings.en.resx (modified) (1 diff)
• Eraser/Strings.it.resx (modified) (1 diff)
• Eraser/Strings.resx (modified) (1 diff)
• ShellExt/CtxMenu.cpp (modified) (1 diff)

branches/eraser6/CodeReview/Eraser.DefaultPlugins/ErasureMethods/FirstLast16KB.cs

@@ -113 +113 @@
                     "limited, since this is a self-limiting erasure method."));
 
-            //If the target stream is shorter than 16kb, just forward it to the default
-            //function.
-            if (strm.Length < dataSize)
+            //If the target stream is shorter than or equal to 32kb, just forward it to
+            //the default function.
+            if (strm.Length < dataSize * 2)
             {
                 method.Erase(strm, erasureLength, prng, callback);
@@ -121 +121 @@
             }
 
+            //We need to intercept the callback function as we run the erasure method
+            //twice on two parts of the file.
+            ErasureMethodProgressFunction customCallback =
+                delegate(long lastWritten, long totalData, int currentPass)
+                {
+                    callback(lastWritten, dataSize * 2, currentPass);
+                };
+
             //Seek to the beginning and write 16kb.
             strm.Seek(0, SeekOrigin.Begin);
-            method.Erase(strm, dataSize, prng, callback);
+            method.Erase(strm, dataSize, prng, callback == null ? null: customCallback);
 
             //Seek to the end - 16kb, and write.
             strm.Seek(-dataSize, SeekOrigin.End);
-            method.Erase(strm, long.MaxValue, prng, callback);
+            method.Erase(strm, long.MaxValue, prng, callback == null ? null : customCallback);
         }
 

branches/eraser6/CodeReview/Eraser.DefaultPlugins/FileSystems/Windows.cs

@@ -72 +72 @@
         private void DeleteFileSystemInfo(FileSystemInfo info)
         {
+            //If the file/directory doesn't exist, pass.
+            if (!info.Exists)
+                return;
+
             //Set the date of the file to be invalid to prevent forensic
             //detection
+            info.Attributes = FileAttributes.NotContentIndexed;
             info.CreationTime = info.LastWriteTime = info.LastAccessTime = MinTimestamp;
-            info.Attributes = FileAttributes.Normal;
-            info.Attributes = FileAttributes.NotContentIndexed;
 
             //Rename the file a few times to erase the entry from the file system

branches/eraser6/CodeReview/Eraser.Manager/DirectExecutor.cs

@@ -275 +275 @@
                                 throw;
                             }
+                            catch (ThreadAbortException)
+                            {
+                            }
                             catch (Exception e)
                             {
@@ -417 +420 @@
                 fsManager.EraseClusterTips(VolumeInfo.FromMountPoint(target.Drive),
                     method, task.Log, searchProgress, eraseProgress);
-            }
-
+                tipProgress.MarkComplete();
+            }
+
+            bool lowDiskSpaceNotifications = Shell.LowDiskSpaceNotificationsEnabled;
             info = info.CreateSubdirectory(Path.GetFileName(
                 FileSystem.GenerateRandomFileName(info, 18)));
@@ -427 +432 @@
                 if (info.IsCompressed())
                     info.Uncompress();
+
+                //Disable the low disk space notifications
+                Shell.LowDiskSpaceNotificationsEnabled = false;
 
                 ProgressManager mainProgress = new ProgressManager();
@@ -515 +523 @@
                 fsManager.DeleteFolder(info);
                 tempFiles.Completed = tempFiles.Total;
+
+                //Reset the low disk space notifications
+                Shell.LowDiskSpaceNotificationsEnabled = lowDiskSpaceNotifications;
             }
 

branches/eraser6/CodeReview/Eraser.Manager/FileSystem.cs

@@ -114 +114 @@
             {
                 string shadowFile = null;
-                IList<string> entries = ManagerLibrary.Settings.PlausibleDeniabilityFiles;
+                List<string> entries = new List<string>(
+                    ManagerLibrary.Settings.PlausibleDeniabilityFiles);
                 Prng prng = PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng);
                 do
@@ -136 +137 @@
                     entries.RemoveAt(index);
                 }
-                while (shadowFile == null || shadowFile.Length == 0);
+                while (shadowFile == null || shadowFile.Length == 0 || !File.Exists(shadowFile));
                 shadowFileInfo = new FileInfo(shadowFile);
             }

branches/eraser6/CodeReview/Eraser.Manager/RemoteExecutor.cs

@@ -100 +100 @@
             thread = new Thread(Main);
             serverLock = new Semaphore(maxServerInstances, maxServerInstances);
-
-            thread.Start();
-            Thread.Sleep(0);
         }
 
@@ -125 +122 @@
 
             base.Dispose(disposing);
+        }
+
+        public override void Run()
+        {
+            thread.Start();
+            Thread.Sleep(0);
+            base.Run();
         }
 

branches/eraser6/CodeReview/Eraser.Manager/Task.cs

@@ -456 +456 @@
                     string adsPath = file + ':' + adsName;
                     list.Add(adsPath);
-                    Util.StreamInfo info = new Util.StreamInfo(adsPath);
+                    StreamInfo info = new StreamInfo(adsPath);
                     totalSize += info.Length;
                 }
@@ -693 +693 @@
                 Regex excludePattern = new Regex(regex, RegexOptions.IgnoreCase);
                 foreach (FileInfo file in files)
-                    if ((file.Attributes & FileAttributes.ReparsePoint) == 0 &&
+                    if (file.Exists &&
+                        (file.Attributes & FileAttributes.ReparsePoint) == 0 &&
                         excludePattern.Matches(file.FullName).Count == 0)
                     {
@@ -704 +705 @@
                 foreach (FileInfo file in files)
                 {
-                    if ((file.Attributes & FileAttributes.ReparsePoint) != 0)
+                    if (!file.Exists || (file.Attributes & FileAttributes.ReparsePoint) != 0)
                         continue;
 
@@ -807 +808 @@
                         continue;
 
-                    GetRecyclerFiles(dir, ref result, ref totalSize);
+                    GetRecyclerFiles(dir, result, ref totalSize);
                 }
             }
@@ -820 +821 @@
         /// <param name="paths">The list of files to store path information in.</param>
         /// <param name="totalSize">Receives the total size of the files.</param>
-        private void GetRecyclerFiles(DirectoryInfo info, ref List<string> paths,
+        private void GetRecyclerFiles(DirectoryInfo info, List<string> paths,
             ref long totalSize)
         {
             try
             {
-                foreach (FileSystemInfo fsInfo in info.GetFileSystemInfos())
+                foreach (FileInfo fileInfo in info.GetFiles())
                 {
-                    FileInfo fileInfo = fsInfo as FileInfo;
-                    if (fileInfo != null)
-                    {
-                        totalSize += fileInfo.Length;
-                        GetPathADSes(paths, out totalSize, fileInfo.FullName);
-                        paths.Add(fileInfo.FullName);
-                    }
-                    else
-                        GetRecyclerFiles((DirectoryInfo)fsInfo, ref paths, ref totalSize);
+                    if (!fileInfo.Exists || (fileInfo.Attributes & FileAttributes.ReparsePoint) != 0)
+                        continue;
+
+                    totalSize += fileInfo.Length;
+                    GetPathADSes(paths, out totalSize, fileInfo.FullName);
+                    paths.Add(fileInfo.FullName);
                 }
+
+                foreach (DirectoryInfo directoryInfo in info.GetDirectories())
+                    if ((directoryInfo.Attributes & FileAttributes.ReparsePoint) == 0)
+                        GetRecyclerFiles(directoryInfo, paths, ref totalSize);
             }
             catch (UnauthorizedAccessException e)

branches/eraser6/CodeReview/Eraser.Util.Native/OpenHandle.NameResolver.cpp

@@ -88 +88 @@
 }
 
-#pragma managed(pop)
-
 void CreateNameThread(HANDLE& handle, NameResolutionThreadParams& params)
 {

branches/eraser6/CodeReview/Eraser.Util/BlackBox.cs

@@ -408 +408 @@
             {
                 return new FileStream(System.IO.Path.Combine(Path, BlackBox.DebugLogFileName),
-                    FileMode.Open, FileAccess.Read);
+                    FileMode.Open, FileAccess.Read, FileShare.Read);
             }
         }

branches/eraser6/CodeReview/Eraser.Util/Eraser.Util.csproj

@@ -109 +109 @@
     <Compile Include="NativeMethods\Sfc.cs" />
     <Compile Include="ProgressManager.cs" />
+    <Compile Include="Shell.cs" />
     <Compile Include="Win32ErrorCodes.cs" />
   </ItemGroup>

branches/eraser6/CodeReview/Eraser.Util/Security.cs

@@ -117 +117 @@
 
             handle = new SafeCryptHandle();
-            if (NativeMethods.CryptAcquireContext(out handle, string.Empty,
+            if (NativeMethods.CryptAcquireContext(out handle, null,
                 IntelDefaultProvider, NativeMethods.PROV_INTEL_SEC, 0))
             {
                 return;
             }
-            else if (NativeMethods.CryptAcquireContext(out handle, string.Empty,
-                string.Empty, NativeMethods.PROV_RSA_FULL, 0))
+            else if (NativeMethods.CryptAcquireContext(out handle, null,
+                null, NativeMethods.PROV_RSA_FULL, 0))
             {
                 return;
@@ -130 +130 @@
             {
                 //Default keyset doesn't exist, attempt to create a new one
-                if (NativeMethods.CryptAcquireContext(out handle, string.Empty, string.Empty,
+                if (NativeMethods.CryptAcquireContext(out handle, null, null,
                     NativeMethods.PROV_RSA_FULL, NativeMethods.CRYPT_NEWKEYSET))
                 {

branches/eraser6/CodeReview/Eraser.Util/VolumeInfo.cs

@@ -58 +58 @@
                 fileSystemName = new StringBuilder(NativeMethods.MaxPath * sizeof(char));
             uint serialNumber, maxComponentLength, filesystemFlags;
-            if (!NativeMethods.GetVolumeInformation(volumeId, volumeName, NativeMethods.MaxPath,
+            if (NativeMethods.GetVolumeInformation(volumeId, volumeName, NativeMethods.MaxPath,
                 out serialNumber, out maxComponentLength, out filesystemFlags, fileSystemName,
                 NativeMethods.MaxPath))
             {
-                int lastError = Marshal.GetLastWin32Error();
-                switch (lastError)
-                {
-                    case Win32ErrorCode.Success:
-                    case Win32ErrorCode.NotReady:
-                    case Win32ErrorCode.InvalidParameter:   //when the volume given is not mounted.
-                    case Win32ErrorCode.UnrecognizedVolume:
-                        break;
-
-                    default:
-                        throw Win32ErrorCode.GetExceptionForWin32Error(lastError);
-                }
-            }
-            else
-            {
                 IsReady = true;
-                VolumeLabel = volumeName.ToString();
-                VolumeFormat = fileSystemName.ToString();
-
-                //Determine whether it is FAT12 or FAT16
-                if (VolumeFormat == "FAT")
-                {
-                    uint clusterSize, sectorSize, freeClusters, totalClusters;
-                    if (NativeMethods.GetDiskFreeSpace(VolumeId, out clusterSize,
-                        out sectorSize, out freeClusters, out totalClusters))
-                    {
-                        if (totalClusters <= 0xFF0)
-                            VolumeFormat += "12";
-                        else
-                            VolumeFormat += "16";
-                    }
+            }
+
+            //If GetVolumeInformation returns zero some of the information may
+            //have been stored, so we just try to extract it.
+            VolumeLabel = volumeName.Length == 0 ? null : volumeName.ToString();
+            VolumeFormat = fileSystemName.Length == 0 ? null : fileSystemName.ToString();
+
+            //Determine whether it is FAT12 or FAT16
+            if (VolumeFormat == "FAT")
+            {
+                uint clusterSize, sectorSize, freeClusters, totalClusters;
+                if (NativeMethods.GetDiskFreeSpace(VolumeId, out clusterSize,
+                    out sectorSize, out freeClusters, out totalClusters))
+                {
+                    if (totalClusters <= 0xFF0)
+                        VolumeFormat += "12";
+                    else
+                        VolumeFormat += "16";
                 }
             }

branches/eraser6/CodeReview/Eraser/LogForm.cs

@@ -78 +78 @@
         private void task_NewSession(object sender, EventArgs e)
         {
-            if (!IsHandleCreated)
+            if (IsDisposed || !IsHandleCreated)
                 return;
             if (InvokeRequired)
@@ -91 +91 @@
         private void task_Logged(object sender, LogEventArgs e)
         {
-            if (!IsHandleCreated)
+            if (IsDisposed || !IsHandleCreated)
                 return;
             if (InvokeRequired)

branches/eraser6/CodeReview/Eraser/MainForm.cs

@@ -48 +48 @@
             contentPanel.Controls.Add(SchedulerPage);
             contentPanel.Controls.Add(SettingsPage);
+            if (!IsHandleCreated)
+                CreateHandle();
 
             Theming.ApplyTheme(this);

branches/eraser6/CodeReview/Eraser/Program.GuiProgram.cs

@@ -158 +158 @@
                             S.IsRightToLeft(null) ? MessageBoxOptions.RtlReading : 0);
                     }
+                    catch (IOException ex)
+                    {
+                        MessageBox.Show(S._("Another instance of Eraser is already running but " +
+                            "cannot be connected to.\n\nThe error returned was: {0}", ex.Message,
+                            S._("Eraser"), MessageBoxButtons.OK, MessageBoxIcon.Error,
+                            MessageBoxDefaultButton.Button1,
+                            S.IsRightToLeft(null) ? MessageBoxOptions.RtlReading : 0));
+                    }
                     catch (TimeoutException)
                     {

branches/eraser6/CodeReview/Eraser/ProgressForm.cs

@@ -65 +65 @@
         private void task_ProgressChanged(object sender, ProgressChangedEventArgs e)
         {
-            if (!IsHandleCreated)
+            if (IsDisposed || !IsHandleCreated)
                 return;
             if (InvokeRequired)
@@ -91 +91 @@
         private void task_TaskFinished(object sender, TaskEventArgs e)
         {
-            if (!IsHandleCreated)
+            if (IsDisposed || !IsHandleCreated)
                 return;
             if (InvokeRequired)

branches/eraser6/CodeReview/Eraser/SchedulerPanel.cs

@@ -45 +45 @@
             InitializeComponent();
             Theming.ApplyTheme(schedulerDefaultMenu);
-            CreateHandle();
+            if (!IsHandleCreated)
+                CreateHandle();
 
             //Populate the scheduler list-view with the current task list
@@ -187 +188 @@
         void task_TaskStarted(object sender, TaskEventArgs e)
         {
-            if (scheduler.InvokeRequired)
+            if (InvokeRequired)
             {
                 Invoke((EventHandler<TaskEventArgs>)task_TaskStarted, sender, e);
@@ -213 +214 @@
             //Make sure we handle the event in the main thread as this requires
             //GUI calls.
-            if (scheduler.InvokeRequired)
+            if (InvokeRequired)
             {
                 Invoke((EventHandler<ProgressChangedEventArgs>)task_ProgressChanged, sender, e);

branches/eraser6/CodeReview/Eraser/Strings.NL.resx

@@ -175 +175 @@
     <value>(Untranslated)</value>
   </data>
+  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}Eraser" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Total: {0,2:#0.00%}" xml:space="preserve">
     <value>(Untranslated)</value>

branches/eraser6/CodeReview/Eraser/Strings.en.resx

@@ -175 +175 @@
     <value>Another instance of Eraser is already running but it is running with higher privileges than this instance of Eraser.\n\nEraser will now exit.</value>
   </data>
+  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}Eraser" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Total: {0,2:#0.00%}" xml:space="preserve">
     <value>Total: {0,2:#0.00%}</value>

branches/eraser6/CodeReview/Eraser/Strings.it.resx

@@ -175 +175 @@
     <value>Un'altra occorrenza di Eraser è già in esecuzione, ma con privilegi più elevati di questa.\n\nEraser adesso si chiuderà.</value>
   </data>
+  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}Eraser" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Total: {0,2:#0.00%}" xml:space="preserve">
     <value>Totale: {0,2:#0.00%}</value>

branches/eraser6/CodeReview/Eraser/Strings.resx

@@ -175 +175 @@
     <value>Another instance of Eraser is already running but it is running with higher privileges than this instance of Eraser.\n\nEraser will now exit.</value>
   </data>
+  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}Eraser" xml:space="preserve">
+    <value>Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}Eraser</value>
+  </data>
   <data name="Total: {0,2:#0.00%}" xml:space="preserve">
     <value>Total: {0,2:#0.00%}</value>

branches/eraser6/CodeReview/ShellExt/CtxMenu.cpp

@@ -954 +954 @@
                 NULL, NULL, &startupInfo, &processInfo))
             {
+                //Why did we fail? Is it because we have too many files
                 if (GetLastError() == ERROR_FILENAME_EXCED_RANGE)
                     throw FormatString(LoadString(IDS_ERROR_TOO_MANY_FILES));
+                
+                //Or if elevation is required for this operation
+                else if (GetLastError() == ERROR_ELEVATION_REQUIRED)
+                    return RunEraser(action, parameters, true, parent, show);
+
+                //Or otherwise?
                 else
                     throw FormatString(LoadString(IDS_ERROR_MISC), FormatError().c_str());