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

.circleci/config.yml

@@ -1,21 +1,21 @@
-version: 2.1
+version: 2.1
-jobs:
+jobs:
-  build:
+  build:
-    machine: true
+    machine: true
-    steps:
+    steps:
-      - checkout
+      - checkout
-      - run:
+      - run:
-          name: Print the Current Time
+          name: Print the Current Time
-          command: date
+          command: date
-      - run:
+      - run:
-          name: Generate Keys
+          name: Generate Keys
-          command: ./generateKeys.sh
+          command: ./generateKeys.sh
-      - run:
+      - run:
-          name: Build script
+          name: Build script
-          command: ./build.sh update
+          command: ./build.sh update
-      - run:
+      - run:
-          name: Test generating user license
+          name: Test generating user license
-          command: ./licenseGen.sh user TestName TestEmail@example.com 4a619d4a-522d-4c70-8596-affb5b607c23
+          command: ./licenseGen.sh user TestName TestEmail@example.com 4a619d4a-522d-4c70-8596-affb5b607c23
-      - run:
+      - run:
-          name: Test generating organization license
+          name: Test generating organization license
           command: ./licenseGen.sh org TestName TestEmail@example.com 4a619d4a-522d-4c70-8596-affb5b607c23

.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

@@ -7,5 +7,6 @@ src/bitBetter/.vs/*
 *.pem
 .vscode/
 *.pfx
-*.cert
+*.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.
+# 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-patch
+# 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>
+# <OR>
-# docker-compose -f <full-local-path>/docker-compose.yml up -d
+# 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
@@ -46,8 +48,8 @@ If you wish to generate your self-signed cert & key manually, you can run the fo
 
 ```bash
 cd .keys
-openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.cert -days 36500 -outform DER -passout pass:test
+openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.cer -days 36500 -outform DER -passout pass:test
-openssl x509 -inform DER -in cert.cert -out cert.pem
+openssl x509 -inform DER -in cert.cer -out cert.pem
 openssl pkcs12 -export -out cert.pfx -inkey key.pem -in cert.pem -passin pass:test -passout pass:test
 ```
 
@@ -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-patch`.
+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,108 +1,132 @@
-$ErrorActionPreference = 'Stop'
+$ErrorActionPreference = 'Stop'
-$PSNativeCommandUseErrorActionPreference = $true
+$PSNativeCommandUseErrorActionPreference = $true
-
+
-# define temporary directory
+# detect buildx, ErrorActionPreference will ensure the script stops execution if not found
-$tempdirectory = "$pwd\temp"
+docker buildx version
-# define services to patch
+
-$components = "Api","Identity"
+# Enable BuildKit for better build experience and to ensure platform args are populated
-
+$env:DOCKER_BUILDKIT=1
-# delete old directories / files if applicable
+$env:COMPOSE_DOCKER_CLI_BUILD=1
-if (Test-Path "$tempdirectory") {
+
-	Remove-Item "$tempdirectory" -Recurse -Force
+# define temporary directory
-}
+$tempdirectory = "$pwd\temp"
-
+# define services to patch
-if (Test-Path -Path "$pwd\src\licenseGen\Core.dll" -PathType Leaf) {
+$components = "Api","Identity"
-	Remove-Item "$pwd\src\licenseGen\Core.dll" -Force
+
-}
+# delete old directories / files if applicable
-
+if (Test-Path "$tempdirectory" -PathType Container) {
-if (Test-Path -Path "$pwd\src\licenseGen\cert.pfx" -PathType Leaf) {
+	Remove-Item "$tempdirectory" -Recurse -Force
-	Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
+}
-}
+
-
+if (Test-Path -Path "$pwd\src\licenseGen\Core.dll" -PathType Leaf) {
-if (Test-Path -Path "$pwd\src\bitBetter\cert.cert" -PathType Leaf) {
+	Remove-Item "$pwd\src\licenseGen\Core.dll" -Force
-	Remove-Item "$pwd\src\bitBetter\cert.cert" -Force
+}
-}
+
-
+if (Test-Path -Path "$pwd\src\licenseGen\cert.pfx" -PathType Leaf) {
-# generate keys if none are available
+	Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
-if (!(Test-Path "$pwd\.keys")) {
+}
-	.\generateKeys.ps1
+
-}
+if (Test-Path -Path "$pwd\src\bitBetter\cert.cer" -PathType Leaf) {
-
+	Remove-Item "$pwd\src\bitBetter\cert.cer" -Force
-# copy the key to bitBetter
+}
-Copy-Item "$pwd\.keys\cert.cert" -Destination "$pwd\src\bitBetter"
+
-
+if (Test-Path "$pwd\.keys\cert.cert" -PathType Leaf) {
-# build bitBetter and clean the source directory after
+	Rename-Item -Path "$pwd\.keys\cert.cert" -NewName "$pwd\.keys\cert.cer"
-docker build --no-cache -t bitbetter/bitbetter "$pwd\src\bitBetter"
+}
-Remove-Item "$pwd\src\bitBetter\cert.cert" -Force
+
-
+# generate keys if none are available
-# gather all running instances
+if (!(Test-Path "$pwd\.keys" -PathType Container)) {
-$oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}'
+	.\generateKeys.ps1
-
+}
-# stop all running instances
+
-foreach ($instance in $oldinstances) {
+# copy the key to bitBetter
-	docker stop $instance
+Copy-Item "$pwd\.keys\cert.cer" -Destination "$pwd\src\bitBetter"
-	docker rm $instance
+
-}
+# build bitBetter and clean the source directory after
-
+docker build --no-cache -t bitbetter/bitbetter "$pwd\src\bitBetter"
-# update bitwarden itself
+Remove-Item "$pwd\src\bitBetter\cert.cer" -Force
-if ($args[0] -eq 'y') {
+
-	docker pull ghcr.io/bitwarden/self-host:beta
+# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden*
-} else {
+$oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}'
-	$confirmation = Read-Host "Update (or get) bitwarden source container (y/n)"
+
-	if ($confirmation -eq 'y') {
+# stop and remove all running instances
-		docker pull ghcr.io/bitwarden/self-host:beta
+foreach ($instance in $oldinstances) {
-	}
+	docker stop $instance
-}
+	docker rm $instance
-
+}
-# stop and remove previous existing patch(ed) container
+
-docker stop bitwarden-patch
+# update bitwarden itself
-docker rm bitwarden-patch
+if ($args[0] -eq 'update') {
-docker image rm bitwarden-patch
+	docker pull ghcr.io/bitwarden/lite:latest
-
+} else {
-# start a new bitwarden instance so we can patch it
+	$confirmation = Read-Host "Update (or get) bitwarden source container (y/n)"
-$patchinstance = docker run -d --name bitwarden-patch ghcr.io/bitwarden/self-host:beta
+	if ($confirmation -eq 'y') {
-
+		docker pull ghcr.io/bitwarden/lite:latest
-# create our temporary directory
+	}
-New-item -ItemType Directory -Path $tempdirectory
+}
-
+
-# extract the files that need to be patched from the services that need to be patched into our temporary directory
+# stop and remove previous existing patch(ed) container
-foreach ($component in $components) {
+$oldinstances = docker container ps --all -f Ancestor=bitwarden-patched --format '{{.ID}}'
-	New-item -itemtype Directory -path "$tempdirectory\$component"
+foreach ($instance in $oldinstances) {
-	docker cp $patchinstance`:/app/$component/Core.dll "$tempdirectory\$component\Core.dll"
+	docker stop $instance
-}
+	docker rm $instance
-
+}
-# run bitBetter, this applies our patches to the required files
+$oldinstances = docker image ls bitwarden-patched --format '{{.ID}}'
-docker run -v "$tempdirectory`:/app/mount" --rm bitbetter/bitbetter
+foreach ($instance in $oldinstances) {
-
+	docker image rm $instance
-# create a new image with the patched files
+}
-docker build . --tag bitwarden-patch --file "$pwd\src\bitBetter\Dockerfile-bitwarden-patch"
+
-
+# remove old extract containers
-# stop and remove our temporary container
+$oldinstances = docker container ps --all -f Name=bitwarden-extract --format '{{.ID}}'
-docker stop bitwarden-patch
+foreach ($instance in $oldinstances) {
-docker rm bitwarden-patch
+	docker stop $instance
-
+	docker rm $instance
-# start all user requested instances
+}
-if (Test-Path -Path "$pwd\.servers\serverlist.txt" -PathType Leaf) {
+
-	foreach($line in Get-Content "$pwd\.servers\serverlist.txt") {
+# start a new bitwarden instance so we can patch it
-		if (!($line.StartsWith("#"))) {
+$patchinstance = docker run -d --name bitwarden-extract ghcr.io/bitwarden/lite:latest
-			Invoke-Expression "& $line"
+
-		}
+# create our temporary directory
-	}
+New-item -ItemType Directory -Path $tempdirectory
-}
+
-
+# extract the files that need to be patched from the services that need to be patched into our temporary directory
-# remove our bitBetter image
+foreach ($component in $components) {
-docker image rm bitbetter/bitbetter
+	New-item -itemtype Directory -path "$tempdirectory\$component"
-
+	docker cp $patchinstance`:/app/$component/Core.dll "$tempdirectory\$component\Core.dll"
-# copy our patched library to the licenseGen source directory
+}
-Copy-Item "$tempdirectory\Identity\Core.dll" -Destination "$pwd\src\licenseGen"
+
-Copy-Item "$pwd\.keys\cert.pfx" -Destination "$pwd\src\licenseGen"
+# stop and remove our temporary container
-
+docker stop bitwarden-extract
-# build the licenseGen
+docker rm bitwarden-extract
-docker build -t bitbetter/licensegen "$pwd\src\licenseGen"
+
-
+# run bitBetter, this applies our patches to the required files
-# clean the licenseGen source directory
+docker run -v "$tempdirectory`:/app/mount" --rm bitbetter/bitbetter
-Remove-Item "$pwd\src\licenseGen\Core.dll" -Force
+
-Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
+# create a new image with the patched files
-
+docker build . --tag bitwarden-patched --file "$pwd\src\bitBetter\Dockerfile-bitwarden-patch"
-# remove our temporary directory
+
-Remove-Item "$tempdirectory" -Recurse -Force
+# start all user requested instances
+if (Test-Path -Path "$pwd\.servers\serverlist.txt" -PathType Leaf) {
+	foreach($line in Get-Content "$pwd\.servers\serverlist.txt") {
+		if (!($line.StartsWith("#"))) {
+			Invoke-Expression "& $line"
+		}
+	}
+}
+
+# remove our bitBetter image
+docker image rm bitbetter/bitbetter
+
+# copy our patched library to the licenseGen source directory
+Copy-Item "$tempdirectory\Identity\Core.dll" -Destination "$pwd\src\licenseGen"
+Copy-Item "$pwd\.keys\cert.pfx" -Destination "$pwd\src\licenseGen"
+
+# build the licenseGen
+docker build -t bitbetter/licensegen "$pwd\src\licenseGen"
+
+# clean the licenseGen source directory
+Remove-Item "$pwd\src\licenseGen\Core.dll" -Force
+Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
+
+# remove our temporary directory
+Remove-Item "$tempdirectory" -Recurse -Force

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"
 
@@ -13,15 +20,19 @@ if [ -d "$TEMPDIRECTORY" ]; then
 fi
 
 if [ -f "$PWD/src/licenseGen/Core.dll" ]; then
-    rm -f "$PWD/src/licenseGen/Core.dll"
+	rm -f "$PWD/src/licenseGen/Core.dll"
 fi
 
 if [ -f "$PWD/src/licenseGen/cert.pfx" ]; then
-    rm -f "$PWD/src/licenseGen/cert.pfx"
+	rm -f "$PWD/src/licenseGen/cert.pfx"
 fi
 
-if [ -f "$PWD/src/bitBetter/cert.cert" ]; then
+if [ -f "$PWD/src/bitBetter/cert.cer" ]; then
-    rm -f "$PWD/src/bitBetter/cert.cert"
+	rm -f "$PWD/src/bitBetter/cert.cer"
+fi
+
+if [ -f "$PWD/.keys/cert.cert" ]; then
+	mv "$PWD/.keys/cert.cert" "$PWD/.keys/cert.cer"
 fi
 
 # generate keys if none are available
@@ -30,16 +41,16 @@ if [ ! -d "$PWD/.keys" ]; then
 fi
 
 # copy the key to bitBetter
-cp -f "$PWD/.keys/cert.cert" "$PWD/src/bitBetter"
+cp -f "$PWD/.keys/cert.cer" "$PWD/src/bitBetter"
 
 # build bitBetter and clean the source directory after
 docker build --no-cache -t bitbetter/bitbetter "$PWD/src/bitBetter"
-rm -f "$PWD/src/bitBetter/cert.cert"
+rm -f "$PWD/src/bitBetter/cert.cer"
 
-# gather all running instances
+# 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 all running instances
+# stop and remove all running instances
 for INSTANCE in ${OLDINSTANCES[@]}; do
 	docker stop $INSTANCE
 	docker rm $INSTANCE
@@ -47,23 +58,34 @@ 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
+	read -p "Update (or get) bitwarden source container (y/n): "
-	echo
+	if [[ $REPLY =~ ^[Yy]$ ]]; then
-	if [[ $REPLY =~ ^[Yy]$ ]]
+		docker pull ghcr.io/bitwarden/lite:latest
-	then
-		docker pull ghcr.io/bitwarden/self-host:beta
 	fi
 fi
 
 # stop and remove previous existing patch(ed) container
-docker stop bitwarden-patch
+OLDINSTANCES=$(docker container ps --all -f Ancestor=bitwarden-patched --format '{{.ID}}')
-docker rm bitwarden-patch
+for INSTANCE in ${OLDINSTANCES[@]}; do
-docker image rm bitwarden-patch
+	docker stop $INSTANCE
+	docker rm $INSTANCE
+done
+OLDINSTANCES=$(docker image ls bitwarden-patched --format '{{.ID}}')
+for INSTANCE in ${OLDINSTANCES[@]}; do
+	docker image rm $INSTANCE
+done
+
+# remove old extract containers
+OLDINSTANCES=$(docker container ps --all -f Name=bitwarden-extract --format '{{.ID}}')
+for INSTANCE in ${OLDINSTANCES[@]}; do
+	docker stop $INSTANCE
+	docker rm $INSTANCE
+done
 
 # start a new bitwarden instance so we can patch it
-PATCHINSTANCE=$(docker run -d --name bitwarden-patch ghcr.io/bitwarden/self-host:beta)
+PATCHINSTANCE=$(docker run -d --name bitwarden-extract ghcr.io/bitwarden/lite:latest)
 
 # create our temporary directory
 mkdir $TEMPDIRECTORY
@@ -74,21 +96,22 @@ for COMPONENT in ${COMPONENTS[@]}; do
 	docker cp $PATCHINSTANCE:/app/$COMPONENT/Core.dll "$TEMPDIRECTORY/$COMPONENT/Core.dll"
 done
 
+# stop and remove our temporary container
+docker stop bitwarden-extract
+docker rm bitwarden-extract
+
 # run bitBetter, this applies our patches to the required files
 docker run -v "$TEMPDIRECTORY:/app/mount" --rm bitbetter/bitbetter
 
 # create a new image with the patched files
-docker build . --tag bitwarden-patch --file "$PWD/src/bitBetter/Dockerfile-bitwarden-patch"
+docker build . --tag bitwarden-patched --file "$PWD/src/bitBetter/Dockerfile-bitwarden-patch"
-
-# stop and remove our temporary container
-docker stop bitwarden-patch
-docker rm bitwarden-patch
 
 # start all user requested instances
-if [ -f "$PWD/src/bitBetter/cert.cert" ]; 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 == "#*" ]] ;
+		if [[ $LINE != "#"* ]]; then
 			bash -c "$LINE"
 		fi
 	done
@@ -109,4 +132,4 @@ rm -f "$PWD/src/licenseGen/Core.dll"
 rm -f "$PWD/src/licenseGen/cert.pfx"
 
 # remove our temporary directory
-rm -rf "$TEMPDIRECTORY"
+rm -rf "$TEMPDIRECTORY"

generateKeys.ps1

@@ -1,25 +1,25 @@
-$ErrorActionPreference = 'Stop'
+$ErrorActionPreference = 'Stop'
-$PSNativeCommandUseErrorActionPreference = $true
+$PSNativeCommandUseErrorActionPreference = $true
-
+
-# get the basic openssl binary path
+# get the basic openssl binary path
-$opensslbinary = "$Env:Programfiles\OpenSSL-Win64\bin\openssl.exe"
+$opensslbinary = "$Env:Programfiles\OpenSSL-Win64\bin\openssl.exe"
-
+
-# if openssl is not installed attempt to install it
+# if openssl is not installed attempt to install it
-if (!(Get-Command $opensslbinary -errorAction SilentlyContinue))
+if (!(Get-Command $opensslbinary -errorAction SilentlyContinue))
-{
+{
-    winget install openssl
+	winget install openssl
-}
+}
-
+
-# if previous keys exist, remove them
+# if previous keys exist, remove them
-if (Test-Path "$pwd\.keys")
+if (Test-Path "$pwd\.keys")
-{
+{
-	Remove-Item "$pwd\.keys" -Recurse -Force
+	Remove-Item "$pwd\.keys" -Recurse -Force
-}
+}
-
+
-# create new directory 
+# create new directory 
-New-item -ItemType Directory -Path "$pwd\.keys"
+New-item -ItemType Directory -Path "$pwd\.keys"
-
+
-# generate actual keys
+# generate actual keys
-Invoke-Expression "& '$opensslbinary' req -x509 -newkey rsa:4096 -keyout `"$pwd\.keys\key.pem`" -out `"$pwd\.keys\cert.cert`" -days 36500 -subj '/CN=www.mydom.com/O=My Company Name LTD./C=US' -outform DER -passout pass:test"
+Invoke-Expression "& '$opensslbinary' req -x509 -newkey rsa:4096 -keyout `"$pwd\.keys\key.pem`" -out `"$pwd\.keys\cert.cer`" -days 36500 -subj '/CN=www.mydom.com/O=My Company Name LTD./C=US' -outform DER -passout pass:test"
-Invoke-Expression "& '$opensslbinary' x509 -inform DER -in `"$pwd\.keys\cert.cert`" -out `"$pwd\.keys\cert.pem`""
+Invoke-Expression "& '$opensslbinary' x509 -inform DER -in `"$pwd\.keys\cert.cer`" -out `"$pwd\.keys\cert.pem`""
 Invoke-Expression "& '$opensslbinary' pkcs12 -export -out `"$pwd\.keys\cert.pfx`" -inkey `"$pwd\.keys\key.pem`" -in `"$pwd\.keys\cert.pem`" -passin pass:test -passout pass:test"

generateKeys.sh

@@ -15,6 +15,6 @@ fi
 mkdir "$DIR"
 
 # Generate new keys
-openssl	req -x509 -newkey rsa:4096 -keyout "$DIR/key.pem" -out "$DIR/cert.cert" -days 36500 -subj '/CN=www.mydom.com/O=My Company Name LTD./C=US'  -outform DER -passout pass:test
+openssl	req -x509 -newkey rsa:4096 -keyout "$DIR/key.pem" -out "$DIR/cert.cer" -days 36500 -subj '/CN=www.mydom.com/O=My Company Name LTD./C=US'  -outform DER -passout pass:test
-openssl x509 -inform DER -in "$DIR/cert.cert" -out "$DIR/cert.pem"
+openssl x509 -inform DER -in "$DIR/cert.cer" -out "$DIR/cert.pem"
 openssl pkcs12 -export -out "$DIR/cert.pfx" -inkey "$DIR/key.pem" -in "$DIR/cert.pem" -passin pass:test -passout pass:test

licenseGen.ps1

@@ -2,16 +2,16 @@ $ErrorActionPreference = 'Stop'
 $PSNativeCommandUseErrorActionPreference = $true
 
 if ($($args.Count) -lt 1) {
-    echo "USAGE: <License Gen action> [License Gen args...]"
+	echo "USAGE: <License Gen action> [License Gen args...]"
-    echo "ACTIONS:"
+	echo "ACTIONS:"
-    echo " interactive"
+	echo " interactive"
-    echo " user"
+	echo " user"
-    echo " org"
+	echo " org"
 	Exit 1
 }
 
 if ($args[0] -eq "interactive") {
-    docker run -it --rm bitbetter/licensegen interactive
+	docker run -it --rm bitbetter/licensegen interactive
 } else {
-    docker run bitbetter/licensegen $args
+	docker run bitbetter/licensegen $args
 }

licenseGen.sh

@@ -2,12 +2,12 @@
 set -e
 
 if [ $# -lt 1 ]; then
-    echo "USAGE: <License Gen action> [License Gen args...]"
+	echo "USAGE: <License Gen action> [License Gen args...]"
-    echo "ACTIONS:"
+	echo "ACTIONS:"
-    echo " interactive"
+	echo " interactive"
-    echo " user"
+	echo " user"
-    echo " org"
+	echo " org"
-    exit 1
+	exit 1
 fi
 
 if [ "$1" = "interactive" ]; then

src/bitBetter/Dockerfile

@@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /bitBetter
 
 COPY . /bitBetter
-COPY cert.cert /app/
+COPY cert.cer /app/
 
 RUN dotnet restore
 RUN dotnet publish -c Release -o /app --no-restore

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/bitBetter/Program.cs

@@ -1,67 +1,67 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Linq;
+using System.Linq;
-using System.Security.Cryptography.X509Certificates;
+using System.Security.Cryptography.X509Certificates;
-using dnlib.DotNet;
+using dnlib.DotNet;
-using dnlib.DotNet.Emit;
+using dnlib.DotNet.Emit;
-using dnlib.DotNet.Writer;
+using dnlib.DotNet.Writer;
-using dnlib.IO;
+using dnlib.IO;
-
+
-namespace bitBetter;
+namespace bitBetter;
-
+
-internal class Program
+internal class Program
-{
+{
-    private static Int32 Main()
+	private static Int32 Main()
-    {
+	{
-        const String certFile = "/app/cert.cert";
+		const String certFile = "/app/cert.cer";
-        String[] files = Directory.GetFiles("/app/mount", "Core.dll", SearchOption.AllDirectories);
+		String[] files = Directory.GetFiles("/app/mount", "Core.dll", SearchOption.AllDirectories);
-
+
-        foreach (String file in files)
+		foreach (String file in files)
-        {
+		{
-            Console.WriteLine(file);
+			Console.WriteLine(file);
-            ModuleDefMD moduleDefMd = ModuleDefMD.Load(file);
+			ModuleDefMD moduleDefMd = ModuleDefMD.Load(file);
-            Byte[] cert = File.ReadAllBytes(certFile);
+			Byte[] cert = File.ReadAllBytes(certFile);
-
+
-            EmbeddedResource embeddedResourceToRemove = moduleDefMd.Resources.OfType<EmbeddedResource>().First(r => r.Name.Equals("Bit.Core.licensing.cer"));
+			EmbeddedResource embeddedResourceToRemove = moduleDefMd.Resources.OfType<EmbeddedResource>().First(r => r.Name.Equals("Bit.Core.licensing.cer"));
-            EmbeddedResource embeddedResourceToAdd = new("Bit.Core.licensing.cer", cert) { Attributes = embeddedResourceToRemove.Attributes };
+			EmbeddedResource embeddedResourceToAdd = new("Bit.Core.licensing.cer", cert) { Attributes = embeddedResourceToRemove.Attributes };
-            moduleDefMd.Resources.Add(embeddedResourceToAdd);
+			moduleDefMd.Resources.Add(embeddedResourceToAdd);
-            moduleDefMd.Resources.Remove(embeddedResourceToRemove);
+			moduleDefMd.Resources.Remove(embeddedResourceToRemove);
-
+
-            DataReader reader = embeddedResourceToRemove.CreateReader();
+			DataReader reader = embeddedResourceToRemove.CreateReader();
-            X509Certificate2 existingCert = new(reader.ReadRemainingBytes());
+			X509Certificate2 existingCert = new(reader.ReadRemainingBytes());
-            
+			
-            Console.WriteLine($"Existing Cert Thumbprint: {existingCert.Thumbprint}");
+			Console.WriteLine($"Existing Cert Thumbprint: {existingCert.Thumbprint}");
-            X509Certificate2 certificate = new(cert);
+			X509Certificate2 certificate = new(cert);
-
+
-            Console.WriteLine($"New Cert Thumbprint: {certificate.Thumbprint}");
+			Console.WriteLine($"New Cert Thumbprint: {certificate.Thumbprint}");
-
+
-            IEnumerable<TypeDef> services = moduleDefMd.Types.Where(t => t.Namespace == "Bit.Core.Billing.Services");
+			IEnumerable<TypeDef> services = moduleDefMd.Types.Where(t => t.Namespace == "Bit.Core.Billing.Services");
-            TypeDef type = services.First(t => t.Name == "LicensingService");
+			TypeDef type = services.First(t => t.Name == "LicensingService");
-            MethodDef constructor = type.FindConstructors().First();
+			MethodDef constructor = type.FindConstructors().First();
-            
+			
-            Instruction instructionToPatch = constructor.Body.Instructions.FirstOrDefault(i => i.OpCode == OpCodes.Ldstr && String.Equals((String)i.Operand, existingCert.Thumbprint, StringComparison.InvariantCultureIgnoreCase));
+			Instruction instructionToPatch = constructor.Body.Instructions.FirstOrDefault(i => i.OpCode == OpCodes.Ldstr && String.Equals((String)i.Operand, existingCert.Thumbprint, StringComparison.InvariantCultureIgnoreCase));
-            
+			
-            if (instructionToPatch != null)
+			if (instructionToPatch != null)
-            {
+			{
-                instructionToPatch.Operand = certificate.Thumbprint;
+				instructionToPatch.Operand = certificate.Thumbprint;
-            }
+			}
-            else
+			else
-            {
+			{
-                Console.WriteLine("Can't find constructor to patch");
+				Console.WriteLine("Can't find constructor to patch");
-            }
+			}
-
+
-            ModuleWriterOptions moduleWriterOptions = new(moduleDefMd);
+			ModuleWriterOptions moduleWriterOptions = new(moduleDefMd);
-            moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.KeepOldMaxStack;
+			moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.KeepOldMaxStack;
-            moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.PreserveAll;
+			moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.PreserveAll;
-            moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.PreserveRids;
+			moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.PreserveRids;
-
+
-            moduleDefMd.Write(file + ".new");
+			moduleDefMd.Write(file + ".new");
-            moduleDefMd.Dispose();
+			moduleDefMd.Dispose();
-            File.Delete(file);
+			File.Delete(file);
-            File.Move(file + ".new", file);
+			File.Move(file + ".new", file);
-        }
+		}
-
+
-        return 0;
+		return 0;
-    }
+	}
 }

src/bitBetter/bitBetter.csproj

@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <PackageReference Include="dnlib" Version="4.5.0" />
+    <PackageReference Include="dnlib" Version="4.5.0" />
   </ItemGroup>
-</Project>
+</Project>

src/licenseGen/Program.cs

@@ -1,480 +1,485 @@
-using System;
+using System;
-using System.IO;
+using System.IO;
-using System.Text.Json;
+using System.Text.Json;
-using System.Reflection;
+using System.Reflection;
-using System.Runtime.Loader;
+using System.Runtime.Loader;
-using System.Security.Cryptography.X509Certificates;
+using System.Security.Cryptography.X509Certificates;
-using McMaster.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
-
+
-namespace licenseGen;
+namespace licenseGen;
-
+
-internal class Program
+internal class Program
-{
+{
-    private static readonly CommandLineApplication App = new();
+	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 readonly CommandOption CoreDll = App.Option("--core", "Path to Core.dll", CommandOptionType.SingleValue);
-
+
-    private static Int32 Main(String[] args)
+	private static Int32 Main(String[] args)
-    {
+	{
-        App.Command("interactive", config =>
+		App.Command("interactive", config =>
-        {
+		{
-            String buff, licenseType = "", name = "", email = "", businessName="";
+			String buff, licenseType = "", name = "", email = "", businessName="";
-            Int16 storage = 0;
+			Int16 storage = 0;
-            Boolean validGuid = false, validInstallid = false;
+			Boolean validGuid = false, validInstallid = false;
-            Guid guid = Guid.Empty, installid = Guid.Empty;
+			Guid guid = Guid.Empty, installid = Guid.Empty;
-
+
-            config.OnExecute(() =>
+			config.OnExecute(() =>
-            {
+			{
-                Check();
+				Check();
-                Console.WriteLine("Interactive license mode...");
+				Console.WriteLine("Interactive license mode...");
-                
+
-                while (licenseType == "")
+				while (licenseType == "")
-                {
+				{
-                    Console.WriteLine("What would you like to generate, a [u]ser license or an [o]rg license: ");
+					Console.WriteLine("What would you like to generate, a [u]ser license or an [o]rg license: ");
-                    buff = Console.ReadLine();
+					buff = Console.ReadLine();
-
+
-                    switch (buff)
+					switch (buff)
-                    {
+					{
-                        case "u":
+						case "u":
-                        {
+						{
-                            licenseType = "user";
+							licenseType = "user";
-                            Console.WriteLine("Okay, we will generate a user license.");
+							Console.WriteLine("Okay, we will generate a user license.");
-
+
-                            while (!validGuid)
+							while (!validGuid)
-                            {
+							{
-                                Console.WriteLine("Please provide the user's guid — refer to the Readme for details on how to retrieve this. [GUID]: ");
+								Console.WriteLine("Please provide the user's guid — refer to the Readme for details on how to retrieve this. [GUID]: ");
-                                buff = Console.ReadLine();
+								buff = Console.ReadLine();
-
+
-                                if (Guid.TryParse(buff, out guid))validGuid = true;
+								if (Guid.TryParse(buff, out guid))validGuid = true;
-                                else Console.WriteLine("The user-guid provided does not appear to be valid!");
+								else Console.WriteLine("The user-guid provided does not appear to be valid!");
-                            }
+							}
-                            break;
+							break;
-                        }
+						}
-                        case "o":
+						case "o":
-                        {
+						{
-                            licenseType = "org";
+							licenseType = "org";
-                            Console.WriteLine("Okay, we will generate an organization license.");
+							Console.WriteLine("Okay, we will generate an organization license.");
-
+
-                            while (!validInstallid)
+							while (!validInstallid)
-                            {
+							{
-                                Console.WriteLine("Please provide your Bitwarden Install-ID — refer to the Readme for details on how to retrieve this. [Install-ID]: ");
+								Console.WriteLine("Please provide your Bitwarden Install-ID — refer to the Readme for details on how to retrieve this. [Install-ID]: ");
-                                buff = Console.ReadLine();
+								buff = Console.ReadLine();
-
+
-                                if (Guid.TryParse(buff, out installid)) validInstallid = true;
+								if (Guid.TryParse(buff, out installid)) validInstallid = true;
-                                else Console.WriteLine("The install-id provided does not appear to be valid.");
+								else Console.WriteLine("The install-id provided does not appear to be valid.");
-                            }
+							}
-
+
-                            while (businessName == "")
+							while (businessName == "")
-                            {
+							{
-                                Console.WriteLine("Please enter a business name, default is BitBetter. [Business Name]: ");
+								Console.WriteLine("Please enter a business name, default is BitBetter. [Business Name]: ");
-                                buff = Console.ReadLine();
+								buff = Console.ReadLine();
-                                if (buff == "")
+								if (buff == "")
-                                {
+								{
-                                    businessName = "BitBetter";
+									businessName = "BitBetter";
-                                }
+								}
-                                else if (CheckBusinessName(buff))
+								else if (CheckBusinessName(buff))
-                                {
+								{
-                                    businessName = buff;
+									businessName = buff;
-                                }
+								}
-                            }
+							}
-                            break;
+							break;
-                        }
+						}
-                        default:
+						default:
-                            Console.WriteLine("Unrecognized option \'" + buff + "\'.");
+							Console.WriteLine("Unrecognized option \'" + buff + "\'.");
-                            break;
+							break;
-                    }
+					}
-                }
+				}
-
+
-                while (name == "")
+				while (name == "")
-                {
+				{
-                    Console.WriteLine("Please provide the username this license will be registered to. [username]: ");
+					Console.WriteLine("Please provide the username this license will be registered to. [username]: ");
-                    buff = Console.ReadLine();
+					buff = Console.ReadLine();
-                    if (CheckUsername(buff))   name = buff;
+					if (CheckUsername(buff))   name = buff;
-                }
+				}
-
+
-                while (email == "")
+				while (email == "")
-                {
+				{
-                    Console.WriteLine("Please provide the email address for the user " + name + ". [email]: ");
+					Console.WriteLine("Please provide the email address for the user " + name + ". [email]: ");
-                    buff = Console.ReadLine();
+					buff = Console.ReadLine();
-                    if (CheckEmail(buff))
+					if (CheckEmail(buff))
-                    {
+					{
-                        email = buff;
+						email = buff;
-                    }
+					}
-                }
+				}
-
+
-                while (storage == 0)
+				while (storage == 0)
-                {
+				{
-                    Console.WriteLine("Extra storage space for the user " + name + ". (max.: " + Int16.MaxValue + "). Defaults to maximum value. [storage]");
+					Console.WriteLine("Extra storage space for the user " + name + ". (max.: " + Int16.MaxValue + "). Defaults to maximum value. [storage]");
-                    buff = Console.ReadLine();
+					buff = Console.ReadLine();
-                    if (String.IsNullOrWhiteSpace(buff))
+					if (String.IsNullOrWhiteSpace(buff))
-                    {
+					{
-                        storage = Int16.MaxValue;
+						storage = Int16.MaxValue;
-                    }
+					}
-                    else
+					else
-                    {
+					{
-                        if (CheckStorage(buff))
+						if (CheckStorage(buff))
-                        {
+						{
-                            storage = Int16.Parse(buff);
+							storage = Int16.Parse(buff);
-                        }
+						}
-                    }
+					}
-                }
+				}
-
+
-                switch (licenseType)
+				switch (licenseType)
-                {
+				{
-                    case "user":
+					case "user":
-                    {
+					{
-                        Console.WriteLine("Confirm creation of \"user\" license for username: \"" + name + "\", email: \"" + email + "\", Storage: \"" + storage + " GB\", User-GUID: \"" + guid + "\"? Y/n");
+						Console.WriteLine("Confirm creation of \"user\" license for username: \"" + name + "\", email: \"" + email + "\", Storage: \"" + storage + " GB\", User-GUID: \"" + guid + "\"? Y/n");
-                        buff = Console.ReadLine();
+						buff = Console.ReadLine();
-                        if (buff is "" or "y" or "Y")
+						if (buff is "" or "y" or "Y")
-                        {
+						{
-                            GenerateUserLicense(new X509Certificate2(Cert.Value(), "test"), CoreDll.Value(), name, email, storage, guid, null);
+							GenerateUserLicense(new X509Certificate2(Cert.Value(), "test"), CoreDll.Value(), name, email, storage, guid, null);
-                        }
+						}
-                        else
+						else
-                        {
+						{
-                            Console.WriteLine("Exiting...");
+							Console.WriteLine("Exiting...");
-                            return 0;
+							return 0;
-                        }
+						}
-
+
-                        break;
+						break;
-                    }
+					}
-                    case "org":
+					case "org":
-                    {
+					{
-                        Console.WriteLine("Confirm creation of \"organization\" license for business name: \"" + businessName + "\", username: \"" + name + "\", email: \"" + email + "\", Storage: \"" + storage + " GB\", Install-ID: \"" + installid + "\"? Y/n");
+						Console.WriteLine("Confirm creation of \"organization\" license for business name: \"" + businessName + "\", username: \"" + name + "\", email: \"" + email + "\", Storage: \"" + storage + " GB\", Install-ID: \"" + installid + "\"? Y/n");
-                        buff = Console.ReadLine();
+						buff = Console.ReadLine();
-                        if (buff is "" or "y" or "Y")
+						if (buff is "" or "y" or "Y")
-                        {
+						{
-                            GenerateOrgLicense(new X509Certificate2(Cert.Value(), "test"), CoreDll.Value(), name, email, storage, installid, businessName, null);
+							GenerateOrgLicense(new X509Certificate2(Cert.Value(), "test"), CoreDll.Value(), name, email, storage, installid, businessName, null);
-                        }
+						}
-                        else
+						else
-                        {
+						{
-                            Console.WriteLine("Exiting...");
+							Console.WriteLine("Exiting...");
-                            return 0;
+							return 0;
-                        }
+						}
-
+
-                        break;
+						break;
-                    }
+					}
-                }
+				}
-
+
-                return 0;
+				return 0;
-            });
+			});
-        });
+		});
-        App.Command("user", config =>
+		App.Command("user", config =>
-        {
+		{
-            CommandArgument name = config.Argument("Name", "your name");
+			CommandArgument name = config.Argument("Name", "your name");
-            CommandArgument email = config.Argument("Email", "your email");
+			CommandArgument email = config.Argument("Email", "your email");
-            CommandArgument userIdArg = config.Argument("User ID", "your user id");
+			CommandArgument userIdArg = config.Argument("User ID", "your user id");
-            CommandArgument storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + Int16.MaxValue + " (optional, default = max)");
+			CommandArgument storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + Int16.MaxValue + " (optional, default = max)");
-            CommandArgument key = config.Argument("Key", "your key id (optional)");
+			CommandArgument key = config.Argument("Key", "your key id (optional)");
-
+
-            config.OnExecute(() =>
+			config.OnExecute(() =>
-            {
+			{
-                Check();
+				Check();
-
+
-                if (String.IsNullOrWhiteSpace(name.Value) || String.IsNullOrWhiteSpace(email.Value))
+				if (String.IsNullOrWhiteSpace(name.Value) || String.IsNullOrWhiteSpace(email.Value))
-                {
+				{
-                    config.Error.WriteLine($"Some arguments are missing: Name='{name.Value}' Email='{email.Value}'");
+					config.Error.WriteLine($"Some arguments are missing: Name='{name.Value}' Email='{email.Value}'");
-                    config.ShowHelp(true);
+					config.ShowHelp(true);
-                    return 1;
+					return 1;
-                }
+				}
-
+
-                if (String.IsNullOrWhiteSpace(userIdArg.Value) || !Guid.TryParse(userIdArg.Value, out Guid userId))
+				if (String.IsNullOrWhiteSpace(userIdArg.Value) || !Guid.TryParse(userIdArg.Value, out Guid userId))
-                {
+				{
-                    config.Error.WriteLine("User ID not provided");
+					config.Error.WriteLine("User ID not provided");
-                    config.ShowHelp(true);
+					config.ShowHelp(true);
-                    return 1;
+					return 1;
-                }
+				}
-
+
-                Int16 storageShort = 0;
+				Int16 storageShort = 0;
-                if (!String.IsNullOrWhiteSpace(storage.Value))
+				if (!String.IsNullOrWhiteSpace(storage.Value))
-                {
+				{
-                    Double parsedStorage = Double.Parse(storage.Value);
+					Double parsedStorage = Double.Parse(storage.Value);
-                    if (parsedStorage is > Int16.MaxValue or < 0)
+					if (parsedStorage is > Int16.MaxValue or < 0)
-                    {
+					{
-                        config.Error.WriteLine("The storage value provided is outside the accepted range of [0-" + Int16.MaxValue + "]");
+						config.Error.WriteLine("The storage value provided is outside the accepted range of [0-" + Int16.MaxValue + "]");
-                        config.ShowHelp(true);
+						config.ShowHelp(true);
-                        return 1;
+						return 1;
-                    }
+					}
-                    storageShort = (Int16) parsedStorage;
+					storageShort = (Int16) parsedStorage;
-                }
+				}
-
+
-                GenerateUserLicense(new X509Certificate2(Cert.Value()!, "test"), CoreDll.Value(), name.Value, email.Value, storageShort, userId, key.Value);
+				GenerateUserLicense(new X509Certificate2(Cert.Value()!, "test"), CoreDll.Value(), name.Value, email.Value, storageShort, userId, key.Value);
-
+
-                return 0;
+				return 0;
-            });
+			});
-        });
+		});
-        App.Command("org", config =>
+		App.Command("org", config =>
-        {
+		{
-            CommandArgument name = config.Argument("Name", "your name");
+			CommandArgument name = config.Argument("Name", "your name");
-            CommandArgument email = config.Argument("Email", "your email");
+			CommandArgument email = config.Argument("Email", "your email");
-            CommandArgument installId = config.Argument("InstallId", "your installation id (GUID)");
+			CommandArgument installId = config.Argument("InstallId", "your installation id (GUID)");
-            CommandArgument storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + Int16.MaxValue + " (optional, default = max)");
+			CommandArgument storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + Int16.MaxValue + " (optional, default = max)");
-            CommandArgument businessName = config.Argument("BusinessName", "name for the organization (optional)");
+			CommandArgument businessName = config.Argument("BusinessName", "name for the organization (optional)");
-            CommandArgument key = config.Argument("Key", "your key id (optional)");
+			CommandArgument key = config.Argument("Key", "your key id (optional)");
-            
+
-            config.OnExecute(() =>
+			config.OnExecute(() =>
-            {
+			{
-                Check();
+				Check();
-
+
-                if (String.IsNullOrWhiteSpace(name.Value) || String.IsNullOrWhiteSpace(email.Value) || String.IsNullOrWhiteSpace(installId.Value))
+				if (String.IsNullOrWhiteSpace(name.Value) || String.IsNullOrWhiteSpace(email.Value) || String.IsNullOrWhiteSpace(installId.Value))
-                {
+				{
-                    config.Error.WriteLine($"Some arguments are missing: Name='{name.Value}' Email='{email.Value}' InstallId='{installId.Value}'");
+					config.Error.WriteLine($"Some arguments are missing: Name='{name.Value}' Email='{email.Value}' InstallId='{installId.Value}'");
-                    config.ShowHelp(true);
+					config.ShowHelp(true);
-                    return 1;
+					return 1;
-                }
+				}
-
+
-                if (!Guid.TryParse(installId.Value, out Guid installationId))
+				if (!Guid.TryParse(installId.Value, out Guid installationId))
-                {
+				{
-                    config.Error.WriteLine("Unable to parse your installation id as a GUID");
+					config.Error.WriteLine("Unable to parse your installation id as a GUID");
-                    config.Error.WriteLine($"Here's a new guid: {Guid.NewGuid()}");
+					config.Error.WriteLine($"Here's a new guid: {Guid.NewGuid()}");
-                    config.ShowHelp(true);
+					config.ShowHelp(true);
-                    return 1;
+					return 1;
-                }
+				}
-
+
-                Int16 storageShort = 0;
+				Int16 storageShort = 0;
-                if (!String.IsNullOrWhiteSpace(storage.Value))
+				if (!String.IsNullOrWhiteSpace(storage.Value))
-                {
+				{
-                    Double parsedStorage = Double.Parse(storage.Value);
+					Double parsedStorage = Double.Parse(storage.Value);
-                    if (parsedStorage is > Int16.MaxValue or < 0)
+					if (parsedStorage is > Int16.MaxValue or < 0)
-                    {
+					{
-                        config.Error.WriteLine("The storage value provided is outside the accepted range of [0-" + Int16.MaxValue + "]");
+						config.Error.WriteLine("The storage value provided is outside the accepted range of [0-" + Int16.MaxValue + "]");
-                        config.ShowHelp(true);
+						config.ShowHelp(true);
-                        return 1;
+						return 1;
-                    }
+					}
-                    storageShort = (Int16)parsedStorage;
+					storageShort = (Int16)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"), CoreDll.Value(), name.Value, email.Value, storageShort, installationId, businessName.Value, key.Value);
-
+
-                return 0;
+				return 0;
-            });
+			});
-        });
+		});
-
+
-        App.OnExecute(() =>
+		App.OnExecute(() =>
-        {
+		{
-            App.ShowHelp();
+			App.ShowHelp();
-            return 10;
+			return 10;
-        });
+		});
-
+
-        try
+		try
-        {
+		{
-            App.HelpOption("-? | -h | --help");
+			App.HelpOption("-? | -h | --help");
-            return App.Execute(args);
+			return App.Execute(args);
-        }
+		}
-        catch (Exception exception)
+		catch (Exception exception)
-        {
+		{
-            Console.Error.WriteLine("Oops: {0}", exception);
+			Console.Error.WriteLine("Oops: {0}", exception);
-            return 100;
+			return 100;
-        }
+		}
-    }
+	}
-
+
-    private static void Check()
+	private static void Check()
-    {
+	{
-        if (!File.Exists(Cert.Value()))
+		if (Cert == null || String.IsNullOrWhiteSpace(Cert.Value()))
-        {
+		{
-            App.Error.WriteLine($"Can't find certificate at: {Cert.Value()}");
+			App.Error.WriteLine("No certificate specified");
-            App.ShowHelp();
+			App.ShowHelp();
-            Environment.Exit(1);
+			Environment.Exit(1);
-        }
+		}
-        if (!File.Exists(CoreDll.Value()))
+		else if (CoreDll == null || String.IsNullOrWhiteSpace(CoreDll.Value()))
-        {
+		{
-            App.Error.WriteLine($"Can't find core dll at: {CoreDll.Value()}");
+			App.Error.WriteLine("No core dll specified");
-            App.ShowHelp();
+			App.ShowHelp();
-            Environment.Exit(1);
+			Environment.Exit(1);
-        }
+		}
-        if (Cert == null || String.IsNullOrWhiteSpace(Cert.Value()) || CoreDll == null || String.IsNullOrWhiteSpace(CoreDll.Value()))
+		else if (!File.Exists(Cert.Value()))
-        {
+		{
-            App.ShowHelp();
+			App.Error.WriteLine($"Can't find certificate at: {Cert.Value()}");
-            Environment.Exit(1);
+			App.ShowHelp();
-        }
+			Environment.Exit(1);
-    }
+		}
-
+		else if (!File.Exists(CoreDll.Value()))
-    // checkUsername Checks that the username is a valid username
+		{
-    private static Boolean CheckUsername(String s)
+			App.Error.WriteLine($"Can't find core dll at: {CoreDll.Value()}");
-    {
+			App.ShowHelp();
-        // TODO: Actually validate
+			Environment.Exit(1);
-        if (!String.IsNullOrWhiteSpace(s)) return true;
+		}
-
+	}
-        Console.WriteLine("The username provided doesn't appear to be valid!");
+
-        return false;
+	// checkUsername Checks that the username is a valid username
-    }
+	private static Boolean CheckUsername(String s)
-
+	{
-    // checkBusinessName Checks that the Business Name is a valid username
+		// TODO: Actually validate
-    private static Boolean CheckBusinessName(String s)
+		if (!String.IsNullOrWhiteSpace(s)) return true;
-    {
+
-        // TODO: Actually validate
+		Console.WriteLine("The username provided doesn't appear to be valid!");
-        if (!String.IsNullOrWhiteSpace(s)) return true;
+		return false;
-
+	}
-        Console.WriteLine("The Business Name provided doesn't appear to be valid!");
+
-        return false;
+	// checkBusinessName Checks that the Business Name is a valid username
-    }
+	private static Boolean CheckBusinessName(String s)
-
+	{
-    // checkEmail Checks that the email address is a valid email address
+		// TODO: Actually validate
-    private static Boolean CheckEmail(String s)
+		if (!String.IsNullOrWhiteSpace(s)) return true;
-    {
+
-        // TODO: Actually validate
+		Console.WriteLine("The Business Name provided doesn't appear to be valid!");
-        if (!String.IsNullOrWhiteSpace(s)) return true;
+		return false;
-
+	}
-        Console.WriteLine("The email provided doesn't appear to be valid!");
+
-        return false;
+	// checkEmail Checks that the email address is a valid email address
-    }
+	private static Boolean CheckEmail(String s)
-
+	{
-    // checkStorage Checks that the storage is in a valid range
+		// TODO: Actually validate
-    private static Boolean CheckStorage(String s)
+		if (!String.IsNullOrWhiteSpace(s)) return true;
-    {
+
-        if (String.IsNullOrWhiteSpace(s))
+		Console.WriteLine("The email provided doesn't appear to be valid!");
-        {
+		return false;
-            Console.WriteLine("The storage provided doesn't appear to be valid!");
+	}
-            return false;
+
-        }
+	// checkStorage Checks that the storage is in a valid range
-
+	private static Boolean CheckStorage(String s)
-        if (!(Double.Parse(s) > Int16.MaxValue) && !(Double.Parse(s) < 0)) return true;
+	{
-
+		if (String.IsNullOrWhiteSpace(s))
-        Console.WriteLine("The storage value provided is outside the accepted range of [0-" + Int16.MaxValue + "]!");
+		{
-        return false;
+			Console.WriteLine("The storage provided doesn't appear to be valid!");
-    }
+			return false;
-
+		}
-    private static readonly JsonSerializerOptions JsonOptions = new() { WriteIndented = true };
+
-    private static void GenerateUserLicense(X509Certificate2 cert, String corePath, String userName, String email, Int16 storage, Guid userId, String key)
+		if (!(Double.Parse(s) > Int16.MaxValue) && !(Double.Parse(s) < 0)) return true;
-    {
+
-        Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(Path.GetFullPath(corePath));
+		Console.WriteLine("The storage value provided is outside the accepted range of [0-" + Int16.MaxValue + "]!");
-
+		return false;
-        Type type = core.GetType("Bit.Core.Billing.Models.Business.UserLicense");
+	}
-        Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
+
-
+	private static readonly JsonSerializerOptions JsonOptions = new() { WriteIndented = true };
-        if (type == null)
+	private static void GenerateUserLicense(X509Certificate2 cert, String corePath, String userName, String email, Int16 storage, Guid userId, String key)
-        {
+	{
-            Console.WriteLine("Could not find type!");
+		Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(Path.GetFullPath(corePath));
-            return;
+
-        }
+		Type type = core.GetType("Bit.Core.Billing.Models.Business.UserLicense");
-        if (licenseTypeEnum == null)
+		Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
-        {
+
-            Console.WriteLine("Could not find license licenseTypeEnum!");
+		if (type == null)
-            return;
+		{
-        }
+			Console.WriteLine("Could not find type!");
-
+			return;
-        Object license = Activator.CreateInstance(type);
+		}
-
+		if (licenseTypeEnum == null)
-        MethodInfo computeHash = type.GetMethod("ComputeHash");
+		{
-        if (computeHash == null)
+			Console.WriteLine("Could not find license licenseTypeEnum!");
-        {
+			return;
-            Console.WriteLine("Could not find ComputeHash!");
+		}
-            return;
+
-        }
+		Object license = Activator.CreateInstance(type);
-
+
-        MethodInfo sign = type.GetMethod("Sign");
+		MethodInfo computeHash = type.GetMethod("ComputeHash");
-        if (sign == null)
+		if (computeHash == null)
-        {
+		{
-            Console.WriteLine("Could not find sign!");
+			Console.WriteLine("Could not find ComputeHash!");
-            return;
+			return;
-        }
+		}
-
+
-        Set(type, license, "LicenseKey", String.IsNullOrWhiteSpace(key) ? Guid.NewGuid().ToString("n") : key);
+		MethodInfo sign = type.GetMethod("Sign");
-        Set(type, license, "Id", userId);
+		if (sign == null)
-        Set(type, license, "Name", userName);
+		{
-        Set(type, license, "Email", email);
+			Console.WriteLine("Could not find sign!");
-        Set(type, license, "Premium", true);
+			return;
-        Set(type, license, "MaxStorageGb", storage == 0 ? Int16.MaxValue : storage);
+		}
-        Set(type, license, "Version", 1);
+
-        Set(type, license, "Issued", DateTime.UtcNow);
+		Set(type, license, "LicenseKey", String.IsNullOrWhiteSpace(key) ? Guid.NewGuid().ToString("n") : key);
-        Set(type, license, "Refresh", DateTime.UtcNow.AddYears(100).AddMonths(-1));
+		Set(type, license, "Id", userId);
-        Set(type, license, "Expires", DateTime.UtcNow.AddYears(100));
+		Set(type, license, "Name", userName);
-        Set(type, license, "Trial", false);
+		Set(type, license, "Email", email);
-        Set(type, license, "LicenseType", Enum.Parse(licenseTypeEnum, "User"));
+		Set(type, license, "Premium", true);
-        Set(type, license, "Hash", Convert.ToBase64String(((Byte[])computeHash.Invoke(license, []))!));
+		Set(type, license, "MaxStorageGb", storage == 0 ? Int16.MaxValue : storage);
-        Set(type, license, "Signature", Convert.ToBase64String((Byte[])sign.Invoke(license, [cert])!));
+		Set(type, license, "Version", 1);
-
+		Set(type, license, "Issued", DateTime.UtcNow);
-        Console.WriteLine(JsonSerializer.Serialize(license, JsonOptions));
+		Set(type, license, "Refresh", DateTime.UtcNow.AddYears(100).AddMonths(-1));
-    }
+		Set(type, license, "Expires", DateTime.UtcNow.AddYears(100));
-    private static void GenerateOrgLicense(X509Certificate2 cert, String corePath, String userName, String email, Int16 storage, Guid instalId, String businessName, String key)
+		Set(type, license, "Trial", false);
-    {
+		Set(type, license, "LicenseType", Enum.Parse(licenseTypeEnum, "User"));
-        Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(Path.GetFullPath(corePath));
+		Set(type, license, "Hash", Convert.ToBase64String(((Byte[])computeHash.Invoke(license, []))!));
-        Type type = core.GetType("Bit.Core.Billing.Organizations.Models.OrganizationLicense");
+		Set(type, license, "Signature", Convert.ToBase64String((Byte[])sign.Invoke(license, [cert])!));
-        Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
+
-        Type planTypeEnum = core.GetType("Bit.Core.Billing.Enums.PlanType");
+		Console.WriteLine(JsonSerializer.Serialize(license, JsonOptions));
-
+	}
-        if (type == null)
+	private static void GenerateOrgLicense(X509Certificate2 cert, String corePath, String userName, String email, Int16 storage, Guid instalId, String businessName, String key)
-        {
+	{
-            Console.WriteLine("Could not find type!");
+		Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(Path.GetFullPath(corePath));
-            return;
+		Type type = core.GetType("Bit.Core.Billing.Organizations.Models.OrganizationLicense");
-        }
+		Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
-        if (licenseTypeEnum == null)
+		Type planTypeEnum = core.GetType("Bit.Core.Billing.Enums.PlanType");
-        {
+
-            Console.WriteLine("Could not find licenseTypeEnum!");
+		if (type == null)
-            return;
+		{
-        }
+			Console.WriteLine("Could not find type!");
-        if (planTypeEnum == null)
+			return;
-        {
+		}
-            Console.WriteLine("Could not find planTypeEnum!");
+		if (licenseTypeEnum == null)
-            return;
+		{
-        }
+			Console.WriteLine("Could not find licenseTypeEnum!");
-
+			return;
-        Object license = Activator.CreateInstance(type);
+		}
-
+		if (planTypeEnum == null)
-        MethodInfo computeHash = type.GetMethod("ComputeHash");
+		{
-        if (computeHash == null)
+			Console.WriteLine("Could not find planTypeEnum!");
-        {
+			return;
-            Console.WriteLine("Could not find ComputeHash!");
+		}
-            return;
+
-        }
+		Object license = Activator.CreateInstance(type);
-
+
-        MethodInfo sign = type.GetMethod("Sign");
+		MethodInfo computeHash = type.GetMethod("ComputeHash");
-        if (sign == null)
+		if (computeHash == null)
-        {
+		{
-            Console.WriteLine("Could not find sign!");
+			Console.WriteLine("Could not find ComputeHash!");
-            return;
+			return;
-        }
+		}
-
+
-        Set(type, license, "LicenseKey", String.IsNullOrWhiteSpace(key) ? Guid.NewGuid().ToString("n") : key);
+		MethodInfo sign = type.GetMethod("Sign");
-        Set(type, license, "InstallationId", instalId);
+		if (sign == null)
-        Set(type, license, "Id", Guid.NewGuid());
+		{
-        Set(type, license, "Name", userName);
+			Console.WriteLine("Could not find sign!");
-        Set(type, license, "BillingEmail", email);
+			return;
-        Set(type, license, "BusinessName", String.IsNullOrWhiteSpace(businessName) ? "BitBetter" : businessName);
+		}
-        Set(type, license, "Enabled", true);
+
-		Set(type, license, "Plan", "Enterprise (Annually)");
+		Set(type, license, "LicenseKey", String.IsNullOrWhiteSpace(key) ? Guid.NewGuid().ToString("n") : key);
-		Set(type, license, "PlanType", Enum.Parse(planTypeEnum, "EnterpriseAnnually"));
+		Set(type, license, "InstallationId", instalId);
-        Set(type, license, "Seats", Int32.MaxValue);
+		Set(type, license, "Id", Guid.NewGuid());
-        Set(type, license, "MaxCollections", Int16.MaxValue);
+		Set(type, license, "Name", userName);
-        Set(type, license, "UsePolicies", true);
+		Set(type, license, "BillingEmail", email);
-        Set(type, license, "UseSso", true);
+		Set(type, license, "BusinessName", String.IsNullOrWhiteSpace(businessName) ? "BitBetter" : businessName);
-        Set(type, license, "UseKeyConnector", true);
+		Set(type, license, "Enabled", true);
-        Set(type, license, "UseScim", true);
+		Set(type, license, "Plan", "Enterprise (Annually)");
-        Set(type, license, "UseGroups", true);
+		Set(type, license, "PlanType", Enum.Parse(planTypeEnum, "EnterpriseAnnually"));
-        Set(type, license, "UseEvents", true);
+		Set(type, license, "Seats", Int32.MaxValue);
-        Set(type, license, "UseDirectory", true);
+		Set(type, license, "MaxCollections", Int16.MaxValue);
-        Set(type, license, "UseTotp", true);
+		Set(type, license, "UsePolicies", true);
-        Set(type, license, "Use2fa", true);
+		Set(type, license, "UseSso", true);
-        Set(type, license, "UseApi", true);
+		Set(type, license, "UseKeyConnector", true);
-        Set(type, license, "UseResetPassword", true);
+		Set(type, license, "UseScim", true);
-		Set(type, license, "UseCustomPermissions", true);
+		Set(type, license, "UseGroups", true);
-        Set(type, license, "MaxStorageGb", storage == 0 ? Int16.MaxValue : storage);
+		Set(type, license, "UseEvents", true);
-        Set(type, license, "SelfHost", true);
+		Set(type, license, "UseDirectory", true);
-        Set(type, license, "UsersGetPremium", true);
+		Set(type, license, "UseTotp", true);
-        Set(type, license, "UsePasswordManager", true);
+		Set(type, license, "Use2fa", true);
-        Set(type, license, "UseSecretsManager", true);
+		Set(type, license, "UseApi", true);
-        Set(type, license, "SmSeats", Int32.MaxValue);
+		Set(type, license, "UseResetPassword", true);
-        Set(type, license, "SmServiceAccounts", Int32.MaxValue);
+		Set(type, license, "MaxStorageGb", storage == 0 ? Int16.MaxValue : storage);
-        Set(type, license, "Version", 15); //This is set to 15 to use AllowAdminAccessToAllCollectionItems can be changed to 13 to just use Secrets Manager
+		Set(type, license, "SelfHost", true);
-        Set(type, license, "Issued", DateTime.UtcNow);
+		Set(type, license, "UsersGetPremium", true);		
-        Set(type, license, "Refresh", DateTime.UtcNow.AddYears(100).AddMonths(-1));
+		Set(type, license, "UseCustomPermissions", true);
-        Set(type, license, "Expires", DateTime.UtcNow.AddYears(100));
+		Set(type, license, "Version", 16);
-        Set(type, license, "Trial", false);
+		Set(type, license, "Issued", DateTime.UtcNow);
-        Set(type, license, "LicenseType", Enum.Parse(licenseTypeEnum, "Organization"));
+		Set(type, license, "Refresh", DateTime.UtcNow.AddYears(100).AddMonths(-1));
-		Set(type, license, "LimitCollectionCreationDeletion", true); //This will be used in the new version of BitWarden but can be applied now
+		Set(type, license, "Expires", DateTime.UtcNow.AddYears(100));
-		Set(type, license, "AllowAdminAccessToAllCollectionItems", true);
+		Set(type, license, "ExpirationWithoutGracePeriod", DateTime.UtcNow.AddYears(100));
-		Set(type, license, "UseRiskInsights", true);
+		Set(type, license, "UsePasswordManager", true);
-		Set(type, license, "UseOrganizationDomains", true);
+		Set(type, license, "UseSecretsManager", true);
-		Set(type, license, "UseAdminSponsoredFamilies", true);
+		Set(type, license, "SmSeats", Int32.MaxValue);
-		Set(type, license, "UseRiskInsights", true);
+		Set(type, license, "SmServiceAccounts", Int32.MaxValue);
-        Set(type, license, "UseOrganizationDomains", true);
+		Set(type, license, "UseRiskInsights", true);
-        Set(type, license, "UseAdminSponsoredFamilies", true);
+		Set(type, license, "LimitCollectionCreationDeletion", true);
-        Set(type, license, "Hash", Convert.ToBase64String((Byte[])computeHash.Invoke(license, [])!));
+		Set(type, license, "AllowAdminAccessToAllCollectionItems", true);
-        Set(type, license, "Signature", Convert.ToBase64String((Byte[])sign.Invoke(license, [cert])!));
+		Set(type, license, "Trial", false);
-
+		Set(type, license, "LicenseType", Enum.Parse(licenseTypeEnum, "Organization"));
-        Console.WriteLine(JsonSerializer.Serialize(license, JsonOptions));
+		Set(type, license, "UseOrganizationDomains", true);
-    }
+		Set(type, license, "UseAdminSponsoredFamilies", true);
-    private static void Set(Type type, Object license, String name, Object value)
+		Set(type, license, "Hash", Convert.ToBase64String((Byte[])computeHash.Invoke(license, [])!));
-    {
+		Set(type, license, "Signature", Convert.ToBase64String((Byte[])sign.Invoke(license, [cert])!));
-        type.GetProperty(name)?.SetValue(license, value);
+
-    }
+		Console.WriteLine(JsonSerializer.Serialize(license, JsonOptions));
+	}
+	private static void Set(Type type, Object license, String name, Object value)
+	{
+		type.GetProperty(name)?.SetValue(license, value);
+	}
 }

src/licenseGen/licenseGen.csproj

@@ -7,4 +7,4 @@
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
   </ItemGroup>
-</Project>
+</Project>