Merge v0.17.5 to master branch

Author: atauenis

ConfigFile.cs

@@ -198,6 +198,11 @@ static class ConfigFile
 		/// </summary>
 		public static bool EnableWebFtp = true;
 
+		/// <summary>
+		/// Enable or disable file type icons in Web-FTP client
+		/// </summary>
+		public static bool ShowFileIcons = true;
+
 		/// <summary>
 		/// Use Microsoft HTTPAPI (HttpListener) for processing incoming traffic
 		/// </summary>
@@ -223,6 +228,28 @@ static class ConfigFile
 		/// </summary>
 		public static bool OpenForLocalIPs = false;
 
+		/// <summary>
+		/// Do not prefer HTTPS protocol even for HTTPS connections
+		/// </summary>
+		public static bool DontPreferHTTPS = false;
+
+
+
+		/// <summary>
+		/// Enable emulation of Microsoft ActiveX components search engine (MSICD)
+		/// </summary>
+		public static bool ActivexGalleryEmulation = true;
+
+		/// <summary>
+		/// Emulate Microsoft ActiveX components search engine (MSICD) at URLs
+		/// </summary>
+		public static List<string> ActivexGalleryUrls = new();
+
+		/// <summary>
+		/// Database of OLE Controls, DirectShow Codecs, etc, servicing by http://activex.microsoft.com/objects/ocget.dll (MSICD)
+		/// </summary>
+		public static Dictionary<string, string> ActivexGalleryCLSIDs = new();
+
 
 
 		/// <summary>

ConfigFileLoader.cs

@@ -291,6 +291,9 @@ public static void ProcessConfiguration()
 								case "EnableWebFtp":
 									ConfigFile.EnableWebFtp = ToBoolean(Option.Value);
 									break;
+								case "ShowFileIcons":
+									ConfigFile.ShowFileIcons = ToBoolean(Option.Value);
+									break;
 								case "UseMsHttpApi":
 									ConfigFile.UseMsHttpApi = ToBoolean(Option.Value);
 									break;
@@ -307,6 +310,9 @@ public static void ProcessConfiguration()
 									else
 										Log.WriteLine(true, false, "Warning: Incorrect ContentDirectory '{0}'.", ContentDirName);
 									break;
+								case "DontPreferHTTPS":
+									ConfigFile.DontPreferHTTPS = ToBoolean(Option.Value);
+									break;
 								default:
 									Log.WriteLine(true, false, "Warning: Unknown server option {0} in {1}.", Option.Key, Option.Location);
 									break;
@@ -595,6 +601,61 @@ public static void ProcessConfiguration()
 							ConfigFile.Http10Only.Add(Line.RawString);
 						}
 						break;
+					case "ActivexGallery":
+					case "ActiveXGallery":
+						foreach (ConfigFileOption Line in Section.Options)
+						{
+							if (Line.HaveKeyValue)
+							{
+								if (Line.Key.ToLowerInvariant() == "ActiveXGalleryEmulation".ToLowerInvariant())
+								{
+									//Enable/Disable
+									ConfigFile.ActivexGalleryEmulation = ToBoolean(Line.Value);
+								}
+								else
+								{
+									//Component information
+									string CLSIDString = Line.Key.Replace("{", "").Replace("}", "").ToUpperInvariant();
+
+									if (!System.Text.RegularExpressions.Regex.IsMatch(CLSIDString.ToLowerInvariant(), "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"))
+									{
+										if (!System.Text.RegularExpressions.Regex.IsMatch(CLSIDString.ToLowerInvariant(), @"[a-z0-9.\-_]*/[a-z0-9.\-_]"))
+										{
+											Log.WriteLine(true, false, "Warning: Incorrect Internet Component GUID or type at {0}.", Line.Location);
+											continue;
+										}
+									}
+
+									if (Line.Key.EndsWith(",latest"))
+									{
+										//CLSID,latest (latest version of corresponding component)
+										string VersionString = Line.Value.Replace(',', '.');
+										if (!Version.TryParse(VersionString, out Version Ver))
+										{
+											Log.WriteLine(true, false, "Warning: Incorrect Internet Component latest version at {0}.", Line.Location);
+											continue;
+										}
+
+										if (ConfigFile.ActivexGalleryCLSIDs.ContainsKey(CLSIDString)) ConfigFile.ActivexGalleryCLSIDs.Remove(CLSIDString); // allow overwrite it
+										ConfigFile.ActivexGalleryCLSIDs.Add(CLSIDString, VersionString);
+										continue;
+									}
+									//CLSID or CLSID,language (path to corresponding MSICD CAB file)
+									if (ConfigFile.ActivexGalleryCLSIDs.ContainsKey(CLSIDString)) ConfigFile.ActivexGalleryCLSIDs.Remove(CLSIDString); // allow overwrite it
+									ConfigFile.ActivexGalleryCLSIDs.Add(CLSIDString, Line.Value);
+								}
+							}
+							else if (System.Text.RegularExpressions.Regex.IsMatch(Line.RawString, "^http://"))
+							{
+								//Codebase search engine URL
+								ConfigFile.ActivexGalleryUrls.Add(Line.RawString);
+							}
+							else
+							{
+								Log.WriteLine(true, false, "Warning: Incorrect Microsoft codebase search engine option at {0}.", Line.Location);
+							}
+						}
+						break;
 					case "FixableURL":
 					case "FixableType":
 					case "ContentPatch":

