icedream
/
citizenmp-server-updater
mirror of https://github.com/icedream/citizenmp-server-updater.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoiding external shell call by replacing it with pure C#-generated input. This also makes certmgr go quiet.

release-1.0.0
Icedream 2015-01-12 06:11:03 +01:00
parent 8d906642d9
commit a88fe6f109
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/updater/Program.cs
View File

@ -317,12 +317,19 @@ namespace CitizenMP.Server.Installer
{ {
try try
{ {
var automaticYesResponder = new Action<string, StreamWriter>((s, writer) =>
{
if (s == null || !s.Contains("X.509 Certificate"))
return;
writer.WriteLine("y");
});
// TODO: Make sure this does not fail out by checking if mozroots is installed // TODO: Make sure this does not fail out by checking if mozroots is installed
Console.WriteLine("Updating SSL certificates for NuGet..."); Console.WriteLine("Updating SSL certificates for NuGet...");
Run("mozroots", "--import --sync --quiet"); Run("mozroots", "--import --sync --quiet");
Run("sh", "-c \"yes y 2>/dev/null | certmgr -ssl https://go.microsoft.com\" 2>/dev/null"); Run("certmgr", "-ssl https://go.microsoft.com", automaticYesResponder);
Run("sh", "-c \"yes y 2>/dev/null | certmgr -ssl https://nugetgallery.blob.core.windows.net\" 2>/dev/null"); Run("certmgr", "-ssl https://nugetgallery.blob.core.windows.net", automaticYesResponder);
Run("sh", "-c \"yes y 2>/dev/null | certmgr -ssl https://nuget.org\" 2>/dev/null"); Run("certmgr", "-ssl https://nuget.org", automaticYesResponder);
} }
catch (Exception error) catch (Exception error)
{ {
@ -381,24 +388,35 @@ namespace CitizenMP.Server.Installer
} }
} }
private static void Run(string name, string args) private static void Run(string name, string args, Action<string, StreamWriter> lineProcessor = null)
{ {
var p = new Process using (var p = Process.Start(new ProcessStartInfo {
{
StartInfo =
{
Arguments = args, Arguments = args,
FileName = name, FileName = name,
UseShellExecute = false, UseShellExecute = false,
CreateNoWindow = true CreateNoWindow = true,
} RedirectStandardInput = lineProcessor != null,
}; RedirectStandardOutput = lineProcessor != null
p.Start(); }))
p.WaitForExit();
if (p.ExitCode != 0)
{ {
throw new Exception(String.Format("Process \"{0} {1}\" exited with error code {2}", name, args, if (lineProcessor == null)
p.ExitCode)); {
p.WaitForExit();
}
else
{
while (!p.HasExited)
{
string line = p.StandardOutput.ReadLine();
lineProcessor.Invoke(line, p.StandardInput);
}
}
if (p.ExitCode != 0)
{
throw new Exception(string.Format("Process \"{0} {1}\" exited with error code {2}",
name, args, p.ExitCode));
}
} }
} }