Merge branch 'master' of https://github.com/Lone-Coder/letsencrypt-wi…

…n-simple Conflicts: letsencrypt-win-simple/Program.cs
ThomasCr · Nov 18, 2015 · e38bbf7 · e38bbf7
2 parents 1c9d4a9 + d64330d
commit e38bbf7
Show file tree

Hide file tree

Showing 6 changed files with 188 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -1,32 +1,117 @@
 # letsencrypt-win-simple
-A Simple ACME Client for the Windows Platform
+A Simple ACME Client for Windows
 
 # Overview
 
-This is a windows CLI client that's built in native .net and aims to be as simple as possible to use.
+This is a ACME windows CLI client built in native .net and aims to be as simple as possible to use.
 
 It's built on top of the [.net ACME protocol library](https://github.com/ebekker/letsencrypt-win/).
 
 # Usage
 
-The current build can be downloaded and run from https://github.com/Lone-Coder/letsencrypt-win-simple/releases
+1. Download latest build from https://github.com/Lone-Coder/letsencrypt-win-simple/releases
+2. Unzip files to a permanent location (so that it can run for renewals)
+3. Run letsencrypt.exe with administrator privileges.
 
-It requires administrator privileges so be sure to run it from an elevated command prompt.
+**Currently only IIS is supported.** It will scan IIS for bindings with host names so you may need to add one for this client to work.
 
-Running the client will take you thru a menu system to get your certs and install them.
+The client will write out an answer file to the web server directory that needs to be visible to the ACME server to verify domain ownership.
 
-It will scan IIS for bindings with host names so you may need to add one for this client to work.
+Certificate .pfx files are written to disk as well as imported into the windows certificate store. The client can also create or update an https binding in IIS for you.
 
-The client will write out an answer file that needs to be visible to the ACME server to verify domain ownership.
+**Automatic renewals should be fully working.** It will create a task in Windows Task Schedule that will run each morning and update the certs automatically every 60 days. For renewals your web site must still be able to pass authorization via the answer file.
 
-Certs .pfx files are written to disk currently as well as optionally imported into the windows cert store.
+There's no support for AWS or Azure sites yet. Pull requests for them are welcome. For more complicated scenarios try the [PowerShell Client](https://github.com/ebekker/letsencrypt-win/wiki/Example-Usage).
 
-The client can also create a https binding in IIS for you.
+# Command Line Arguments
 
-There's no support for AWS or Azure sites yet. Pull requests for them are welcome.
+	LetsEncrypt.ACME 1.0.5795.26498
+	 Let's Encrypt
 
