Skip to content

Commit

Permalink
Merge pull request win-acme#108 from Lone-Coder/multiple-site-san
Browse files Browse the repository at this point in the history
Multiple Site SAN Support
  • Loading branch information
rkerber committed Feb 8, 2016
2 parents e44ce2c + e53cd1d commit 86ea924
Show file tree
Hide file tree
Showing 13 changed files with 609 additions and 171 deletions.
8 changes: 7 additions & 1 deletion letsencrypt-win-simple/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@
<value>50</value>
</setting>
<setting name="CertificatePath" serializeAs="String">
<value></value>
<value />
</setting>
<setting name="RenewalDays" serializeAs="String">
<value>60</value>
</setting>
<setting name="CertificateStore" serializeAs="String">
<value>WebHosting</value>
</setting>
</LetsEncrypt.ACME.Simple.Properties.Settings>
</applicationSettings>
Expand Down
132 changes: 132 additions & 0 deletions letsencrypt-win-simple/ObjectExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
using System.Collections.Generic;
using System.Reflection;
using System.ArrayExtensions;

namespace System
{
//From https://github.com/Burtsev-Alexey/net-object-deep-copy
public static class ObjectExtensions
{
private static readonly MethodInfo CloneMethod = typeof(Object).GetMethod("MemberwiseClone", BindingFlags.NonPublic | BindingFlags.Instance);

public static bool IsPrimitive(this Type type)
{
if (type == typeof(String)) return true;
return (type.IsValueType & type.IsPrimitive);
}

public static Object Copy(this Object originalObject)
{
return InternalCopy(originalObject, new Dictionary<Object, Object>(new ReferenceEqualityComparer()));
}
private static Object InternalCopy(Object originalObject, IDictionary<Object, Object> visited)
{
if (originalObject == null) return null;
var typeToReflect = originalObject.GetType();
if (IsPrimitive(typeToReflect)) return originalObject;
if (visited.ContainsKey(originalObject)) return visited[originalObject];
if (typeof(Delegate).IsAssignableFrom(typeToReflect)) return null;
var cloneObject = CloneMethod.Invoke(originalObject, null);
if (typeToReflect.IsArray)
{
var arrayType = typeToReflect.GetElementType();
if (IsPrimitive(arrayType) == false)
{
Array clonedArray = (Array)cloneObject;
clonedArray.ForEach((array, indices) => array.SetValue(InternalCopy(clonedArray.GetValue(indices), visited), indices));
}

}
visited.Add(originalObject, cloneObject);
CopyFields(originalObject, visited, cloneObject, typeToReflect);
RecursiveCopyBaseTypePrivateFields(originalObject, visited, cloneObject, typeToReflect);
return cloneObject;
}

private static void RecursiveCopyBaseTypePrivateFields(object originalObject, IDictionary<object, object> visited, object cloneObject, Type typeToReflect)
{
if (typeToReflect.BaseType != null)
{
RecursiveCopyBaseTypePrivateFields(originalObject, visited, cloneObject, typeToReflect.BaseType);
CopyFields(originalObject, visited, cloneObject, typeToReflect.BaseType, BindingFlags.Instance | BindingFlags.NonPublic, info => info.IsPrivate);
}
}

private static void CopyFields(object originalObject, IDictionary<object, object> visited, object cloneObject, Type typeToReflect, BindingFlags bindingFlags = BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.FlattenHierarchy, Func<FieldInfo, bool> filter = null)
{
foreach (FieldInfo fieldInfo in typeToReflect.GetFields(bindingFlags))
{
if (filter != null && filter(fieldInfo) == false) continue;
if (IsPrimitive(fieldInfo.FieldType)) continue;
var originalFieldValue = fieldInfo.GetValue(originalObject);
var clonedFieldValue = InternalCopy(originalFieldValue, visited);
fieldInfo.SetValue(cloneObject, clonedFieldValue);
}
}
public static T Copy<T>(this T original)
{
return (T)Copy((Object)original);
}
}

public class ReferenceEqualityComparer : EqualityComparer<Object>
{
public override bool Equals(object x, object y)
{
return ReferenceEquals(x, y);
}
public override int GetHashCode(object obj)
{
if (obj == null) return 0;
return obj.GetHashCode();
}
}

namespace ArrayExtensions
{
public static class ArrayExtensions
{
public static void ForEach(this Array array, Action<Array, int[]> action)
{
if (array.LongLength == 0) return;
ArrayTraverse walker = new ArrayTraverse(array);
do action(array, walker.Position);
while (walker.Step());
}
}

internal class ArrayTraverse
{
public int[] Position;
private int[] maxLengths;

public ArrayTraverse(Array array)
{
maxLengths = new int[array.Rank];
for (int i = 0; i < array.Rank; ++i)
{
maxLengths[i] = array.GetLength(i) - 1;
}
Position = new int[array.Rank];
}

public bool Step()
{
for (int i = 0; i < Position.Length; ++i)
{
if (Position[i] < maxLengths[i])
{
Position[i]++;
for (int j = 0; j < i; j++)
{
Position[j] = 0;
}
return true;
}
}
return false;
}
}
}

}
12 changes: 6 additions & 6 deletions letsencrypt-win-simple/Options.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ namespace LetsEncrypt.ACME.Simple
class Options
{
[Option(Default = "https://acme-v01.api.letsencrypt.org/", HelpText = "The address of the ACME server to use.")]
public string BaseURI { get; set; }
public string BaseUri { get; set; }

[Option(HelpText = "Accept the terms of service.")]
public bool AcceptTOS { get; set; }
public bool AcceptTos { get; set; }

[Option(HelpText = "Check for renewals.")]
public bool Renew { get; set; }

[Option(HelpText = "Overrides BaseURI setting to https://acme-staging.api.letsencrypt.org/")]
[Option(HelpText = "Overrides BaseUri setting to https://acme-staging.api.letsencrypt.org/")]
public bool Test { get; set; }

[Option(HelpText = "A host name to manually get a certificate for. --webroot must also be set.")]
Expand All @@ -28,13 +28,13 @@ class Options
public string WebRoot { get; set; }

[Option(HelpText = "Path for Centralized Certificate Store (This enables Centralized SSL). Ex. \\\\storage\\central_ssl\\")]
public string CentralSSLStore { get; set; }
public string CentralSslStore { get; set; }

[Option(HelpText = "Hide sites that have existing HTTPS bindings")]
public bool HideHTTPS { get; set; }
public bool HideHttps { get; set; }

[Option(HelpText = "Certificates per site instead of per host")]
public bool SAN { get; set; }
public bool San { get; set; }

// can't easily make this a command line option since it would have to be saved
//[Option(Default = 60f, HelpText = "Renewal period in days. Can be set to negative to test.")]
Expand Down
Loading

0 comments on commit 86ea924

Please sign in to comment.