Skip to content

Commit

Permalink
New: Dynamic URL's
Browse files Browse the repository at this point in the history 
If a PowerShell URL returns "<skip>", the File will be ignored. This will allow multiple URLs (e.g. based on Language)
  • Loading branch information
@rzander
rzander committed May 11, 2021
1 parent f086c25 commit 5b534ba
Show file tree
Hide file tree
Showing 3 changed files with 206 additions and 179 deletions.
187 changes: 100 additions & 87 deletions RZ.Base/RZUpdate.cs
View file
Expand Up @@ -694,7 +694,7 @@ public bool _DownloadFile2(string URL, string FileName, long FileSize = 0)
Int64 ioldProgress = 0;
Int64 iProgress = 0;

if (URL.StartsWith("http"))
if (URL.StartsWith("http", StringComparison.CurrentCultureIgnoreCase))
{
//_DownloadFile(URL, FileName).Result.ToString();
var httpRequest = (HttpWebRequest)WebRequest.Create(URL);
Expand All @@ -708,7 +708,7 @@ public bool _DownloadFile2(string URL, string FileName, long FileSize = 0)
ResponseStream = Response.GetResponseStream();
}

if (URL.StartsWith("ftp"))
if (URL.StartsWith("ftp", StringComparison.CurrentCultureIgnoreCase))
{
var ftpRequest = (FtpWebRequest)WebRequest.Create(URL);
ftpRequest.ContentLength.ToString();
Expand All @@ -722,6 +722,12 @@ public bool _DownloadFile2(string URL, string FileName, long FileSize = 0)
ContentLength = Response.ContentLength;
}

if (URL.StartsWith("<skip>", StringComparison.CurrentCultureIgnoreCase))
{
DLProgress(100, EventArgs.Empty);
return true;
}

if (ResponseStream == null)
return false;

Expand Down Expand Up @@ -1329,7 +1335,6 @@ private bool _Download(bool Enforce, string DLPath)