-Automatic renewals are not working yet, so you'll need to renew your certs before their 90 day expiration.
+	  --baseuri      (Default: https://acme-v01.api.letsencrypt.org/) The address
+			 of the ACME server to use.
+
+	  --accepttos    Accept the terms of service.
+
+	  --renew        Check for renewals.
+
+	  --test         Overrides BaseURI setting to
+			 https://acme-staging.api.letsencrypt.org/
+
+	  --help         Display this help screen.
+
+	  --version      Display version information.
+
+# Example Output
+
+	Let's Encrypt (Simple Windows ACME Client)
+
+	ACME Server: https://acme-staging.api.letsencrypt.org/
+	Config Folder: C:\Users\Bryan\AppData\Roaming\letsencrypt-win-simple\httpsacme-s
+	taging.api.letsencrypt.org
+	Loading Signer from C:\Users\Bryan\AppData\Roaming\letsencrypt-win-simple\httpsa
+	cme-staging.api.letsencrypt.org\Signer
+
+	Getting AcmeServerDirectory
+	Loading Registration from C:\Users\Bryan\AppData\Roaming\letsencrypt-win-simple\
+	httpsacme-staging.api.letsencrypt.org\Registration
+
+	Scanning IIS 7 Site Bindings for Hosts (Elevated Permissions Required)
+	IIS Bindings
+	 1: cooltext.com (%SystemDrive%\inetpub\wwwroot)
+	 2: office.cooltext.com (%SystemDrive%\inetpub\wwwroot)
+
+	 A: Get Certificates for All Bindings
+	 Q: Quit
+	Which binding do you want to get a cert for: 2
+
+	Authorizing Identifier office.cooltext.com Using Challenge Type http-01
+	 Writing challenge answer to C:\inetpub\wwwroot\.well-known/acme-challenge/ky_uL
+	AH0x2O2452Vos5dMpQ1hiRj6cV7SJAnUoT8qHg
+	 Writing web.config to add extensionless mime type to C:\inetpub\wwwroot\.well-k
+	nown\acme-challenge\web.config
+	 Answer should now be browsable at http://office.cooltext.com/.well-known/acme-c
+	hallenge/ky_uLAH0x2O2452Vos5dMpQ1hiRj6cV7SJAnUoT8qHg
+	 Submitting answer
+	 Refreshing authorization
+	 Authorization RESULT: valid
+	 Deleting answer
+
+	Requesting Certificate
+	 Request Status: Created
+	 Saving Certificate to C:\Users\Bryan\AppData\Roaming\letsencrypt-win-simple\htt
+	psacme-staging.api.letsencrypt.org\office.cooltext.com-crt.der
+	 Saving Issuer Certificate to C:\Users\Bryan\AppData\Roaming\letsencrypt-win-sim
+	ple\httpsacme-staging.api.letsencrypt.org\ca-009CF1912EA8D50908-crt.pem
+	 Saving Certificate to C:\Users\Bryan\AppData\Roaming\letsencrypt-win-simple\htt
+	psacme-staging.api.letsencrypt.org\office.cooltext.com-all.pfx (with no password
+	 set)
+
+	Do you want to install the .pfx into the Certificate Store? (Y/N)
+	 Opening Certificate Store
+	 Loading .pfx
+	 Adding Certificate to Store
+	 Closing Certificate Store
+
+	Do you want to add/update an https IIS binding? (Y/N)
+	 Updating Existing https Binding
+	 Commiting binding changes to IIS
+
+	Do you want to automatically renew this certificate in 60 days? This will add a
+	task scheduler task. (Y/N)
+	 Deleting existing Task letsencrypt-win-simple httpsacme-staging.api.letsencrypt
+	.org from Windows Task Scheduler.
+	 Creating Task letsencrypt-win-simple httpsacme-staging.api.letsencrypt.org with
+	 Windows Task Scheduler at 9am every day.
+	 Removing existing scheduled renewal office.cooltext.com (%SystemDrive%\inetpub\
+	wwwroot) Renew After 1/12/2016
+	 Renewal Scheduled office.cooltext.com (%SystemDrive%\inetpub\wwwroot) Renew Aft
+	er 1/12/2016
 
 # Build Notes
 
 To get the project to build correctly you may need to copy the "packages" folder that nuget creates into the letsencrypt-win folder.
+
+# Support
+
+If you run into trouble please open an issue at https://github.com/Lone-Coder/letsencrypt-win-simple/issues
diff --git a/letsencrypt-win-simple/Plugin/ManualPlugin.cs b/letsencrypt-win-simple/Plugin/ManualPlugin.cs
@@ -33,7 +33,7 @@ public override void PrintMenu()
                 Environment.Exit(0);
             }
 
-            Console.WriteLine(" M: Generate a Certificate Manually.");
+            Console.WriteLine(" M: Generate a certificate manually.");
         }
 
         public override void HandleMenuResponse(string response, List<Target> targets)

diff --git a/letsencrypt-win-simple/Program.cs b/letsencrypt-win-simple/Program.cs
@@ -242,7 +242,7 @@ public static void Auto(Target binding)
 
                 X509Store store;
                 X509Certificate2 certificate;
-                InstallCertificate(pfxFilename, out store, out certificate);
+                InstallCertificate(binding, pfxFilename, out store, out certificate);
 
                 if (Options.Test && !Options.Renew)
                 {
@@ -266,14 +266,18 @@ public static void Auto(Target binding)
             }
         }
 
-        public static void InstallCertificate(string pfxFilename, out X509Store store, out X509Certificate2 certificate)
+        public static void InstallCertificate(Target binding, string pfxFilename, out X509Store store, out X509Certificate2 certificate)
         {
             Console.WriteLine($" Opening Certificate Store");
             store = new X509Store(StoreName.My, StoreLocation.LocalMachine);
             store.Open(OpenFlags.OpenExistingOnly | OpenFlags.ReadWrite);
 
             Console.WriteLine($" Loading .pfx");
-            certificate = new X509Certificate2(pfxFilename, "");
+
+            // See http://paulstovell.com/blog/x509certificate2
+            certificate = new X509Certificate2(pfxFilename, "", X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable);
+            certificate.FriendlyName = $"{binding.Host} {DateTime.Now}";
+
             Console.WriteLine($" Adding Certificate to Store");
             store.Add(certificate);
 

diff --git a/letsencrypt-win-simple/Properties/AssemblyInfo.cs b/letsencrypt-win-simple/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.0.*")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/letsencrypt-win-simple/app.manifest b/letsencrypt-win-simple/app.manifest
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+        <!--<requestedExecutionLevel level="asInvoker" uiAccess="false" />-->
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on and is
+           is designed to work with. Uncomment the appropriate elements and Windows will 
+           automatically selected the most compatible environment. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>
diff --git a/letsencrypt-win-simple/letsencrypt-win-simple.csproj b/letsencrypt-win-simple/letsencrypt-win-simple.csproj
@@ -31,6 +31,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CommandLine, Version=2.0.275.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
       <HintPath>..\packages\CommandLineParser.2.0.275-beta\lib\net45\CommandLine.dll</HintPath>
@@ -71,6 +74,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="app.manifest">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>