From 9be5cda187385d09ec6e57f5c21948ca2cf54a62 Mon Sep 17 00:00:00 2001 From: Alexandre Aufrere Date: Sat, 28 Dec 2019 11:27:08 +0100 Subject: [PATCH] - Fixing behaviour of RenewalDelay and HTTPPort options - Changing the Evertrust logo - Updating version number --- MSIPackaging/Properties/AssemblyInfo.cs | 4 ++-- MSIPackaging/Resources/background.png | Bin 25014 -> 3430 bytes MSIPackaging/Script.cs | 2 +- WinCertes/Config/IConfig.cs | 9 +++++++++ WinCertes/Config/RegistryConfig.cs | 14 ++++++++++++++ WinCertes/Program.cs | 6 +++--- WinCertes/Properties/AssemblyInfo.cs | 4 ++-- 7 files changed, 31 insertions(+), 8 deletions(-) diff --git a/MSIPackaging/Properties/AssemblyInfo.cs b/MSIPackaging/Properties/AssemblyInfo.cs index e48938d..29f1723 100644 --- a/MSIPackaging/Properties/AssemblyInfo.cs +++ b/MSIPackaging/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.6.0")] -[assembly: AssemblyFileVersion("1.1.6.0")] +[assembly: AssemblyVersion("1.1.7.0")] +[assembly: AssemblyFileVersion("1.1.7.0")] diff --git a/MSIPackaging/Resources/background.png b/MSIPackaging/Resources/background.png index aa4a4b10d4ae85fe3d2a06fa473a9fca3cd4ab1d..60c2e364a797ad18c964db67de4ef1e081e7a0e1 100644 GIT binary patch literal 3430 zcmeHKc~lbE9>$!)8P~F0G9$~WOiRtw%!R^A$*ob-Ow-I%9KsbtMa3pcO@kRJEmLWp zsZZ0K+!!?^R|eP8)NlcV5EBq_8BstU_0F94{&;`9|KB_J{LXiN-@U)PeCM8Xzngv0 z(?$Ke-QNKK0ClMAS#JP9NuY?6Dq9rH`u7eN3ivkGH6Q^1ICkJmC?%DFZz)J166$dd z$X46)9dL^|yP-fq=_AiwMmonJ5aH2CfOC9!C^G!UK2#JEw$BCXanb*_hAsf0HUm9- z#y4p~FwMjVjh}fVN>~^&L?a?)2PTbgJ*adWeS3fS8!XIZTjdc5r0Vp(B&Cv#H=rLx z;C&*1`Oe@Z*j97j)89aTfqnmei+9*|n5nDtj#^AjJ(x?CwRaBk2N(L2#(B`!Jw$x; z>k|8V9t^)S`tC`Bu&W874DhPyss)^;D!q*ZAou)*07Kx{T!9J-x#yp#puXn+hW{`5 zs+`j`x{nCc{KGgraXMyl^3IVit*}(5zLz?8Mam}w3`1(G8mm$$RUqF{SxZ~sC~1D9 zro}VwahIa?D8d-Jo1Fk%;^kC;U(UX%KiY(lJl_<6qNCf!1QMHpn-(2Z|B79dFz3-u`zi999|j?Q86dZr_S=}R_pB; z*6hTFKa;%6IV(=O^4m!3cJN{ldZyW?;gvc<%~FaWNp=|mky6X)pg=kMk-cdm89m!L zP!r2#_#ZQqvFEm`Sb4ccxSd&u^r9Y}LDPx95!h z31V7i?R2vwQ^;t!I&O*mxIL3fWQ52{NzBjI1B0gWg$0?iwt#$uBpLE@r#izrVRo1` z(I9h-ICTX4#)m0Vh_y+RjgsSqdqRccf@q-uDLPXt#bfzFN%9Pi{}bzx^q@3`MWj|qH2B3<3+(QRs#FrOE->}-qq_BF!AZ7z;^gKT*8b#D15 zk$Y~BLSXRh4e3DpHEI9t#7EQYr)vvCo0bw3xGA(DxGrYiu?ZF4&@y~atK*5D8BY0B zy1Q_7V?@`tqrGeiGc^(HIxGv<0P0*WFCmK5(dOdjza8$UDj9-Hz)e>ZD(>=4wdDwIb0_|+ zSmL7wi!AklCE<996F2@Bsz6YjE8Lpalj9E@K9^|L zN4$Jk-RKz`&q>YqqF3*z7=Jx!V}xZ=q^u=@Jw|j5Q9I4{XHm)JAzt+b_od$XB}2<) zW{yw8BS(<$0t*4l{G^hB%cEHY6FD&$jJ0ZgPW3SMYDN*;kGHFWv1AFpPEIrEk$JGcfxkil7n$qDf1HqT_ zJ5#&}e3^BZUP_qTCqPjaj>ss+d-b;yUOf@x0+pBJGLj2B8EvNL^leF+lMTn;TZ4cn zqYQ=5HIL*k?XH7i66TNZ^SN<*+8F8C`tzh5j%V@~z*`wp|$yVFm|A&A&r*qijs~ zZe-I$L?DUiWpA!KWB|@s589781w|cOheF&ng0**ESEJ2kSyroUv$qn}#>7cCehrGX?5^qjNB|Q#M;C1T3g32)2xcP%MMOAhd#C?Sl%0LVZbK!6BawisgWMT zO8r#4$-P(fwFUJ{5O>z1-dgeIGw?DMuxLEXHs@2GC&W{FZ_7B{jQ8lZp-L-J=Fwk5 z+`SZsX-?ZV``+z#IVDX$j1;94HU$G6r{ImcY#QRuj}#EL`YS78lWSgJwSte{*Xvk- z^nQx(Wze)BDnwdcR56&`FdUBM7c>V6(?$BYjbA=Fi zw1C@ap6 zrhEPM&pPK^^M{9FN~sx!l)Ok;#JB3usz>A(LrPd+&egOangdyc& zxeG?*ohKG37gggzXm#DCH7S%l?%mb648oX5t3&rb>#(_m|1Nmjo6Kp^P(G)z)6d_D z$nC?|ZAtk1nMpm@nJ2p@n~K?ZbZb@q$VyBTDaLQKI*U1n#EA(0ymat;o<}2Ng&DK$ z1wtM?5)zeC+6r$RA08ai(XHhU>HD6h;)S(MHZc!X-J(+JnQ}i0Wtczkuz>KXpm!;y z1T@Aw1AdRst{)!Uk1dnIP3&!ZS^_mw5cR_=t%zm6>8E2nE&R_y(en7PkGIC0*fOnkQkI!+ zi@jwB4W{L|MYYtMbE2=VPDGSdwkQf5Kfrj|donAp;xf7DUZ2`eZWNaCos7uNB4MmI z&PMy?iB((lq?NY;ZZXz@6?(p_v$~?q{&%@5hcl9W)$)xTlfbBrH}N>sVHhEm{hS#W zQLgC-g23eP*rB;Cr#AoSdAVSh-VXYn8R|FYU+7V)Iww95cww&-h`4*r0)3A2HgzcI zCVlU*cI7#-1DE{~W_l!Zuy>Na7336jU+2q1lg}~sM29WUxgDk!Wq?j%?Cjx41&zz; zG|+dNe_GUOC34kXTwJU(@8SPA+u^CuJlv$5nnJMZ4-ZJ?(#`YzgMi;Cq$n=71A+gn zOGYesKL!!Zt<3KOcG}&EG;8FDK&#E+tJ|QP6plc=7JB7Jp z##xZ0656;|>JuY~7%jfE2#-oW(xaPKmn*t{MaR;P_%L~8y$^7xl-+8LAuX)l1Chtt z9v;QMJyxNbz6$Vip(=?_2Xq1c^1*-MfA+)w^1=VLh5p|t$`TbCpZ)=K1%kK$ literal 25014 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 diff --git a/MSIPackaging/Script.cs b/MSIPackaging/Script.cs index f2557a2..838d6ad 100644 --- a/MSIPackaging/Script.cs +++ b/MSIPackaging/Script.cs @@ -37,7 +37,7 @@ static public void Main(string[] args) } ); project.GUID = new Guid("bb0a8e11-24a8-4d7e-a7d6-6fc5bd8166d2"); - project.Version = Version.Parse("1.1.6"); + project.Version = Version.Parse("1.1.7"); project.LicenceFile = path + @"\MSIPackaging\Resources\gpl-3.0.rtf"; project.BannerImage = path + @"\MSIPackaging\Resources\banner.png"; project.BackgroundImage = path + @"\MSIPackaging\Resources\background.png"; diff --git a/WinCertes/Config/IConfig.cs b/WinCertes/Config/IConfig.cs index 9181551..136db9b 100644 --- a/WinCertes/Config/IConfig.cs +++ b/WinCertes/Config/IConfig.cs @@ -27,6 +27,15 @@ interface IConfig /// the value of the configuration parameter int ReadOrWriteIntParameter(string parameter, int value); + /// + /// For the given parameter, writes its value into configuration, if value != defaultValue. In any case, reads it from configuration. + /// + /// the configuration parameter to manage + /// the value of the configuration parameter + /// the default value of the configuration parameter + /// the value of the configuration parameter, defaultValue if none + int WriteAndReadIntParameter(string parameter, int value, int defaultValue); + /// /// Tries to read parameter value from configuration. If it does not exist, uses provided value instead, and writes it to configuration /// diff --git a/WinCertes/Config/RegistryConfig.cs b/WinCertes/Config/RegistryConfig.cs index a699f9e..a1f28c7 100644 --- a/WinCertes/Config/RegistryConfig.cs +++ b/WinCertes/Config/RegistryConfig.cs @@ -62,6 +62,20 @@ public string WriteAndReadStringParameter(string parameter, string value) return ReadStringParameter(parameter); } + /// + /// For the given parameter, writes its value into configuration, if value != defaultValue. In any case, reads it from configuration. + /// + /// the configuration parameter to manage + /// the value of the configuration parameter + /// the default value of the configuration parameter + /// the value of the configuration parameter, defaultValue if none + public int WriteAndReadIntParameter(string parameter, int value, int defaultValue) + { + if (value != defaultValue) + WriteIntParameter(parameter, value); + return ReadIntParameter(parameter, defaultValue); + } + /// /// Tries to read parameter value from configuration. If it does not exist, uses provided value instead, and writes it to configuration /// diff --git a/WinCertes/Program.cs b/WinCertes/Program.cs index c73947c..dcce2bf 100644 --- a/WinCertes/Program.cs +++ b/WinCertes/Program.cs @@ -62,9 +62,9 @@ public void WriteOptionsIntoConfiguration(IConfig config) // Should we execute some PowerShell ? If yes, let's do some config ScriptFile = config.WriteAndReadStringParameter("scriptFile", ScriptFile); // Writing renewal delay to conf - config.WriteIntParameter("renewalDays", RenewalDelay); + RenewalDelay = config.WriteAndReadIntParameter("renewalDays", RenewalDelay, 30); // Writing HTTP listening Port in conf - HttpPort = config.ReadOrWriteIntParameter("httpPort", HttpPort); + HttpPort = config.WriteAndReadIntParameter("httpPort", HttpPort, 80); } catch (Exception e) { _logger.Error($"Could not Read/Write command line parameters to configuration: {e.Message}"); } @@ -107,7 +107,7 @@ private static bool HandleOptions(string[] args) { "a|standalone", "should WinCertes create its own WebServer for validation. Activates HTTP validation mode. WARNING: it will use port 80 unless -l is specified.", v => _winCertesOptions.Standalone = (v != null) }, { "r|revoke:", "should WinCertes revoke the certificate identified by its domains (to be used only with -d). {REASON} is an optional integer between 0 and 5.", (int v) => _winCertesOptions.Revoke = v }, { "k|csp=", "import the certificate into specified csp. By default WinCertes imports in the default CSP.", v => _winCertesOptions.Csp = v }, - { "t|renewal=", "trigger certificate renewal {N} days before expiration", (int v) => _winCertesOptions.RenewalDelay = v }, + { "t|renewal=", "trigger certificate renewal {N} days before expiration, default 30", (int v) => _winCertesOptions.RenewalDelay = v }, { "l|listenport=", "listen on port {N} in standalone mode (for use with -a switch, default 80)", (int v) => _winCertesOptions.HttpPort = v } }; diff --git a/WinCertes/Properties/AssemblyInfo.cs b/WinCertes/Properties/AssemblyInfo.cs index d67f330..d56be1b 100644 --- a/WinCertes/Properties/AssemblyInfo.cs +++ b/WinCertes/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.6.0")] -[assembly: AssemblyFileVersion("1.1.6.0")] +[assembly: AssemblyVersion("1.1.7.0")] +[assembly: AssemblyFileVersion("1.1.7.0")]