if (!_DownloadFile2(vFile.URL, sFile, vFile.FileSize))
{

downloadTask.Error = true;
downloadTask.PercentDownloaded = 0;
downloadTask.ErrorMessage = "ERROR: download failed... " + vFile.FileName;
Expand Down Expand Up @@ -1360,108 +1365,116 @@ private bool _Download(bool Enforce, string DLPath)
//Only Check Hash if downloaded
if (!string.IsNullOrEmpty(vFile.FileHash) && bDownload)
{
if (string.IsNullOrEmpty(vFile.HashType))
vFile.HashType = "MD5";

//Check if there is a File
long iFileSize = 0;
try
if (!vFile.URL.StartsWith("http", StringComparison.InvariantCultureIgnoreCase) && !File.Exists(sFile))
{
FileInfo fi = new FileInfo(sFile);
iFileSize = fi.Length;
}
catch { }

if (iFileSize == 0)
{
downloadTask.Error = true;
downloadTask.PercentDownloaded = 0;
downloadTask.ErrorMessage = "ERROR: empty File... " + vFile.FileName;
Console.WriteLine("ERROR: empty File... " + vFile.FileName);
ProgressDetails(downloadTask, EventArgs.Empty);
File.Delete(sFile);
return false;
}
downloadTask.PercentDownloaded = 100;
downloadTask.Error = false;
}
else
{
if (string.IsNullOrEmpty(vFile.HashType))
vFile.HashType = "MD5";


//Check default MD5 Hash
if (vFile.HashType.ToUpper() == "MD5")
//Check if there is a File
long iFileSize = 0;
try
{
if (!_checkFileMd5(sFile, vFile.FileHash))
{
downloadTask.Error = true;
downloadTask.PercentDownloaded = 0;
downloadTask.ErrorMessage = "ERROR: Hash mismatch on File " + vFile.FileName;
Console.WriteLine("ERROR: Hash mismatch on File " + vFile.FileName);
File.Delete(sFile);
if (SendFeedback)
RZRestAPIv2.Feedback(SW.ProductName, SW.ProductVersion, SW.Manufacturer, "false", System.Reflection.Assembly.GetExecutingAssembly().GetName().Name, "Hash mismatch").ConfigureAwait(false);
bError = true;
}
else
{
downloadTask.PercentDownloaded = 100;
}
FileInfo fi = new FileInfo(sFile);
iFileSize = fi.Length;
}
catch { }

//Check default SHA1 Hash
if (vFile.HashType.ToUpper() == "SHA1")
if (iFileSize == 0)
{
if (!_checkFileSHA1(sFile, vFile.FileHash))
{
downloadTask.Error = true;
downloadTask.PercentDownloaded = 0;
downloadTask.ErrorMessage = "ERROR: Hash mismatch on File " + vFile.FileName;
Console.WriteLine("ERROR: Hash mismatch on File " + vFile.FileName);
File.Delete(sFile);
if (SendFeedback)
RZRestAPIv2.Feedback(SW.ProductName, SW.ProductVersion, SW.Manufacturer, "false", System.Reflection.Assembly.GetExecutingAssembly().GetName().Name, "Hash mismatch", RZRestAPIv2.CustomerID).ConfigureAwait(false);
bError = true;
}
else
{
downloadTask.PercentDownloaded = 100;
}
downloadTask.Error = true;
downloadTask.PercentDownloaded = 0;
downloadTask.ErrorMessage = "ERROR: empty File... " + vFile.FileName;
Console.WriteLine("ERROR: empty File... " + vFile.FileName);
ProgressDetails(downloadTask, EventArgs.Empty);
File.Delete(sFile);
return false;
}

//Check default SHA256 Hash
if (vFile.HashType.ToUpper() == "SHA256")
else
{
if (!_checkFileSHA256(sFile, vFile.FileHash))


//Check default MD5 Hash
if (vFile.HashType.ToUpper() == "MD5")
{
downloadTask.Error = true;
downloadTask.PercentDownloaded = 0;
downloadTask.ErrorMessage = "ERROR: Hash mismatch on File " + vFile.FileName;
Console.WriteLine("ERROR: Hash mismatch on File " + vFile.FileName);
File.Delete(sFile);
if (SendFeedback)
RZRestAPIv2.Feedback(SW.ProductName, SW.ProductVersion, SW.Manufacturer, "false", System.Reflection.Assembly.GetExecutingAssembly().GetName().Name, "Hash mismatch", RZRestAPIv2.CustomerID).ConfigureAwait(false);
bError = true;
if (!_checkFileMd5(sFile, vFile.FileHash))
{
downloadTask.Error = true;
downloadTask.PercentDownloaded = 0;
downloadTask.ErrorMessage = "ERROR: Hash mismatch on File " + vFile.FileName;
Console.WriteLine("ERROR: Hash mismatch on File " + vFile.FileName);
File.Delete(sFile);
if (SendFeedback)
RZRestAPIv2.Feedback(SW.ProductName, SW.ProductVersion, SW.Manufacturer, "false", System.Reflection.Assembly.GetExecutingAssembly().GetName().Name, "Hash mismatch").ConfigureAwait(false);
bError = true;
}
else
{
downloadTask.PercentDownloaded = 100;
}
}
else

//Check default SHA1 Hash
if (vFile.HashType.ToUpper() == "SHA1")
{
downloadTask.PercentDownloaded = 100;
if (!_checkFileSHA1(sFile, vFile.FileHash))
{
downloadTask.Error = true;
downloadTask.PercentDownloaded = 0;
downloadTask.ErrorMessage = "ERROR: Hash mismatch on File " + vFile.FileName;
Console.WriteLine("ERROR: Hash mismatch on File " + vFile.FileName);
File.Delete(sFile);
if (SendFeedback)
RZRestAPIv2.Feedback(SW.ProductName, SW.ProductVersion, SW.Manufacturer, "false", System.Reflection.Assembly.GetExecutingAssembly().GetName().Name, "Hash mismatch", RZRestAPIv2.CustomerID).ConfigureAwait(false);
bError = true;
}
else
{
downloadTask.PercentDownloaded = 100;
}
}
}

if (vFile.HashType.ToUpper() == "X509")
{
if (!_checkFileX509(sFile, vFile.FileHash))
//Check default SHA256 Hash
if (vFile.HashType.ToUpper() == "SHA256")
{
downloadTask.Error = true;
downloadTask.PercentDownloaded = 0;
downloadTask.ErrorMessage = "ERROR: Signature mismatch on File " + vFile.FileName;
Console.WriteLine("ERROR: Signature mismatch on File " + vFile.FileName);
File.Delete(sFile);
if (SendFeedback)
RZRestAPIv2.Feedback(SW.ProductName, SW.ProductVersion, SW.Manufacturer, "false", System.Reflection.Assembly.GetExecutingAssembly().GetName().Name, "Signature mismatch", RZRestAPIv2.CustomerID).ConfigureAwait(false);
bError = true;
if (!_checkFileSHA256(sFile, vFile.FileHash))
{
downloadTask.Error = true;
downloadTask.PercentDownloaded = 0;
downloadTask.ErrorMessage = "ERROR: Hash mismatch on File " + vFile.FileName;
Console.WriteLine("ERROR: Hash mismatch on File " + vFile.FileName);
File.Delete(sFile);
if (SendFeedback)
RZRestAPIv2.Feedback(SW.ProductName, SW.ProductVersion, SW.Manufacturer, "false", System.Reflection.Assembly.GetExecutingAssembly().GetName().Name, "Hash mismatch", RZRestAPIv2.CustomerID).ConfigureAwait(false);
bError = true;
}
else
{
downloadTask.PercentDownloaded = 100;
}
}
else

if (vFile.HashType.ToUpper() == "X509")
{
downloadTask.PercentDownloaded = 100;
if (!_checkFileX509(sFile, vFile.FileHash))
{
downloadTask.Error = true;
downloadTask.PercentDownloaded = 0;
downloadTask.ErrorMessage = "ERROR: Signature mismatch on File " + vFile.FileName;
Console.WriteLine("ERROR: Signature mismatch on File " + vFile.FileName);
File.Delete(sFile);
if (SendFeedback)
RZRestAPIv2.Feedback(SW.ProductName, SW.ProductVersion, SW.Manufacturer, "false", System.Reflection.Assembly.GetExecutingAssembly().GetName().Name, "Signature mismatch", RZRestAPIv2.CustomerID).ConfigureAwait(false);
bError = true;
}
else
{
downloadTask.PercentDownloaded = 100;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion RuckZuck_Tool/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5b534ba

Please sign in to comment.