FtpClientGUI.cs

@@ -20,6 +20,8 @@ internal class FtpClientGUI
 
 		int ClientID = 0;
 
+		bool EnableIcons = ConfigFile.ShowFileIcons;
+
 		/// <summary>
 		/// Create an instance of Web-FTP client GUI
 		/// </summary>
@@ -28,6 +30,14 @@ public FtpClientGUI(HttpRequest ClientRequest)
 		{
 			this.ClientRequest = ClientRequest;
 			RequestArguments = System.Web.HttpUtility.ParseQueryString(ClientRequest.Url.Query);
+
+			if(EnableIcons)
+			{
+				if (!File.Exists(ConfigFile.ContentDirectory + "/filetypes/_dir.gif")) EnableIcons = false;
+				if (!File.Exists(ConfigFile.ContentDirectory + "/filetypes/_dir-up.gif")) EnableIcons = false;
+				if (!File.Exists(ConfigFile.ContentDirectory + "/filetypes/_file.gif")) EnableIcons = false;
+				if (!File.Exists(ConfigFile.ContentDirectory + "/filetypes/_link.gif")) EnableIcons = false;
+			}
 		}
 
 		/// <summary>
@@ -86,14 +96,15 @@ public FtpClientPage GetWelcomePage()
 
 			Page.Header = "File Transfer Protocol client";
 			Page.Content = "<p>Welcome to space of computer files, directories and servers. Here you'll be able to download something to your PC from FTP servers without quitting a web browser.</p>";
+			Page.HtmlHeaders += "\n<style>.formlabel { width: 80px; display: inline-block; display:-moz-inline-block; display:-moz-inline-stack; text-align: right; }</style>";
 
 			string Form =
 			"<form action=\"/!ftp/\" method=\"GET\" name=\"Connect\">\n" +
 			"<center><input type=\"hidden\" name=\"client\" value=\"-1\">\n" +
-			"<p>Server: <input type=\"text\" size=\"23\" name=\"server\" value=\"\"><br>\n" +
-			"or URI: <input type=\"text\" size=\"23\" name=\"uri\" value=\"\"></p>\n" +
-			"<p>Username: <input type=\"text\" size=\"20\" name=\"user\" value=\"anonymous\"><br>\n" +
-			"Password: <input type=\"password\" size=\"20\" name=\"pass\"value=\"user@domain.su\"></p>\n" +
+			"<p><label class=\"formlabel\" for=\"server\">Server:</label> <input type=\"text\" size=\"23\" name=\"server\" id=\"server\" value=\"\"><br>\n" +
+			"<label class=\"formlabel\" for=\"uri\">or URI:</label> <input type=\"text\" size=\"23\" name=\"uri\" id=\"uri\" value=\"\"></p>\n" +
+			"<p><label class=\"formlabel\" for=\"user\">Username:</label> <input type=\"text\" size=\"20\" name=\"user\" id=\"user\" value=\"anonymous\"><br>\n" +
+			"<label class=\"formlabel\" for=\"pass\">Password:</label> <input type=\"password\" size=\"20\" name=\"pass\" id=\"pass\" value=\"user@domain.su\"></p>\n" +
 			"<p><input type=\"submit\" value=\"Let's go!\"></p>\n" +
 			"</center></form>";
 
@@ -228,7 +239,7 @@ public FtpClientPage GetResultPage()
 					if (cmd.Code != 257)
 					{
 						Page.Content += "<p><b>&quot;Print Working Directory&quot; command has returned an unexpected result:</b> " + cmd.ToString() + "</p>";
-						Page.Content += "<p>Return to <a href=\"/!ftp/\"><b>start page</b></a> and try to connect again.</p>";
+						Page.Content += "<p>Reload this page or return to <a href=\"/!ftp/\"><b>start page</b></a> and try to connect again.</p>";
 						return Page;
 					}
 
