Unified work (#269)

* Some work on line endings

* Enable buildkit

* Update documentation

* Settle the newline and tab vs spaces for now

Not perfect, but it's a standard

* Change wording

* Update version memo

* Add correct definition for markdown

* Make things clearer

.editorconfig

@@ -0,0 +1,19 @@
+root=true
+
+############################### 
+# Core EditorConfig Options   # 
+############################### 
+# All files 
+[*]
+indent_style=tab
+indent_size=4
+trim_trailing_whitespace=true
+end_of_line=lf
+charset=utf-8
+
+[*.{cs}]
+insert_final_newline=false
+
+[*.{md,mkdn}]
+trim_trailing_whitespace = true
+indent_style = space

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

.gitignore

@@ -9,3 +9,4 @@ src/bitBetter/.vs/*
 *.pfx
 *.cer
 *.vsidx
+.DS_Store

.servers/serverlist.txt

@@ -1,4 +1,4 @@
 # Uncomment a line below and fill in the missing values or add your own. Every line in this file will be called by build.[sh|ps1] once the patched image is built.
-# docker run -d --name bitwarden -v <full-local-path>\logs:/var/log/bitwarden -v <full-local-path>\bwdata:/etc/bitwarden -p 80:8080 --env-file <full-local-path>\settings.env bitwarden-patched
+# docker run -d --name bitwarden --restart=always -v <full-local-path>\logs:/var/log/bitwarden -v <full-local-path>\bwdata:/etc/bitwarden -p 80:8080 --env-file <full-local-path>\settings.env bitwarden-patched
 # <OR>
 # docker-compose -f <full-local-path>/docker-compose.yml up -d

README.md

@@ -1,12 +1,14 @@
-# BitBetter
+# BitBetter lite
 
 BitBetter is is a tool to modify Bitwarden's core dll to allow you to generate your own individual and organisation licenses.
 
 Please see the FAQ below for details on why this software was created.
 
-_Beware! BitBetter does some semi janky stuff to rewrite the bitwarden core dll and allow the installation of a self signed certificate. Use at your own risk!_
+Be aware that this branch is **only** for the lite (formerly unified) version of bitwarden. It has been rewritten and works in different ways than the master branch.
 
-Credit to https://github.com/h44z/BitBetter and https://github.com/jakeswenson/BitBetter
+_Beware! BitBetter is a solution that generates a personal certificate and uses that to generate custom licences. This requires (automated) modifying of libraries. Use at your own risk!_
+
+Credit to https://github.com/h44z/BitBetter and https://github.com/jakeswenson/BitBetter and https://github.com/GieltjE/BitBetter
 
 # Table of Contents
 - [BitBetter](#bitbetter)
@@ -30,7 +32,7 @@ The following instructions are for unix-based systems (Linux, BSD, macOS) and Wi
 ## Dependencies
 Aside from docker, which you also need for Bitwarden, BitBetter requires the following:
 
-* Bitwarden (tested with 1.47.1, might work on lower versions)
+* Bitwarden (tested with 2025.11.1 might work on lower versions), for safety always stay up to date
 * openssl (probably already installed on most Linux or WSL systems, any version should work, on Windows it will be auto installed using winget)
 
 ## Setting up BitBetter
@@ -63,14 +65,14 @@ The scripts supports running and patching multi instances.
 Edit the .servers/serverlist.txt file and fill in the missing values, they can be replaced with existing installation values.
 This file may be empty, but there will be no containers will be spun up automatically.
 
-Now it is time to **run the main build script** to generate a modified version of the `ghcr.io/bitwarden/self-host` docker image and the license generator.
+Now it is time to **run the main build script** to generate a modified version of the `ghcr.io/bitwarden/lite` docker image and the license generator.
 
 From the BitBetter directory, simply run:
 ```
 ./build.[sh|ps1]
 ```
 
-This will create a new self-signed certificate in the `.keys` directory if one does not already exist and then create a modified version of the official `ghcr.io/bitwarden/self-host` image called `bitwarden-patched`.
+This will create a new self-signed certificate in the `.keys` directory if one does not already exist and then create a modified version of the official `ghcr.io/bitwarden/lite` image called `bitwarden-patched`.
 
 Afterwards it will automatically generate the license generator and start all previously specified containers which are **now ready to accept self-issued licenses.**
 
@@ -98,6 +100,36 @@ If you ran the build script, you can **simply run the license gen in interactive
 **The license generator will spit out a JSON-formatted license which can then be used within the Bitwarden web front-end to license your user or org!**
 
 
+## Migrating from mssql to a real database
+
+Prepare a new database and bwdata directory, download and prepare the new settings.env (https://raw.githubusercontent.com/bitwarden/self-host/refs/heads/main/bitwarden-lite/settings.env)
+
+Make sure you can get the data from either the backup file or by connecting directly to the mssql database (navicat has a trial).
+
+If required (e.g. you cannot connect to your docker mssql server directly) download Microsoft SQL Server 2022 and SQL Server Management Studio (the latter can be used to import the .bak file)
+
+After cloning this repo and modifying .servers/serverlist.txt to suit your new environment do the following:
+
+```
+docker exec -i bitwarden-mssql /backup-db.sh
+./bitwarden.sh stop
+```
+
+Run build.sh and ensure your new instance serves a webpage AND has populated the new database with the tables (should be empty now)
+
+Proceed to stop the new container for now.
+
+Copy from the old to the new bwdata directory (do not copy/overwrite identity.pfx!):
+ - bwdata/core/licenses to bwdata-new/licenses
+ - bwdata/core/aspnet-dataprotection to bwdata-new/data-protection
+ - bwdata/core/attachments to bwdata-new/attachments
+
+Export data only from the old sql server database, if needed import the .bak file to a local mssql instance.
+
+Only export tables that have rows, makes it much quicker, .json is the easiest with navicat.
+
+Import the rows to the real database, start the new docker container.
+
 ---
 
 # FAQ: Questions you might have.
@@ -114,6 +146,26 @@ In the past we have done so but they were not focused on the type of customer th
 
 UPDATE: Bitwarden now offers a cheap license called [Families Organization](https://bitwarden.com/pricing/) that provides premium features and the ability to self-host Bitwarden for six persons.
 
+## 2fa doesn't work
+
+Unfortunately the new BitWarden container doesn't set the timezone and ignores TZ= from the environment, can be fixed by:
+
+```
+docker exec bitwarden ln -s /usr/share/zoneinfo/Europe/Amsterdam /etc/localtime
+```
+
+## Changes in settings.env
+
+Require a recreation of the docker container, build.sh will suffice too.
+
+## Migrating from the old unified branch
+
+```
+git branch -m unified lite
+git fetch origin
+git branch -u origin/lite lite
+git remote set-head origin -a
+```
 
 # Footnotes
 

build.ps1

@@ -1,6 +1,13 @@
 $ErrorActionPreference = 'Stop'
 $PSNativeCommandUseErrorActionPreference = $true
 
+# detect buildx, ErrorActionPreference will ensure the script stops execution if not found
+docker buildx version
+
+# Enable BuildKit for better build experience and to ensure platform args are populated
+$env:DOCKER_BUILDKIT=1
+$env:COMPOSE_DOCKER_CLI_BUILD=1
+
 # define temporary directory
 $tempdirectory = "$pwd\temp"
 # define services to patch
@@ -27,7 +34,6 @@ if (Test-Path "$pwd\.keys\cert.cert" -PathType Leaf) {
 	Rename-Item -Path "$pwd\.keys\cert.cert" -NewName "$pwd\.keys\cert.cer"
 }
 
-
 # generate keys if none are available
 if (!(Test-Path "$pwd\.keys" -PathType Container)) {
 	.\generateKeys.ps1
@@ -40,7 +46,7 @@ Copy-Item "$pwd\.keys\cert.cer" -Destination "$pwd\src\bitBetter"
 docker build --no-cache -t bitbetter/bitbetter "$pwd\src\bitBetter"
 Remove-Item "$pwd\src\bitBetter\cert.cer" -Force
 
-# gather all running instances, cannot run a wildcard filter on Ancestor= :(
+# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden*
 $oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}'
 
 # stop and remove all running instances
@@ -51,11 +57,11 @@ foreach ($instance in $oldinstances) {
 
 # update bitwarden itself
 if ($args[0] -eq 'update') {
-	docker pull ghcr.io/bitwarden/self-host:beta
+	docker pull ghcr.io/bitwarden/lite:latest
 } else {
 	$confirmation = Read-Host "Update (or get) bitwarden source container (y/n)"
 	if ($confirmation -eq 'y') {
-		docker pull ghcr.io/bitwarden/self-host:beta
+		docker pull ghcr.io/bitwarden/lite:latest
 	}
 }
 
@@ -78,7 +84,7 @@ foreach ($instance in $oldinstances) {
 }
 
 # start a new bitwarden instance so we can patch it
-$patchinstance = docker run -d --name bitwarden-extract ghcr.io/bitwarden/self-host:beta
+$patchinstance = docker run -d --name bitwarden-extract ghcr.io/bitwarden/lite:latest
 
 # create our temporary directory
 New-item -ItemType Directory -Path $tempdirectory

build.sh

@@ -1,6 +1,13 @@
 #!/bin/bash
 set -e
 
+# detect buildx, set -e will ensure the script stops execution if not found
+docker buildx version
+
+# Enable BuildKit for better build experience and to ensure platform args are populated
+export DOCKER_BUILDKIT=1
+export COMPOSE_DOCKER_CLI_BUILD=1
+
 # define temporary directory
 TEMPDIRECTORY="$PWD/temp"
 
@@ -40,7 +47,7 @@ cp -f "$PWD/.keys/cert.cer" "$PWD/src/bitBetter"
 docker build --no-cache -t bitbetter/bitbetter "$PWD/src/bitBetter"
 rm -f "$PWD/src/bitBetter/cert.cer"
 
-# gather all running instances, cannot run a wildcard filter on Ancestor= :(
+# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden*
 OLDINSTANCES=$(docker container ps --all -f Name=bitwarden --format '{{.ID}}')
 
 # stop and remove all running instances
@@ -51,13 +58,11 @@ done
 
 # update bitwarden itself
 if [ "$1" = "update" ]; then
-	docker pull ghcr.io/bitwarden/self-host:beta
+	docker pull ghcr.io/bitwarden/lite:latest
 else
-	read -p "Update (or get) bitwarden source container (y/n): " -n 1 -r
-	echo
-	if [[ $REPLY =~ ^[Yy]$ ]]
-	then
-		docker pull ghcr.io/bitwarden/self-host:beta
+	read -p "Update (or get) bitwarden source container (y/n): "
+	if [[ $REPLY =~ ^[Yy]$ ]]; then
+		docker pull ghcr.io/bitwarden/lite:latest
 	fi
 fi
 
@@ -80,7 +85,7 @@ for INSTANCE in ${OLDINSTANCES[@]}; do
 done
 
 # start a new bitwarden instance so we can patch it
-PATCHINSTANCE=$(docker run -d --name bitwarden-extract ghcr.io/bitwarden/self-host:beta)
+PATCHINSTANCE=$(docker run -d --name bitwarden-extract ghcr.io/bitwarden/lite:latest)
 
 # create our temporary directory
 mkdir $TEMPDIRECTORY
@@ -102,10 +107,11 @@ docker run -v "$TEMPDIRECTORY:/app/mount" --rm bitbetter/bitbetter
 docker build . --tag bitwarden-patched --file "$PWD/src/bitBetter/Dockerfile-bitwarden-patch"
 
 # start all user requested instances
-if [ -f "$PWD/src/bitBetter/cert.cer" ]; then
+if [ -f "$PWD/.servers/serverlist.txt" ]; then
+	# convert line endings to unix
 	sed -i 's/\r$//' "$PWD/.servers/serverlist.txt"
 	cat "$PWD/.servers/serverlist.txt" | while read -r LINE; do
-		if [[ $LINE == "#*" ]]; then
+		if [[ $LINE != "#"* ]]; then
 			bash -c "$LINE"
 		fi
 	done

src/bitBetter/Dockerfile-bitwarden-patch

@@ -1,3 +1,3 @@
-FROM ghcr.io/bitwarden/self-host:beta
+FROM ghcr.io/bitwarden/lite:latest
 
 COPY ./temp/ /app/

src/licenseGen/Program.cs

@@ -11,7 +11,7 @@ namespace licenseGen;
 internal class Program
 {
 	private static readonly CommandLineApplication App = new();
-    private static readonly CommandOption Cert = App.Option("--cert", "Certifcate file", CommandOptionType.SingleValue);
+	private static readonly CommandOption Cert = App.Option("--cert", "Certificate file", CommandOptionType.SingleValue);
 	private static readonly CommandOption CoreDll = App.Option("--core", "Path to Core.dll", CommandOptionType.SingleValue);
 
 	private static Int32 Main(String[] args)
@@ -269,23 +269,30 @@ internal class Program
 
 	private static void Check()
 	{
-        if (!File.Exists(Cert.Value()))
+		if (Cert == null || String.IsNullOrWhiteSpace(Cert.Value()))
+		{
+			App.Error.WriteLine("No certificate specified");
+			App.ShowHelp();
+			Environment.Exit(1);
+		}
+		else if (CoreDll == null || String.IsNullOrWhiteSpace(CoreDll.Value()))
+		{
+			App.Error.WriteLine("No core dll specified");
+			App.ShowHelp();
+			Environment.Exit(1);
+		}
+		else if (!File.Exists(Cert.Value()))
 		{
 			App.Error.WriteLine($"Can't find certificate at: {Cert.Value()}");
 			App.ShowHelp();
 			Environment.Exit(1);
 		}
-        if (!File.Exists(CoreDll.Value()))
+		else if (!File.Exists(CoreDll.Value()))
 		{
 			App.Error.WriteLine($"Can't find core dll at: {CoreDll.Value()}");
 			App.ShowHelp();
 			Environment.Exit(1);
 		}
-        if (Cert == null || String.IsNullOrWhiteSpace(Cert.Value()) || CoreDll == null || String.IsNullOrWhiteSpace(CoreDll.Value()))
-        {
-            App.ShowHelp();
-            Environment.Exit(1);
-        }
 	}
 
 	// checkUsername Checks that the username is a valid username