diff --git a/build.sh b/build.sh index 6577c82..0003551 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/bin/sh - +set -e DIR=`dirname "$0"` DIR=`exec 2>/dev/null;(cd -- "$DIR") && cd -- "$DIR"|| cd "$DIR"; unset PWD; /usr/bin/pwd || /bin/pwd || pwd` BW_VERSION=$(curl -sL https://go.btwrdn.co/bw-sh-versions | grep '^ *"'coreVersion'":' | awk -F\: '{ print $2 }' | sed -e 's/,$//' -e 's/^"//' -e 's/"$//') @@ -9,14 +9,18 @@ echo "Building BitBetter for BitWarden version $BW_VERSION" # If there aren't any keys, generate them first. [ -e "$DIR/.keys/cert.cert" ] || "$DIR/.keys/generate-keys.sh" -[ -e "$DIR/src/bitBetter/.keys" ] || mkdir "$DIR/src/bitBetter/.keys" +# Prepare Bitwarden server repository +rm -rf $DIR/server +git clone --branch "v${BW_VERSION}" --depth 1 https://github.com/bitwarden/server.git $DIR/server -cp "$DIR/.keys/cert.cert" "$DIR/src/bitBetter/.keys" +# Replace certificate file and thumbprint +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 ':') +sed -i -e "s/$old_thumbprint/$new_thumbprint/g" $DIR/server/src/Core/Services/Implementations/LicensingService.cs +cp $DIR/.keys/cert.cert $DIR/server/src/Core/licensing.cer -docker run --rm -v "$DIR/src/bitBetter:/bitBetter" -w=/bitBetter mcr.microsoft.com/dotnet/sdk:8.0 sh build.sh - -docker build --no-cache --build-arg BITWARDEN_TAG=ghcr.io/bitwarden/api:$BW_VERSION --label com.bitwarden.product="bitbetter" -t bitbetter/api "$DIR/src/bitBetter" # --squash -docker build --no-cache --build-arg BITWARDEN_TAG=ghcr.io/bitwarden/identity:$BW_VERSION --label com.bitwarden.product="bitbetter" -t bitbetter/identity "$DIR/src/bitBetter" # --squash +docker build --no-cache --label com.bitwarden.product="bitbetter" $DIR/server -f $DIR/server/src/Api/Dockerfile -t bitbetter/api +docker build --no-cache --label com.bitwarden.product="bitbetter" $DIR/server -f $DIR/server/src/Identity/Dockerfile -t bitbetter/identity docker tag bitbetter/api bitbetter/api:latest docker tag bitbetter/identity bitbetter/identity:latest 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 diff --git a/src/licenseGen/Dockerfile b/src/licenseGen/Dockerfile index a1fcfa1..527ccde 100644 --- a/src/licenseGen/Dockerfile +++ b/src/licenseGen/Dockerfile @@ -14,4 +14,4 @@ FROM bitbetter/api COPY --from=build /licenseGen/bin/Release/net8.0/publish/* /app/ -ENTRYPOINT [ "dotnet", "/app/licenseGen.dll", "--core", "/app/Core.dll", "--cert", "/cert.pfx" ] +ENTRYPOINT [ "dotnet", "/app/licenseGen.dll", "--core", "/app/Core.dll", "--executable", "/app/Api", "--cert", "/cert.pfx" ] diff --git a/src/licenseGen/Program.cs b/src/licenseGen/Program.cs index 37e6145..e58024d 100644 --- a/src/licenseGen/Program.cs +++ b/src/licenseGen/Program.cs @@ -1,38 +1,40 @@ -using System; -using System.IO; -using System.Linq; -using System.Runtime.Loader; -using System.Security.Cryptography.X509Certificates; -using Microsoft.Extensions.CommandLineUtils; -using Newtonsoft.Json; - -namespace bitwardenSelfLicensor +namespace BitwardenSelfLicensor { - class Program + using Microsoft.Extensions.CommandLineUtils; + using Newtonsoft.Json; + using SingleFileExtractor.Core; + using System; + using System.IO; + using System.Runtime.Loader; + using System.Security.Cryptography.X509Certificates; + + public static class Program { - static int Main(string[] args) + public static int Main(string[] args) { - var app = new Microsoft.Extensions.CommandLineUtils.CommandLineApplication(); + var app = new CommandLineApplication(); var cert = app.Option("--cert", "cert file", CommandOptionType.SingleValue); var coreDll = app.Option("--core", "path to core dll", CommandOptionType.SingleValue); + var exec = app.Option("--executable", "path to Bitwarden single file executable", CommandOptionType.SingleValue); - bool certExists() + bool ExecExists() => File.Exists(exec.Value()); + bool CertExists() => File.Exists(cert.Value()); + bool CoreExists() => File.Exists(coreDll.Value()); + bool VerifyTopOptions() => + !string.IsNullOrWhiteSpace(cert.Value()) && + (!string.IsNullOrWhiteSpace(coreDll.Value()) || !string.IsNullOrWhiteSpace(exec.Value())) && + CertExists() && + (CoreExists() || ExecExists()); + string GetExtractedDll() { - return File.Exists(cert.Value()); + var coreDllPath = Path.Combine("extract", "Core.dll"); + var reader = new ExecutableReader(exec.Value()); + reader.ExtractToDirectory("extract"); + var fileInfo = new FileInfo(coreDllPath); + return fileInfo.FullName; } - - bool coreExists() - { - return File.Exists(coreDll.Value()); - } - - bool verifyTopOptions() - { - return !string.IsNullOrWhiteSpace(cert.Value()) && - !string.IsNullOrWhiteSpace(coreDll.Value()) && - certExists() && coreExists(); - } - + string GetCoreDllPath() => CoreExists() ? coreDll.Value() : GetExtractedDll(); + app.Command("interactive", config => { string buff="", licensetype="", name="", email="", businessname=""; @@ -43,11 +45,11 @@ namespace bitwardenSelfLicensor config.OnExecute(() => { - if (!verifyTopOptions()) + if (!VerifyTopOptions()) { - if (!coreExists()) config.Error.WriteLine($"Cant find core dll at: {coreDll.Value()}"); - if (!certExists()) config.Error.WriteLine($"Cant find certificate at: {cert.Value()}"); - + if (!ExecExists() && !string.IsNullOrWhiteSpace(exec.Value())) config.Error.WriteLine($"Cant find single file executable at: {exec.Value()}"); + if (!CoreExists() && !string.IsNullOrWhiteSpace(coreDll.Value())) config.Error.WriteLine($"Cant find core dll at: {coreDll.Value()}"); + if (!CertExists()) config.Error.WriteLine($"Cant find certificate at: {cert.Value()}"); config.ShowHelp(); return 1; } @@ -92,7 +94,7 @@ namespace bitwardenSelfLicensor WriteLineOver("Please enter a business name, default is BitBetter. [Business Name]:"); buff = Console.ReadLine(); if (buff == "") businessname = "BitBetter"; - else if (checkBusinessName(buff)) businessname = buff; + else if (CheckBusinessName(buff)) businessname = buff; } } else @@ -105,14 +107,14 @@ namespace bitwardenSelfLicensor { WriteLineOver("Please provide the username this license will be registered to. [username]:"); buff = Console.ReadLine(); - if ( checkUsername(buff) ) name = buff; + if ( CheckUsername(buff) ) name = buff; } while (email == "") { WriteLineOver("Please provide the email address for the user " + name + ". [email]"); buff = Console.ReadLine(); - if ( checkEmail(buff) ) email = buff; + if ( CheckEmail(buff) ) email = buff; } while (storage == 0) @@ -125,7 +127,7 @@ namespace bitwardenSelfLicensor } else { - if (checkStorage(buff)) storage = short.Parse(buff); + if (CheckStorage(buff)) storage = short.Parse(buff); } } @@ -135,7 +137,7 @@ namespace bitwardenSelfLicensor buff = Console.ReadLine(); if ( buff == "" || buff == "y" || buff == "Y" ) { - GenerateUserLicense(new X509Certificate2(cert.Value(), "test"), coreDll.Value(), name, email, storage, guid, null); + GenerateUserLicense(new X509Certificate2(cert.Value(), "test"), GetCoreDllPath(), name, email, storage, guid, null); } else { @@ -149,7 +151,7 @@ namespace bitwardenSelfLicensor buff = Console.ReadLine(); if ( buff == "" || buff == "y" || buff == "Y" ) { - GenerateOrgLicense(new X509Certificate2(cert.Value(), "test"), coreDll.Value(), name, email, storage, installid, businessname, null); + GenerateOrgLicense(new X509Certificate2(cert.Value(), "test"), GetCoreDllPath(), name, email, storage, installid, businessname, null); } else { @@ -173,17 +175,11 @@ namespace bitwardenSelfLicensor config.OnExecute(() => { - if (!verifyTopOptions()) + if (!VerifyTopOptions()) { - if (!coreExists()) - { - config.Error.WriteLine($"Cant find core dll at: {coreDll.Value()}"); - } - if (!certExists()) - { - config.Error.WriteLine($"Cant find certificate at: {cert.Value()}"); - } - + if (!ExecExists() && !string.IsNullOrWhiteSpace(exec.Value())) config.Error.WriteLine($"Cant find single file executable at: {exec.Value()}"); + if (!CoreExists() && !string.IsNullOrWhiteSpace(coreDll.Value())) config.Error.WriteLine($"Cant find core dll at: {coreDll.Value()}"); + if (!CertExists()) config.Error.WriteLine($"Cant find certificate at: {cert.Value()}"); config.ShowHelp(); return 1; } @@ -214,7 +210,7 @@ namespace bitwardenSelfLicensor storageShort = (short) parsedStorage; } - GenerateUserLicense(new X509Certificate2(cert.Value(), "test"), coreDll.Value(), name.Value, email.Value, storageShort, userId, key.Value); + GenerateUserLicense(new X509Certificate2(cert.Value(), "test"), GetCoreDllPath(), name.Value, email.Value, storageShort, userId, key.Value); return 0; }); @@ -231,17 +227,11 @@ namespace bitwardenSelfLicensor config.OnExecute(() => { - if (!verifyTopOptions()) + if (!VerifyTopOptions()) { - if (!coreExists()) - { - config.Error.WriteLine($"Cant find core dll at: {coreDll.Value()}"); - } - if (!certExists()) - { - config.Error.WriteLine($"Cant find certificate at: {cert.Value()}"); - } - + if (!ExecExists() && !string.IsNullOrWhiteSpace(exec.Value())) config.Error.WriteLine($"Cant find single file executable at: {exec.Value()}"); + if (!CoreExists() && !string.IsNullOrWhiteSpace(coreDll.Value())) config.Error.WriteLine($"Cant find core dll at: {coreDll.Value()}"); + if (!CertExists()) config.Error.WriteLine($"Cant find certificate at: {cert.Value()}"); config.ShowHelp(); return 1; } @@ -275,7 +265,7 @@ namespace bitwardenSelfLicensor storageShort = (short) parsedStorage; } - GenerateOrgLicense(new X509Certificate2(cert.Value(), "test"), coreDll.Value(), name.Value, email.Value, storageShort, installationId, businessName.Value, key.Value); + GenerateOrgLicense(new X509Certificate2(cert.Value(), "test"), GetCoreDllPath(), name.Value, email.Value, storageShort, installationId, businessName.Value, key.Value); return 0; }); @@ -301,7 +291,7 @@ namespace bitwardenSelfLicensor } // checkUsername Checks that the username is a valid username - static bool checkUsername(string s) + private static bool CheckUsername(string s) { if ( string.IsNullOrWhiteSpace(s) ) { WriteLineOver("The username provided doesn't appear to be valid.\n"); @@ -311,7 +301,7 @@ namespace bitwardenSelfLicensor } // checkBusinessName Checks that the Business Name is a valid username - static bool checkBusinessName(string s) + private static bool CheckBusinessName(string s) { if ( string.IsNullOrWhiteSpace(s) ) { WriteLineOver("The Business Name provided doesn't appear to be valid.\n"); @@ -321,7 +311,7 @@ namespace bitwardenSelfLicensor } // checkEmail Checks that the email address is a valid email address - static bool checkEmail(string s) + private static bool CheckEmail(string s) { if ( string.IsNullOrWhiteSpace(s) ) { WriteLineOver("The email provided doesn't appear to be valid.\n"); @@ -331,7 +321,7 @@ namespace bitwardenSelfLicensor } // checkStorage Checks that the storage is in a valid range - static bool checkStorage(string s) + private static bool CheckStorage(string s) { if (string.IsNullOrWhiteSpace(s)) { @@ -347,19 +337,16 @@ namespace bitwardenSelfLicensor } // WriteLineOver Writes a new line to console over last line. - static void WriteLineOver(string s) + private static void WriteLineOver(string s) { Console.SetCursorPosition(0, Console.CursorTop -1); Console.WriteLine(s); } // WriteLine This wrapper is just here so that console writes all look similar. - static void WriteLine(string s) - { - Console.WriteLine(s); - } + private static void WriteLine(string s) => Console.WriteLine(s); - static void GenerateUserLicense(X509Certificate2 cert, string corePath, string userName, string email, short storage, Guid userId, string key) + private static void GenerateUserLicense(X509Certificate2 cert, string corePath, string userName, string email, short storage, Guid userId, string key) { var core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath); @@ -392,7 +379,7 @@ namespace bitwardenSelfLicensor Console.WriteLine(JsonConvert.SerializeObject(license, Formatting.Indented)); } - static void GenerateOrgLicense(X509Certificate2 cert, string corePath, string userName, string email, short storage, Guid instalId, string businessName, string key) + private static void GenerateOrgLicense(X509Certificate2 cert, string corePath, string userName, string email, short storage, Guid instalId, string businessName, string key) { var core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath); diff --git a/src/licenseGen/licenseGen.csproj b/src/licenseGen/licenseGen.csproj index 95fdf29..2bff89f 100644 --- a/src/licenseGen/licenseGen.csproj +++ b/src/licenseGen/licenseGen.csproj @@ -1,4 +1,4 @@ - + Exe @@ -7,7 +7,8 @@ - + +