From 5c58b0d8fdb077be5c8ca155e26f81fc89bb8917 Mon Sep 17 00:00:00 2001 From: Jake Swenson Date: Sun, 29 Oct 2017 09:57:49 -0700 Subject: [PATCH] adding license gen --- .gitignore | 3 +- cert.cert => .keys/cert.cert | Bin build.sh | 10 +- src/bitBetter/.keys/cert.cert | Bin 0 -> 1194 bytes Dockerfile => src/bitBetter/Dockerfile | 2 +- Program.cs => src/bitBetter/Program.cs | 0 .../bitBetter/bitBetter.csproj | 0 src/licenseGen/Program.cs | 93 ++++++++++++++++++ src/licenseGen/licenseGen.csproj | 8 ++ 9 files changed, 113 insertions(+), 3 deletions(-) rename cert.cert => .keys/cert.cert (100%) create mode 100644 src/bitBetter/.keys/cert.cert rename Dockerfile => src/bitBetter/Dockerfile (89%) rename Program.cs => src/bitBetter/Program.cs (100%) rename bitBetter.csproj => src/bitBetter/bitBetter.csproj (100%) create mode 100644 src/licenseGen/Program.cs create mode 100644 src/licenseGen/licenseGen.csproj diff --git a/.gitignore b/.gitignore index 826ef38..7af7a48 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ bin/ obj/ *.dll *.pem -.vscode/ \ No newline at end of file +.vscode/ +*.pfx \ No newline at end of file diff --git a/cert.cert b/.keys/cert.cert similarity index 100% rename from cert.cert rename to .keys/cert.cert diff --git a/build.sh b/build.sh index 0b773f8..eb98d25 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,13 @@ #!/bin/bash +mkdir ./src/bitbetter/.keys + +cp .keys/cert.cert ./src/bitbetter/.keys + +cd ./src/bitbetter + dotnet restore dotnet publish -docker build . -t bitbetter/api # --squash \ No newline at end of file + +docker build . -t bitbetter/api # --squash + diff --git a/src/bitBetter/.keys/cert.cert b/src/bitBetter/.keys/cert.cert new file mode 100644 index 0000000000000000000000000000000000000000..740465ba03136bd88550356c9efa1cca5a620f6a GIT binary patch literal 1194 zcmV;b1XcSmf&`{8f&z{L2>`7)J#?njWSlS!1_>&LNQUlw}8?+FaSo=aOK&ww^8Nu*8UgItalZ1eyNhR#$V!-A>%kCAl;XJ$YY(!)*7= zo;!1M*TfXzEpugaqXhOL#ZLy(6Rq?`g1OQ6|t+JgD=mbM+AXiG}hu;}^ zY-lRXz)O0kU7~yn2G}kisPQbJ+bhX~#RY0XXv<%C$nY7Drz1!?{$$^H)!8pmj6v1x z^JG{``Z5yh%lxn!&pIgj*$1WyJ=dT(s|&}vpx06mrEd$KMbM@=go+CO6VN<2KuQ5l z?}^D9Syn(m@I*VGwC^Z=mV4_jtI4nS5lfPy&sRSRuw!V%Fb>hc8fP34K_m$W$9vHq zoVM_%j(r<@Nd!oPrgH!_Q0T_stR(Q4B~ED|t>_`ZKgH20)V17g1{(dpi0~dar*ZCX zwn-)-6Oyd$x7&&tx+z6^)Ur)30IHq#RV7ZR65)*nZ{SXkTgXqjh5!e25Io?Hqj#PG zA?mebMozGnKYAI1iXW>LQlLL=fbkDrNd^nOvzfw#7a0SJic2hq>tQ92C9pT-#a4I97yDRmUn>=nx6ggq{pyQuWXi5~*l>Q2j zx`=NCnH%&WHUjbsiP8m>eRa<*A%v2L^*v4#U9I?SGE4<)uYci50s{d60Wb{)2`Yw2 zhW8Bt0Sg5H1A+np04sY!VFgkPn2u(vMccurECT6KDmE4nD}Nd!o~E%PZcQ3#wDDH! zJrgR>vf_J+&VAsO0QO|TiewX2M_P`A#AuVoxW1Oxn^N<-8LDOf6%v5`)aDm`=RyPdg93A{Lm1Zs7X$?Joq{`Rl!an~*UuvI@aYWtz zv$i`pr0-^R``C!-}fl3uOv6 z?<%HDKrf~CoFj}|;=k_?DoN@b<5tlMLcnV^?C4Z@z#h8e-BWTD)F>mwg8k;j7e`|} zeF&X)Ei_RGVNy7SRzVwRxmglT@DUiIxhL&ZzGkg6l`Y-9> z_!g`k%)ovb8tfbx_kL=;NEm=M8Z4(0g1q=}`n6EgCO1EU4))qPm@h*Y!gshsYZfHY zlrrWvuMAWO2apGLmEeFoDNIb0EXkty>_qGDO{F@LpymV7?XTgsF;oGyOd3i3VF=lo I*(}b{us|yqjQ{`u literal 0 HcmV?d00001 diff --git a/Dockerfile b/src/bitBetter/Dockerfile similarity index 89% rename from Dockerfile rename to src/bitBetter/Dockerfile index a48c7f5..9e3dea9 100644 --- a/Dockerfile +++ b/src/bitBetter/Dockerfile @@ -1,7 +1,7 @@ FROM bitwarden/api COPY bin/Debug/netcoreapp2.0/publish/* /bitBetter/ -COPY cert.cert /newLicensing.cer +COPY ./.keys/cert.cert /newLicensing.cer RUN dotnet /bitBetter/bitBetter.dll && \ echo "modified dll" && \ diff --git a/Program.cs b/src/bitBetter/Program.cs similarity index 100% rename from Program.cs rename to src/bitBetter/Program.cs diff --git a/bitBetter.csproj b/src/bitBetter/bitBetter.csproj similarity index 100% rename from bitBetter.csproj rename to src/bitBetter/bitBetter.csproj diff --git a/src/licenseGen/Program.cs b/src/licenseGen/Program.cs new file mode 100644 index 0000000..1c5747d --- /dev/null +++ b/src/licenseGen/Program.cs @@ -0,0 +1,93 @@ +using System; +using System.IO; +using System.Linq; +using System.Security.Cryptography.X509Certificates; +using Mono.Cecil; +using Mono.Cecil.Cil; +using Mono.Cecil.Rocks; + +namespace bitwardenSelfLicensor +{ + class Program + { + static int Main(string[] args) + { + string cerFile; + string corePath; + + if(args.Length >= 2) { + cerFile = args[0]; + corePath = args[1]; + } else if (args.Length == 1) { + cerFile = args[0]; + corePath = "/app/Core.dll"; + } + else { + cerFile = "/newLicensing.cer"; + corePath = "/app/Core.dll"; + } + + + var module = ModuleDefinition.ReadModule(new MemoryStream(File.ReadAllBytes(corePath))); + var cert = File.ReadAllBytes(cerFile); + + var x = module.Resources.OfType() + .Where(r => r.Name.Equals("Bit.Core.licensing.cer")) + .First(); + + Console.WriteLine(x.Name); + + var e = new EmbeddedResource("Bit.Core.licensing.cer", x.Attributes, cert); + + module.Resources.Add(e); + module.Resources.Remove(x); + + var services = module.Types.Where(t => t.Namespace == "Bit.Core.Services"); + + + var type = services.First(t => t.Name == "LicensingService"); + + var licensingType = type.Resolve(); + + var existingCert = new X509Certificate2(x.GetResourceData()); + + Console.WriteLine($"Existing Cert Thumbprin: {existingCert.Thumbprint}"); + X509Certificate2 certificate = new X509Certificate2(cert); + + Console.WriteLine($"New cert Thumbprint: {certificate.Thumbprint}"); + + var ctor = licensingType.GetConstructors().Single(); + + + var rewriter = ctor.Body.GetILProcessor(); + + var instToReplace = + ctor.Body.Instructions.Where(i => i.OpCode == OpCodes.Ldstr + && string.Equals((string)i.Operand, existingCert.Thumbprint, StringComparison.InvariantCultureIgnoreCase)) + .FirstOrDefault(); + + if(instToReplace != null) { + rewriter.Replace(instToReplace, Instruction.Create(OpCodes.Ldstr, certificate.Thumbprint)); + } + else { + Console.WriteLine("Cant find inst"); + } + + // foreach (var inst in ctor.Body.Instructions) + // { + // Console.Write(inst.OpCode.Name + " " + inst.Operand?.GetType() + " = "); + // if(inst.OpCode.FlowControl == FlowControl.Call) { + // Console.WriteLine(inst.Operand); + // } + // else if(inst.OpCode == OpCodes.Ldstr) { + // Console.WriteLine(inst.Operand); + // } + // else {Console.WriteLine();} + // } + + module.Write("modified.dll"); + + return 0; + } + } +} diff --git a/src/licenseGen/licenseGen.csproj b/src/licenseGen/licenseGen.csproj new file mode 100644 index 0000000..ce1697a --- /dev/null +++ b/src/licenseGen/licenseGen.csproj @@ -0,0 +1,8 @@ + + + + Exe + netcoreapp2.0 + + +