@@ -321,6 +332,7 @@ public FtpClientPage GetResultPage()
 					{
 						Page.Content += "<tr>";
 						Page.Content += "<td>";
+						if (EnableIcons) Page.Content += "<img border=\"0\" src=\"" + GetIconFileName("._dir-up") + "\" width=\"16px\" height=\"16px\" class=\"fileicon\"> ";
 						Page.Content += "[<a href=\"/!ftp/?client=" + ClientID + "&task=listdir&cwd=" + Uri.EscapeDataString(Backend.WorkdirPath + "..") + "\">..</a>]";
 						Page.Content += "</td>";
 						Page.Content += "<td>";
@@ -332,23 +344,34 @@ public FtpClientPage GetResultPage()
 					foreach (var Item in FileListTable)
 					{
 						string FileName = Item.Name;
+						string IconHtml = "";
+
+						if (EnableIcons)
+						{
+							if (Item.Directory) IconHtml = "<img border=\"0\" src=\"" + GetIconFileName("._dir") + "\" width=\"16px\" height=\"16px\" class=\"fileicon\"> ";
+							else IconHtml = "<img border=\"0\" src=\"" + GetIconFileName(FileName) + "\" width=\"16px\" height=\"16px\" class=\"fileicon\"> ";
+						}
 
 						Page.Content += "<tr>";
 						Page.Content += "<td>";
 						if (Item.Directory && !Item.SymLink)
 						{
+							Page.Content += IconHtml;
 							Page.Content += "[<a href=\"/!ftp/?client=" + ClientID + "&task=listdir&cwd=" + Uri.EscapeDataString(Backend.WorkdirPath + FileName) + "\">" + FileName + "</a>]";
 						}
 						else if (Item.Directory && Item.SymLink)
 						{
+							if (EnableIcons) Page.Content += "<img border=\"0\" src=\"" + GetIconFileName("._link") + "\" width=\"16px\" height=\"16px\" class=\"fileicon\"> ";
 							Page.Content += "<i>[" + FileName + "]</i>";
 						}
 						else if (!Item.Directory && Item.SymLink)
 						{
+							if (EnableIcons) Page.Content += "<img border=\"0\" src=\"" + GetIconFileName("._link") + "\" width=\"16px\" height=\"16px\" class=\"fileicon\"> ";
 							Page.Content += "<i>" + FileName + "</i>";
 						}
 						else
 						{
+							Page.Content += IconHtml;
 							Page.Content += "<a href=\"/!ftp/?client=" + ClientID + "&task=retr&name=" + Uri.EscapeDataString(Backend.WorkdirPath + FileName) + "\" target='_blank'>" + FileName + "</a>";
 						}
 						Page.Content += "</td>";
@@ -463,6 +486,35 @@ public FtpClientPage GetDisabledPage()
 			Page.Content = "The server administrator has disabled FTP browsing via this proxy.";
 			return Page;
 		}
+
+		/// <summary>
+		/// Get content file name for icon, describing the file in Web-FTP directory listing
+		/// </summary>
+		/// <param name="OriginalFileName">File name on remote FTP server</param>
+		string GetIconFileName(string OriginalFileName)
+		{
+			if (!EnableIcons) throw new InvalidOperationException("File type icons are disabled.");
+			if (!OriginalFileName.Contains('.'))
+			{
+				return "/filetypes/_file.gif";
+			}
+			string ext = OriginalFileName.Substring(OriginalFileName.LastIndexOf(".") + 1);
+			if (string.IsNullOrWhiteSpace(ext))
+			{
+				return "/filetypes/_file.gif";
+			}
+			else
+			{
+				try
+				{
+					if (File.Exists(ConfigFile.ContentDirectory + "/filetypes/" + ext + ".gif"))
+						return "/filetypes/" + ext + ".gif";
+					else
+						return "/filetypes/_file.gif";
+				}
+				catch { return "/filetypes/_file.gif"; }
+			}
+		}
 	}
 
 	/// <summary>
@@ -483,7 +535,7 @@ public FtpClientPage(string Title = "WebOne: FTP client", string Header = "File
 			this.Content = Content;
 			this.ShowFooter = false;
 			this.AddCss = false;
-			this.HtmlHeaders = @"<link href=""/webone.css"" rel=""stylesheet""/><link rel=""shortcut icon"" href=""/ftpfav.ico"" type=""image/x-icon"">";
+			this.HtmlHeaders = "<link href=\"/webone.css\" rel=\"stylesheet\"/>\n<link rel=\"shortcut icon\" href=\"/ftpfav.ico\" type=\"image/x-icon\">";
 		}
 	}
 }

HttpOperation.cs

@@ -23,6 +23,11 @@ class HttpOperation
 		/// </summary>
 		internal string Method { get; set; }
 
+		/// <summary>
+		/// Use HTTPS protocol for this operation
+		/// </summary>
+		internal bool SecureConnection { get; set; }
+
 		/// <summary>
 		/// Full HTTP client request
 		/// </summary>
@@ -57,6 +62,7 @@ class HttpOperation
 		internal HttpOperation(LogWriter Log)
 		{
 			this.Log = Log;
+			this.SecureConnection = false;
 		}
 
 		/// <summary>
@@ -124,7 +130,7 @@ internal void SendRequest()
 
 			foreach (string SslHost in ConfigFile.ForceHttps)
 			{
-				if (Request.RequestUri.Host.StartsWith(SslHost))
+				if (Request.RequestUri.Host.StartsWith(SslHost) || SecureConnection)
 				{
 					UriBuilder ub = new(Request.RequestUri);
 					ub.Scheme = "https";
@@ -134,6 +140,7 @@ internal void SendRequest()
 #if DEBUG
 					Log.WriteLine(" Willfully secure request.");
 #endif
+					break;
 				}
 			}