From 5b5d1301c96f27cf550717006e7394366121205c Mon Sep 17 00:00:00 2001 From: Genva Date: Mon, 16 Jun 2025 10:21:24 +0200 Subject: [PATCH] remove obsolete project --- src/bitBetter/Dockerfile | 11 ---- src/bitBetter/Program.cs | 93 ---------------------------------- src/bitBetter/bitBetter.csproj | 12 ----- src/bitBetter/build.sh | 7 --- 4 files changed, 123 deletions(-) delete mode 100644 src/bitBetter/Dockerfile delete mode 100644 src/bitBetter/Program.cs delete mode 100644 src/bitBetter/bitBetter.csproj delete mode 100755 src/bitBetter/build.sh diff --git a/src/bitBetter/Dockerfile b/src/bitBetter/Dockerfile deleted file mode 100644 index d66b1df..0000000 --- a/src/bitBetter/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -ARG BITWARDEN_TAG -FROM ${BITWARDEN_TAG} - -COPY bin/Release/net8.0/publish/* /bitBetter/ -COPY ./.keys/cert.cert /newLicensing.cer - -RUN set -e; set -x; \ - dotnet /bitBetter/bitBetter.dll && \ - mv /app/Core.dll /app/Core.orig.dll && \ - mv /app/modified.dll /app/Core.dll && \ - rm -rf /bitBetter && rm -rf /newLicensing.cer diff --git a/src/bitBetter/Program.cs b/src/bitBetter/Program.cs deleted file mode 100644 index 0c7b93e..0000000 --- a/src/bitBetter/Program.cs +++ /dev/null @@ -1,93 +0,0 @@ -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 Thumbprint: {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/bitBetter/bitBetter.csproj b/src/bitBetter/bitBetter.csproj deleted file mode 100644 index faa5594..0000000 --- a/src/bitBetter/bitBetter.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - Exe - net8.0 - - - - - - - diff --git a/src/bitBetter/build.sh b/src/bitBetter/build.sh deleted file mode 100755 index ea95081..0000000 --- a/src/bitBetter/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -e -set -x - -dotnet restore -dotnet publish