mirror of
https://github.com/jakeswenson/BitBetter.git
synced 2025-07-12 22:43:27 +00:00
Compare commits
2 Commits
1a2073cf35
...
5b5d1301c9
| Author | SHA1 | Date | |
|---|---|---|---|
|
5b5d1301c9 | ||
|
|
317af2994b |
3
build.sh
3
build.sh
|
|
@ -11,8 +11,7 @@ echo "Building BitBetter for BitWarden version $BW_VERSION"
|
||||||
|
|
||||||
# Prepare Bitwarden repository
|
# Prepare Bitwarden repository
|
||||||
rm -rf $DIR/server
|
rm -rf $DIR/server
|
||||||
git clone https://github.com/bitwarden/server.git
|
git clone --branch "v${BW_VERSION}" --depth 1 https://github.com/bitwarden/server.git $DIR/server
|
||||||
git -C $DIR/server checkout tags/v${BW_VERSION}
|
|
||||||
old_thumbprint=$(openssl x509 -fingerprint -noout -in $DIR/server/src/Core/licensing.cer | cut -d= -f2 | tr -d ':')
|
old_thumbprint=$(openssl x509 -fingerprint -noout -in $DIR/server/src/Core/licensing.cer | cut -d= -f2 | tr -d ':')
|
||||||
new_thumbprint=$(openssl x509 -fingerprint -noout -in $DIR/.keys/cert.cert | cut -d= -f2 | tr -d ':')
|
new_thumbprint=$(openssl x509 -fingerprint -noout -in $DIR/.keys/cert.cert | cut -d= -f2 | tr -d ':')
|
||||||
cp $DIR/.keys/cert.cert $DIR/server/src/Core/licensing.cer
|
cp $DIR/.keys/cert.cert $DIR/server/src/Core/licensing.cer
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -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<EmbeddedResource>()
|
|
||||||
.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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<OutputType>Exe</OutputType>
|
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
set -x
|
|
||||||
|
|
||||||
dotnet restore
|
|
||||||
dotnet publish
|
|
||||||
Loading…
Reference in New Issue
Block a user