clean up
This commit is contained in:
parent
aae2433741
commit
c865e71d12
|
@ -6,7 +6,6 @@ ASSEMBLY_INFO_SOURCE = Defines.cs
|
||||||
SOURCES = \
|
SOURCES = \
|
||||||
SparkleBackend.cs \
|
SparkleBackend.cs \
|
||||||
SparkleConfig.cs \
|
SparkleConfig.cs \
|
||||||
SparkleExceptions.cs \
|
|
||||||
SparkleExtensions.cs \
|
SparkleExtensions.cs \
|
||||||
SparkleFetcherBase.cs \
|
SparkleFetcherBase.cs \
|
||||||
SparkleListenerBase.cs \
|
SparkleListenerBase.cs \
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
// SparkleShare, a collaboration and sharing tool.
|
|
||||||
// Copyright (C) 2010 Hylke Bons <hylkebons@gmail.com>
|
|
||||||
//
|
|
||||||
// This program is free software: you can redistribute it and/or modify
|
|
||||||
// it under the terms of the GNU General Public License as published by
|
|
||||||
// the Free Software Foundation, either version 3 of the License, or
|
|
||||||
// (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This program is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU General Public License for more details.
|
|
||||||
//
|
|
||||||
// You should have received a copy of the GNU General Public License
|
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
|
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace SparkleLib {
|
|
||||||
|
|
||||||
public class QuotaExceededException : Exception {
|
|
||||||
|
|
||||||
public readonly int QuotaLimit = -1;
|
|
||||||
|
|
||||||
|
|
||||||
public QuotaExceededException ()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public QuotaExceededException (string message, int quota_limit) : base (message)
|
|
||||||
{
|
|
||||||
QuotaLimit = quota_limit;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -13,15 +13,15 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>none</DebugType>
|
<DebugType>none</DebugType>
|
||||||
<Optimize>false</Optimize>
|
<Optimize>False</Optimize>
|
||||||
<OutputPath>..\bin</OutputPath>
|
<OutputPath>..\bin</OutputPath>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<ConsolePause>false</ConsolePause>
|
<ConsolePause>False</ConsolePause>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<DebugType>none</DebugType>
|
<DebugType>none</DebugType>
|
||||||
<Optimize>false</Optimize>
|
<Optimize>False</Optimize>
|
||||||
<OutputPath>bin\Debug</OutputPath>
|
<OutputPath>bin\Debug</OutputPath>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -40,17 +40,15 @@
|
||||||
<Compile Include="SparkleConfig.cs" />
|
<Compile Include="SparkleConfig.cs" />
|
||||||
<Compile Include="SparkleWatcher.cs" />
|
<Compile Include="SparkleWatcher.cs" />
|
||||||
<Compile Include="SparkleExtensions.cs" />
|
<Compile Include="SparkleExtensions.cs" />
|
||||||
<Compile Include="SparkleExceptions.cs" />
|
|
||||||
<Compile Include="SparkleUser.cs" />
|
<Compile Include="SparkleUser.cs" />
|
||||||
<Compile Include="SparkleLogger.cs" />
|
<Compile Include="SparkleLogger.cs" />
|
||||||
<Compile Include="Defines.cs" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
<MonoDevelop>
|
<MonoDevelop>
|
||||||
<Properties>
|
<Properties>
|
||||||
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am">
|
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
|
||||||
<BuildFilesVar Sync="true" Name="SOURCES" />
|
<BuildFilesVar Sync="True" Name="SOURCES" />
|
||||||
<DeployFilesVar />
|
<DeployFilesVar />
|
||||||
<ResourcesVar />
|
<ResourcesVar />
|
||||||
<OthersVar />
|
<OthersVar />
|
||||||
|
|
|
@ -22,7 +22,6 @@ using System.IO;
|
||||||
using MonoMac.AppKit;
|
using MonoMac.AppKit;
|
||||||
using MonoMac.Foundation;
|
using MonoMac.Foundation;
|
||||||
using MonoMac.ObjCRuntime;
|
using MonoMac.ObjCRuntime;
|
||||||
using MonoMac.WebKit;
|
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,6 @@ using System.IO;
|
||||||
using MonoMac.Foundation;
|
using MonoMac.Foundation;
|
||||||
using MonoMac.AppKit;
|
using MonoMac.AppKit;
|
||||||
using MonoMac.ObjCRuntime;
|
using MonoMac.ObjCRuntime;
|
||||||
using MonoMac.WebKit;
|
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
|
||||||
|
|
|
@ -22,9 +22,7 @@ using System.Linq;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Net.Security;
|
using System.Net.Security;
|
||||||
using System.Security.Cryptography.X509Certificates;
|
using System.Security.Cryptography.X509Certificates;
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Security.Cryptography;
|
|
||||||
|
|
||||||
using SparkleLib;
|
using SparkleLib;
|
||||||
|
|
||||||
|
@ -40,8 +38,6 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool RepositoriesLoaded { get; private set;}
|
public bool RepositoriesLoaded { get; private set;}
|
||||||
|
|
||||||
private List<SparkleRepoBase> repositories = new List<SparkleRepoBase> ();
|
|
||||||
public string FoldersPath { get; private set; }
|
public string FoldersPath { get; private set; }
|
||||||
|
|
||||||
public double ProgressPercentage = 0.0;
|
public double ProgressPercentage = 0.0;
|
||||||
|
@ -63,10 +59,9 @@ namespace SparkleShare {
|
||||||
|
|
||||||
public event FolderFetchingHandler FolderFetching = delegate { };
|
public event FolderFetchingHandler FolderFetching = delegate { };
|
||||||
public delegate void FolderFetchingHandler (double percentage);
|
public delegate void FolderFetchingHandler (double percentage);
|
||||||
|
|
||||||
|
|
||||||
public event Action FolderListChanged = delegate { };
|
public event Action FolderListChanged = delegate { };
|
||||||
|
|
||||||
|
|
||||||
public event Action OnIdle = delegate { };
|
public event Action OnIdle = delegate { };
|
||||||
public event Action OnSyncing = delegate { };
|
public event Action OnSyncing = delegate { };
|
||||||
public event Action OnError = delegate { };
|
public event Action OnError = delegate { };
|
||||||
|
@ -126,10 +121,6 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public abstract string EventLogHTML { get; }
|
|
||||||
public abstract string DayEntryHTML { get; }
|
|
||||||
public abstract string EventEntryHTML { get; }
|
|
||||||
|
|
||||||
// Path where the plugins are kept
|
// Path where the plugins are kept
|
||||||
public abstract string PluginsPath { get; }
|
public abstract string PluginsPath { get; }
|
||||||
|
|
||||||
|
@ -155,13 +146,18 @@ namespace SparkleShare {
|
||||||
// Opens a file with the appropriate application
|
// Opens a file with the appropriate application
|
||||||
public abstract void OpenWebsite (string url);
|
public abstract void OpenWebsite (string url);
|
||||||
|
|
||||||
|
public abstract string EventLogHTML { get; }
|
||||||
|
public abstract string DayEntryHTML { get; }
|
||||||
|
public abstract string EventEntryHTML { get; }
|
||||||
|
|
||||||
|
|
||||||
private SparkleConfig config;
|
private SparkleConfig config;
|
||||||
private SparkleFetcherBase fetcher;
|
private SparkleFetcherBase fetcher;
|
||||||
private FileSystemWatcher watcher;
|
private FileSystemWatcher watcher;
|
||||||
private Object repo_lock = new Object ();
|
private Object repo_lock = new Object ();
|
||||||
private Object check_repos_lock = new Object ();
|
private Object check_repos_lock = new Object ();
|
||||||
|
private List<string> skipped_avatars = new List<string> ();
|
||||||
|
private List<SparkleRepoBase> repositories = new List<SparkleRepoBase> ();
|
||||||
private bool lost_folders_path = false;
|
private bool lost_folders_path = false;
|
||||||
|
|
||||||
|
|
||||||
|
@ -247,7 +243,7 @@ namespace SparkleShare {
|
||||||
{
|
{
|
||||||
if (this.lost_folders_path) {
|
if (this.lost_folders_path) {
|
||||||
Program.UI.Bubbles.Controller.ShowBubble ("Where's your SparkleShare folder?",
|
Program.UI.Bubbles.Controller.ShowBubble ("Where's your SparkleShare folder?",
|
||||||
"Did you put it on a disattached drive?", null);
|
"Did you put it on a detached drive?", null);
|
||||||
|
|
||||||
Environment.Exit (-1);
|
Environment.Exit (-1);
|
||||||
}
|
}
|
||||||
|
@ -282,6 +278,105 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void ShowSetupWindow (PageType page_type)
|
||||||
|
{
|
||||||
|
ShowSetupWindowEvent (page_type);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void ShowAboutWindow ()
|
||||||
|
{
|
||||||
|
ShowAboutWindowEvent ();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void ShowEventLogWindow ()
|
||||||
|
{
|
||||||
|
ShowEventLogWindowEvent ();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void OpenSparkleShareFolder ()
|
||||||
|
{
|
||||||
|
OpenFolder (this.config.FoldersPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void OpenSparkleShareFolder (string name)
|
||||||
|
{
|
||||||
|
OpenFolder (new SparkleFolder (name).FullPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void ToggleNotifications ()
|
||||||
|
{
|
||||||
|
bool notifications_enabled = this.config.GetConfigOption ("notifications").Equals (bool.TrueString);
|
||||||
|
this.config.SetConfigOption ("notifications", (!notifications_enabled).ToString ());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void CheckRepositories ()
|
||||||
|
{
|
||||||
|
lock (this.check_repos_lock) {
|
||||||
|
string path = this.config.FoldersPath;
|
||||||
|
|
||||||
|
// Detect any renames
|
||||||
|
foreach (string folder_path in Directory.GetDirectories (path)) {
|
||||||
|
string folder_name = Path.GetFileName (folder_path);
|
||||||
|
|
||||||
|
if (folder_name.Equals (".tmp"))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (this.config.GetIdentifierForFolder (folder_name) == null) {
|
||||||
|
string identifier_file_path = Path.Combine (folder_path, ".sparkleshare");
|
||||||
|
|
||||||
|
if (!File.Exists (identifier_file_path))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
string identifier = File.ReadAllText (identifier_file_path).Trim ();
|
||||||
|
|
||||||
|
if (this.config.IdentifierExists (identifier)) {
|
||||||
|
RemoveRepository (folder_path);
|
||||||
|
this.config.RenameFolder (identifier, folder_name);
|
||||||
|
|
||||||
|
string new_folder_path = Path.Combine (path, folder_name);
|
||||||
|
AddRepository (new_folder_path);
|
||||||
|
|
||||||
|
SparkleLogger.LogInfo ("Controller",
|
||||||
|
"Renamed folder with identifier " + identifier + " to '" + folder_name + "'");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove any deleted folders
|
||||||
|
foreach (string folder_name in this.config.Folders) {
|
||||||
|
string folder_path = new SparkleFolder (folder_name).FullPath;
|
||||||
|
|
||||||
|
if (!Directory.Exists (folder_path)) {
|
||||||
|
this.config.RemoveFolder (folder_name);
|
||||||
|
RemoveRepository (folder_path);
|
||||||
|
|
||||||
|
SparkleLogger.LogInfo ("Controller", "Removed folder '" + folder_name + "' from config");
|
||||||
|
|
||||||
|
} else {
|
||||||
|
AddRepository (folder_path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove any duplicate folders
|
||||||
|
string previous_name = "";
|
||||||
|
foreach (string folder_name in this.config.Folders) {
|
||||||
|
if (!string.IsNullOrEmpty (previous_name) && folder_name.Equals (previous_name))
|
||||||
|
this.config.RemoveFolder (folder_name);
|
||||||
|
else
|
||||||
|
previous_name = folder_name;
|
||||||
|
}
|
||||||
|
|
||||||
|
FolderListChanged ();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private void AddRepository (string folder_path)
|
private void AddRepository (string folder_path)
|
||||||
{
|
{
|
||||||
SparkleRepoBase repo = null;
|
SparkleRepoBase repo = null;
|
||||||
|
@ -349,8 +444,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
repo.ConflictResolved += delegate {
|
repo.ConflictResolved += delegate {
|
||||||
if (NotificationsEnabled)
|
if (NotificationsEnabled)
|
||||||
AlertNotificationRaised ("Conflict detected",
|
AlertNotificationRaised ("Conflict happened", "Don't worry, we've made a copy of each conflicting file.");
|
||||||
"Don't worry, SparkleShare made a copy of each conflicting file.");
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.repositories.Add (repo);
|
this.repositories.Add (repo);
|
||||||
|
@ -364,123 +458,13 @@ namespace SparkleShare {
|
||||||
if (repo.LocalPath.Equals (folder_path)) {
|
if (repo.LocalPath.Equals (folder_path)) {
|
||||||
this.repositories.Remove (repo);
|
this.repositories.Remove (repo);
|
||||||
repo.Dispose ();
|
repo.Dispose ();
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void CheckRepositories ()
|
private void OnFolderActivity (object o, FileSystemEventArgs args)
|
||||||
{
|
|
||||||
lock (this.check_repos_lock) {
|
|
||||||
string path = this.config.FoldersPath;
|
|
||||||
|
|
||||||
// Detect any renames
|
|
||||||
foreach (string folder_path in Directory.GetDirectories (path)) {
|
|
||||||
string folder_name = Path.GetFileName (folder_path);
|
|
||||||
|
|
||||||
if (folder_name.Equals (".tmp"))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (this.config.GetIdentifierForFolder (folder_name) == null) {
|
|
||||||
string identifier_file_path = Path.Combine (folder_path, ".sparkleshare");
|
|
||||||
|
|
||||||
if (!File.Exists (identifier_file_path))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
string identifier = File.ReadAllText (identifier_file_path).Trim ();
|
|
||||||
|
|
||||||
if (this.config.IdentifierExists (identifier)) {
|
|
||||||
RemoveRepository (folder_path);
|
|
||||||
this.config.RenameFolder (identifier, folder_name);
|
|
||||||
|
|
||||||
string new_folder_path = Path.Combine (path, folder_name);
|
|
||||||
AddRepository (new_folder_path);
|
|
||||||
|
|
||||||
SparkleLogger.LogInfo ("Controller",
|
|
||||||
"Renamed folder with identifier " + identifier + " to '" + folder_name + "'");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove any deleted folders
|
|
||||||
foreach (string folder_name in this.config.Folders) {
|
|
||||||
string folder_path = new SparkleFolder (folder_name).FullPath;
|
|
||||||
|
|
||||||
if (!Directory.Exists (folder_path)) {
|
|
||||||
this.config.RemoveFolder (folder_name);
|
|
||||||
RemoveRepository (folder_path);
|
|
||||||
|
|
||||||
SparkleLogger.LogInfo ("Controller", "Removed folder '" + folder_name + "' from config");
|
|
||||||
|
|
||||||
} else {
|
|
||||||
AddRepository (folder_path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove any duplicate folders
|
|
||||||
string previous_name = "";
|
|
||||||
foreach (string folder_name in this.config.Folders) {
|
|
||||||
if (!string.IsNullOrEmpty (previous_name) && folder_name.Equals (previous_name))
|
|
||||||
this.config.RemoveFolder (folder_name);
|
|
||||||
else
|
|
||||||
previous_name = folder_name;
|
|
||||||
}
|
|
||||||
|
|
||||||
FolderListChanged ();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Fires events for the current syncing state
|
|
||||||
private void UpdateState ()
|
|
||||||
{
|
|
||||||
bool has_unsynced_repos = false;
|
|
||||||
|
|
||||||
foreach (SparkleRepoBase repo in Repositories) {
|
|
||||||
if (repo.Status == SyncStatus.SyncDown || repo.Status == SyncStatus.SyncUp || repo.IsBuffering) {
|
|
||||||
OnSyncing ();
|
|
||||||
return;
|
|
||||||
|
|
||||||
} else if (repo.HasUnsyncedChanges) {
|
|
||||||
has_unsynced_repos = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (has_unsynced_repos)
|
|
||||||
OnError ();
|
|
||||||
else
|
|
||||||
OnIdle ();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void ClearDirectoryAttributes (string path)
|
|
||||||
{
|
|
||||||
if (!Directory.Exists (path))
|
|
||||||
return;
|
|
||||||
|
|
||||||
string [] folders = Directory.GetDirectories (path);
|
|
||||||
|
|
||||||
foreach (string folder in folders)
|
|
||||||
ClearDirectoryAttributes (folder);
|
|
||||||
|
|
||||||
string [] files = Directory.GetFiles(path);
|
|
||||||
|
|
||||||
foreach (string file in files)
|
|
||||||
if (!IsSymlink (file))
|
|
||||||
File.SetAttributes (file, FileAttributes.Normal);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private bool IsSymlink (string file)
|
|
||||||
{
|
|
||||||
FileAttributes attributes = File.GetAttributes (file);
|
|
||||||
return ((attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void OnFolderActivity (object o, FileSystemEventArgs args)
|
|
||||||
{
|
{
|
||||||
if (args != null && args.FullPath.EndsWith (".xml") &&
|
if (args != null && args.FullPath.EndsWith (".xml") &&
|
||||||
args.ChangeType == WatcherChangeTypes.Created) {
|
args.ChangeType == WatcherChangeTypes.Created) {
|
||||||
|
@ -499,7 +483,7 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void HandleInvite (FileSystemEventArgs args)
|
private void HandleInvite (FileSystemEventArgs args)
|
||||||
{
|
{
|
||||||
if (this.fetcher != null &&
|
if (this.fetcher != null &&
|
||||||
this.fetcher.IsActive) {
|
this.fetcher.IsActive) {
|
||||||
|
@ -531,6 +515,28 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Fires events for the current syncing state
|
||||||
|
private void UpdateState ()
|
||||||
|
{
|
||||||
|
bool has_unsynced_repos = false;
|
||||||
|
|
||||||
|
foreach (SparkleRepoBase repo in Repositories) {
|
||||||
|
if (repo.Status == SyncStatus.SyncDown || repo.Status == SyncStatus.SyncUp || repo.IsBuffering) {
|
||||||
|
OnSyncing ();
|
||||||
|
return;
|
||||||
|
|
||||||
|
} else if (repo.HasUnsyncedChanges) {
|
||||||
|
has_unsynced_repos = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (has_unsynced_repos)
|
||||||
|
OnError ();
|
||||||
|
else
|
||||||
|
OnIdle ();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public void StartFetcher (string address, string required_fingerprint,
|
public void StartFetcher (string address, string required_fingerprint,
|
||||||
string remote_path, string announcements_url, bool fetch_prior_history)
|
string remote_path, string announcements_url, bool fetch_prior_history)
|
||||||
{
|
{
|
||||||
|
@ -567,7 +573,6 @@ namespace SparkleShare {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
this.fetcher.Finished += delegate (bool repo_is_encrypted, bool repo_is_empty, string [] warnings) {
|
this.fetcher.Finished += delegate (bool repo_is_encrypted, bool repo_is_empty, string [] warnings) {
|
||||||
if (repo_is_encrypted && repo_is_empty) {
|
if (repo_is_encrypted && repo_is_empty) {
|
||||||
ShowSetupWindowEvent (PageType.CryptoSetup);
|
ShowSetupWindowEvent (PageType.CryptoSetup);
|
||||||
|
@ -615,6 +620,12 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public bool CheckPassword (string password)
|
||||||
|
{
|
||||||
|
return this.fetcher.IsFetchedRepoPasswordCorrect (password);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public void FinishFetcher (string password)
|
public void FinishFetcher (string password)
|
||||||
{
|
{
|
||||||
this.fetcher.EnableFetchedRepoCrypto (password);
|
this.fetcher.EnableFetchedRepoCrypto (password);
|
||||||
|
@ -685,61 +696,13 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public bool CheckPassword (string password)
|
|
||||||
{
|
|
||||||
return this.fetcher.IsFetchedRepoPasswordCorrect (password);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void ShowSetupWindow (PageType page_type)
|
|
||||||
{
|
|
||||||
ShowSetupWindowEvent (page_type);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void ShowAboutWindow ()
|
|
||||||
{
|
|
||||||
ShowAboutWindowEvent ();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void ShowEventLogWindow ()
|
|
||||||
{
|
|
||||||
ShowEventLogWindowEvent ();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void OpenSparkleShareFolder ()
|
|
||||||
{
|
|
||||||
OpenFolder (this.config.FoldersPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void OpenSparkleShareFolder (string name)
|
|
||||||
{
|
|
||||||
OpenFolder (new SparkleFolder (name).FullPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void ToggleNotifications () {
|
|
||||||
bool notifications_enabled = this.config.GetConfigOption ("notifications").Equals (bool.TrueString);
|
|
||||||
this.config.SetConfigOption ("notifications", (!notifications_enabled).ToString ());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private List<string> skipped_avatars = new List<string> ();
|
|
||||||
|
|
||||||
public string GetAvatar (string email, int size)
|
public string GetAvatar (string email, int size)
|
||||||
{
|
{
|
||||||
ServicePointManager.ServerCertificateValidationCallback = GetAvatarValidationCallBack;
|
ServicePointManager.ServerCertificateValidationCallback = GetAvatarValidationCallBack;
|
||||||
|
|
||||||
string fetch_avatars_option = this.config.GetConfigOption ("fetch_avatars");
|
string fetch_avatars_option = this.config.GetConfigOption ("fetch_avatars");
|
||||||
|
|
||||||
if (fetch_avatars_option != null &&
|
if (fetch_avatars_option != null && fetch_avatars_option.Equals (bool.FalseString))
|
||||||
fetch_avatars_option.Equals (bool.FalseString)) {
|
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
|
||||||
|
|
||||||
email = email.ToLower ();
|
email = email.ToLower ();
|
||||||
|
|
||||||
|
@ -788,16 +751,24 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private bool GetAvatarValidationCallBack (Object sender, X509Certificate certificate,
|
public virtual void Quit ()
|
||||||
X509Chain chain, SslPolicyErrors errors)
|
{
|
||||||
|
foreach (SparkleRepoBase repo in Repositories)
|
||||||
|
repo.Dispose ();
|
||||||
|
|
||||||
|
Environment.Exit (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private bool GetAvatarValidationCallBack (Object sender,
|
||||||
|
X509Certificate certificate, X509Chain chain, SslPolicyErrors errors)
|
||||||
{
|
{
|
||||||
X509Certificate2 certificate2 = new X509Certificate2 (certificate.GetRawCertData ());
|
X509Certificate2 certificate2 = new X509Certificate2 (certificate.GetRawCertData ());
|
||||||
|
|
||||||
// On some systems (mostly Linux) we can't assume the needed certificates are
|
// On some systems (mostly Linux) we can't assume the needed certificates are
|
||||||
// available, so we have to check the certificate's SHA-1 fingerprint manually.
|
// available, so we have to check the certificate's SHA-1 fingerprint manually.
|
||||||
//
|
//
|
||||||
// Obtained from https://www.gravatar.com/ on Aug 18 2012 and
|
// Obtained from https://www.gravatar.com/ on Aug 18 2012 and expires on Oct 24 2015.
|
||||||
// expires on Oct 24 2015.
|
|
||||||
string gravatar_cert_fingerprint = "217ACB08C0A1ACC23A21B6ECDE82CD45E14DEC19";
|
string gravatar_cert_fingerprint = "217ACB08C0A1ACC23A21B6ECDE82CD45E14DEC19";
|
||||||
|
|
||||||
if (certificate2.Thumbprint.Equals (gravatar_cert_fingerprint)) {
|
if (certificate2.Thumbprint.Equals (gravatar_cert_fingerprint)) {
|
||||||
|
@ -810,12 +781,28 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public virtual void Quit ()
|
private void ClearDirectoryAttributes (string path)
|
||||||
{
|
{
|
||||||
foreach (SparkleRepoBase repo in Repositories)
|
if (!Directory.Exists (path))
|
||||||
repo.Dispose ();
|
return;
|
||||||
|
|
||||||
Environment.Exit (0);
|
string [] folders = Directory.GetDirectories (path);
|
||||||
|
|
||||||
|
foreach (string folder in folders)
|
||||||
|
ClearDirectoryAttributes (folder);
|
||||||
|
|
||||||
|
string [] files = Directory.GetFiles(path);
|
||||||
|
|
||||||
|
foreach (string file in files)
|
||||||
|
if (!IsSymlink (file))
|
||||||
|
File.SetAttributes (file, FileAttributes.Normal);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private bool IsSymlink (string file)
|
||||||
|
{
|
||||||
|
FileAttributes attributes = File.GetAttributes (file);
|
||||||
|
return ((attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,29 +33,20 @@ namespace SparkleShare {
|
||||||
if (File.Exists (key_file_path)) {
|
if (File.Exists (key_file_path)) {
|
||||||
SparkleLogger.LogInfo ("Auth", "A key pair exists ('" + key_name + "'), leaving it untouched");
|
SparkleLogger.LogInfo ("Auth", "A key pair exists ('" + key_name + "'), leaving it untouched");
|
||||||
return new string [] { key_file_path, key_file_path + ".pub" };
|
return new string [] { key_file_path, key_file_path + ".pub" };
|
||||||
|
|
||||||
} else {
|
|
||||||
if (!Directory.Exists (output_path))
|
|
||||||
Directory.CreateDirectory (output_path);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Process process = new Process ();
|
|
||||||
|
|
||||||
process.StartInfo.FileName = "ssh-keygen";
|
|
||||||
process.StartInfo.WorkingDirectory = output_path;
|
|
||||||
process.StartInfo.UseShellExecute = false;
|
|
||||||
process.StartInfo.CreateNoWindow = true;
|
|
||||||
|
|
||||||
string computer_name = System.Net.Dns.GetHostName ();
|
string computer_name = System.Net.Dns.GetHostName ();
|
||||||
|
|
||||||
if (computer_name.EndsWith (".local"))
|
if (computer_name.EndsWith (".local"))
|
||||||
computer_name = computer_name.Substring (0, computer_name.Length - 6);
|
computer_name = computer_name.Substring (0, computer_name.Length - 6);
|
||||||
|
|
||||||
process.StartInfo.Arguments = "-t rsa " + // crypto type
|
string arguments = "-t rsa " + // crypto type
|
||||||
"-P \"\" " + // empty password
|
"-P \"\" " + // empty password
|
||||||
"-C \"" + computer_name + "\" " + // key comment
|
"-C \"" + computer_name + "\" " + // key comment
|
||||||
"-f \"" + key_name + "\""; // file name
|
"-f \"" + key_name + "\""; // file name
|
||||||
|
|
||||||
|
SparkleKeyProcess process = new SparkleKeyProcess ("ssh-keygen", arguments);
|
||||||
|
process.StartInfo.WorkingDirectory = output_path;
|
||||||
process.Start ();
|
process.Start ();
|
||||||
process.WaitForExit ();
|
process.WaitForExit ();
|
||||||
|
|
||||||
|
@ -70,14 +61,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
public static void ImportPrivateKey (string key_file_path)
|
public static void ImportPrivateKey (string key_file_path)
|
||||||
{
|
{
|
||||||
Process process = new Process ();
|
SparkleKeyProcess process = new SparkleKeyProcess ("ssh-add", "\"" + key_file_path + "\"");
|
||||||
|
|
||||||
process.StartInfo.FileName = "ssh-add";
|
|
||||||
process.StartInfo.Arguments = "\"" + key_file_path + "\"";
|
|
||||||
process.StartInfo.UseShellExecute = false;
|
|
||||||
process.StartInfo.CreateNoWindow = true;
|
|
||||||
process.StartInfo.RedirectStandardError = true;
|
|
||||||
|
|
||||||
process.Start ();
|
process.Start ();
|
||||||
process.WaitForExit ();
|
process.WaitForExit ();
|
||||||
|
|
||||||
|
@ -90,23 +74,26 @@ namespace SparkleShare {
|
||||||
|
|
||||||
public static void ListPrivateKeys ()
|
public static void ListPrivateKeys ()
|
||||||
{
|
{
|
||||||
Process process = new Process ();
|
SparkleKeyProcess process = new SparkleKeyProcess ("ssh-add", "-l");
|
||||||
|
|
||||||
process.StartInfo.FileName = "ssh-add";
|
|
||||||
process.StartInfo.Arguments = "-l";
|
|
||||||
process.StartInfo.UseShellExecute = false;
|
|
||||||
process.StartInfo.RedirectStandardOutput = true;
|
|
||||||
process.StartInfo.CreateNoWindow = true;
|
|
||||||
|
|
||||||
process.Start ();
|
process.Start ();
|
||||||
|
|
||||||
// Reading the standard output HAS to go before
|
|
||||||
// WaitForExit, or it will hang forever on output > 4096 bytes
|
|
||||||
string keys_in_use = process.StandardOutput.ReadToEnd ();
|
string keys_in_use = process.StandardOutput.ReadToEnd ();
|
||||||
process.WaitForExit ();
|
process.WaitForExit ();
|
||||||
|
|
||||||
SparkleLogger.LogInfo ("Auth", "The following keys may be used: " +
|
SparkleLogger.LogInfo ("Auth", "The following keys may be used:\n" + keys_in_use.Trim ());
|
||||||
Environment.NewLine + keys_in_use.Trim ());
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private class SparkleKeyProcess : Process {
|
||||||
|
|
||||||
|
public SparkleKeyProcess (string command, string arguments) : base ()
|
||||||
|
{
|
||||||
|
StartInfo.FileName = command;
|
||||||
|
StartInfo.Arguments = arguments;
|
||||||
|
StartInfo.UseShellExecute = false;
|
||||||
|
StartInfo.RedirectStandardOutput = true;
|
||||||
|
StartInfo.RedirectStandardError = true;
|
||||||
|
StartInfo.CreateNoWindow = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue