Merge d56e51596b into 02740e84b6

.circleci/config.yml

@@ -12,10 +12,4 @@ jobs:
           command: ./generateKeys.sh
       - run:
           name: Build script
-          command: ./build.sh update
+          command: ./build.sh y
-      - run:
-          name: Test generating user license
-          command: ./licenseGen.sh user TestName TestEmail@example.com 4a619d4a-522d-4c70-8596-affb5b607c23
-      - run:
-          name: Test generating organization license
-          command: ./licenseGen.sh org TestName TestEmail@example.com 4a619d4a-522d-4c70-8596-affb5b607c23

.editorconfig

@@ -1,19 +0,0 @@
-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

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

.gitignore

@@ -7,6 +7,5 @@ src/bitBetter/.vs/*
 *.pem
 .vscode/
 *.pfx
-*.cer
+*.cert
 *.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 --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
+# 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
 # <OR>
 # docker-compose -f <full-local-path>/docker-compose.yml up -d

README.md

@@ -1,14 +1,12 @@
-# BitBetter lite
+# BitBetter
 
 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.
 
-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.
+_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!_
 
-_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
-
-Credit to https://github.com/h44z/BitBetter and https://github.com/jakeswenson/BitBetter and https://github.com/GieltjE/BitBetter
 
 # Table of Contents
 - [BitBetter](#bitbetter)
@@ -32,7 +30,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 2025.11.1 might work on lower versions), for safety always stay up to date
+* Bitwarden (tested with 1.47.1, might work on lower versions)
 * 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
@@ -48,8 +46,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.cer -days 36500 -outform DER -passout pass:test
+openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.cert -days 36500 -outform DER -passout pass:test
-openssl x509 -inform DER -in cert.cer -out cert.pem
+openssl x509 -inform DER -in cert.cert -out cert.pem
 openssl pkcs12 -export -out cert.pfx -inkey key.pem -in cert.pem -passin pass:test -passout pass:test
 ```
 
@@ -65,14 +63,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/lite` 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/self-host` 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/lite` 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/self-host` image called `bitwarden-patch`.
 
 Afterwards it will automatically generate the license generator and start all previously specified containers which are **now ready to accept self-issued licenses.**
 
@@ -100,36 +98,6 @@ 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.
@@ -146,26 +114,6 @@ 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,20 +1,10 @@
-$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
 $components = "Api","Identity"
 
 # delete old directories / files if applicable
-if (Test-Path "$tempdirectory" -PathType Container) {
+if (Test-Path "$tempdirectory") {
 	Remove-Item "$tempdirectory" -Recurse -Force
 }
 
@@ -26,65 +16,52 @@ if (Test-Path -Path "$pwd\src\licenseGen\cert.pfx" -PathType Leaf) {
 	Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
 }
 
-if (Test-Path -Path "$pwd\src\bitBetter\cert.cer" -PathType Leaf) {
+if (Test-Path -Path "$pwd\src\bitBetter\cert.cert" -PathType Leaf) {
-	Remove-Item "$pwd\src\bitBetter\cert.cer" -Force
+	Remove-Item "$pwd\src\bitBetter\cert.cert" -Force
-}
-
-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)) {
+if (!(Test-Path "$pwd\.keys")) {
 	.\generateKeys.ps1
 }
 
-# copy the key to bitBetter
+# copy the key to bitBetter and licenseGen
-Copy-Item "$pwd\.keys\cert.cer" -Destination "$pwd\src\bitBetter"
+Copy-Item "$pwd\.keys\cert.cert" -Destination "$pwd\src\bitBetter"
+Copy-Item "$pwd\.keys\cert.pfx" -Destination "$pwd\src\licenseGen"
 
 # build bitBetter and clean the source directory after
-docker build --no-cache -t bitbetter/bitbetter "$pwd\src\bitBetter"
+docker build -t bitbetter/bitbetter "$pwd\src\bitBetter"
-Remove-Item "$pwd\src\bitBetter\cert.cer" -Force
+Remove-Item "$pwd\src\bitBetter\cert.cert" -Force
 
-# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden*
+# gather all running instances
 $oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}'
 
-# stop and remove all running instances
+# stop all running instances
 foreach ($instance in $oldinstances) {
 	docker stop $instance
 	docker rm $instance
 }
 
 # update bitwarden itself
-if ($args[0] -eq 'update') {
+if ($args[0] -eq 'y')
-	docker pull ghcr.io/bitwarden/lite:latest
+{
-} else {
+	docker pull ghcr.io/bitwarden/self-host:beta
-	$confirmation = Read-Host "Update (or get) bitwarden source container (y/n)"
+}
+else
+{
+	$confirmation = Read-Host "Update (or get) bitwarden source container"
 	if ($confirmation -eq 'y') {
-		docker pull ghcr.io/bitwarden/lite:latest
+		docker pull ghcr.io/bitwarden/self-host:beta
 	}
 }
 
 # stop and remove previous existing patch(ed) container
-$oldinstances = docker container ps --all -f Ancestor=bitwarden-patched --format '{{.ID}}'
+docker stop bitwarden-patch
-foreach ($instance in $oldinstances) {
+docker rm bitwarden-patch
-	docker stop $instance
+docker image rm bitwarden-patch
-	docker rm $instance
-}
-$oldinstances = docker image ls bitwarden-patched --format '{{.ID}}'
-foreach ($instance in $oldinstances) {
-	docker image rm $instance
-}
-
-# remove old extract containers
-$oldinstances = docker container ps --all -f Name=bitwarden-extract --format '{{.ID}}'
-foreach ($instance in $oldinstances) {
-	docker stop $instance
-	docker rm $instance
-}
 
 # start a new bitwarden instance so we can patch it
-$patchinstance = docker run -d --name bitwarden-extract ghcr.io/bitwarden/lite:latest
+$patchinstance = docker run -d --name bitwarden-patch ghcr.io/bitwarden/self-host:beta
 
 # create our temporary directory
 New-item -ItemType Directory -Path $tempdirectory
@@ -95,38 +72,33 @@ foreach ($component in $components) {
 	docker cp $patchinstance`:/app/$component/Core.dll "$tempdirectory\$component\Core.dll"
 }
 
-# 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-patched --file "$pwd\src\bitBetter\Dockerfile-bitwarden-patch"
+docker build . --tag bitwarden-patch --file "$pwd\src\bitBetter\Dockerfile-bitwarden-patch"
+
+# stop and remove our temporary container
+docker stop bitwarden-patch
+docker rm bitwarden-patch
+
+# copy our patched library to the licenseGen source directory
+Copy-Item "$tempdirectory\Identity\Core.dll" -Destination "$pwd\src\licenseGen"
+
+# 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") {
-	foreach($line in Get-Content "$pwd\.servers\serverlist.txt") {
+	Invoke-Expression "& $line"
-		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,12 +1,4 @@
 #!/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"
@@ -20,19 +12,15 @@ 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.cer" ]; then
+if [ -f "$PWD/src/bitBetter/cert.cert" ]; then
-	rm -f "$PWD/src/bitBetter/cert.cer"
+    rm -f "$PWD/src/bitBetter/cert.cert"
-fi
-
-if [ -f "$PWD/.keys/cert.cert" ]; then
-	mv "$PWD/.keys/cert.cert" "$PWD/.keys/cert.cer"
 fi
 
 # generate keys if none are available
@@ -40,52 +28,42 @@ if [ ! -d "$PWD/.keys" ]; then
 	./generateKeys.sh
 fi
 
-# copy the key to bitBetter
+# copy the key to bitBetter and licenseGen
-cp -f "$PWD/.keys/cert.cer" "$PWD/src/bitBetter"
+cp -f "$PWD/.keys/cert.cert" "$PWD/src/bitBetter"
+cp -f "$PWD/.keys/cert.pfx" "$PWD/src/licenseGen"
 
 # build bitBetter and clean the source directory after
-docker build --no-cache -t bitbetter/bitbetter "$PWD/src/bitBetter"
+docker build -t bitbetter/bitbetter "$PWD/src/bitBetter"
-rm -f "$PWD/src/bitBetter/cert.cer"
+rm -f "$PWD/src/bitBetter/cert.cert"
 
-# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden*
+# gather all running instances
 OLDINSTANCES=$(docker container ps --all -f Name=bitwarden --format '{{.ID}}')
 
-# stop and remove all running instances
+# stop all running instances
 for INSTANCE in ${OLDINSTANCES[@]}; do
 	docker stop $INSTANCE
 	docker rm $INSTANCE
 done
 
 # update bitwarden itself
-if [ "$1" = "update" ]; then
+if [ "$1" = "y" ]; then
-	docker pull ghcr.io/bitwarden/lite:latest
+	docker pull ghcr.io/bitwarden/self-host:beta
 else
-	read -p "Update (or get) bitwarden source container (y/n): "
+	read -p "Update (or get) bitwarden source container: " -n 1 -r
-	if [[ $REPLY =~ ^[Yy]$ ]]; then
+	echo
-		docker pull ghcr.io/bitwarden/lite:latest
+	if [[ $REPLY =~ ^[Yy]$ ]]
+	then
+		docker pull ghcr.io/bitwarden/self-host:beta
 	fi
 fi
 
 # stop and remove previous existing patch(ed) container
-OLDINSTANCES=$(docker container ps --all -f Ancestor=bitwarden-patched --format '{{.ID}}')
+docker stop bitwarden-patch
-for INSTANCE in ${OLDINSTANCES[@]}; do
+docker rm bitwarden-patch
-	docker stop $INSTANCE
+docker image rm bitwarden-patch
-	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-extract ghcr.io/bitwarden/lite:latest)
+PATCHINSTANCE=$(docker run -d --name bitwarden-patch ghcr.io/bitwarden/self-host:beta)
 
 # create our temporary directory
 mkdir $TEMPDIRECTORY
@@ -96,33 +74,30 @@ 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-patched --file "$PWD/src/bitBetter/Dockerfile-bitwarden-patch"
+docker build . --tag bitwarden-patch --file "$PWD/src/bitBetter/Dockerfile-bitwarden-patch"
 
-# start all user requested instances
+# stop and remove our temporary container
-if [ -f "$PWD/.servers/serverlist.txt" ]; then
+docker stop bitwarden-patch
-	# convert line endings to unix
+docker rm bitwarden-patch
-	sed -i 's/\r$//' "$PWD/.servers/serverlist.txt"
-	cat "$PWD/.servers/serverlist.txt" | while read -r LINE; do
-		if [[ $LINE != "#"* ]]; then
-			bash -c "$LINE"
-		fi
-	done
-fi
-
-# remove our bitBetter image
-docker image rm bitbetter/bitbetter
 
 # copy our patched library to the licenseGen source directory
 cp -f "$TEMPDIRECTORY/Identity/Core.dll" "$PWD/src/licenseGen"
-cp -f "$PWD/.keys/cert.pfx" "$PWD/src/licenseGen"
+
+# remove our temporary directory
+rm -rf "$TEMPDIRECTORY"
+
+# start all user requested instances
+sed -i 's/\r$//' "$PWD/.servers/serverlist.txt"
+cat "$PWD/.servers/serverlist.txt" | while read -r LINE; do
+	bash -c "$LINE"
+done
+
+# remove our bitBetter image
+docker image rm bitbetter/bitbetter
 
 # build the licenseGen
 docker build -t bitbetter/licensegen "$PWD/src/licenseGen"
@@ -130,6 +105,3 @@ docker build -t bitbetter/licensegen "$PWD/src/licenseGen"
 # clean the licenseGen source directory
 rm -f "$PWD/src/licenseGen/Core.dll"
 rm -f "$PWD/src/licenseGen/cert.pfx"
-
-# remove our temporary directory
-rm -rf "$TEMPDIRECTORY"

generateKeys.ps1

@@ -1,13 +1,10 @@
-$ErrorActionPreference = 'Stop'
-$PSNativeCommandUseErrorActionPreference = $true
-
 # get the basic openssl binary path
 $opensslbinary = "$Env:Programfiles\OpenSSL-Win64\bin\openssl.exe"
 
 # if openssl is not installed attempt to install it
 if (!(Get-Command $opensslbinary -errorAction SilentlyContinue))
 {
-	winget install openssl
+    winget install openssl
 }
 
 # if previous keys exist, remove them
@@ -20,6 +17,6 @@ if (Test-Path "$pwd\.keys")
 New-item -ItemType Directory -Path "$pwd\.keys"
 
 # generate actual keys
-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' 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' x509 -inform DER -in `"$pwd\.keys\cert.cer`" -out `"$pwd\.keys\cert.pem`""
+Invoke-Expression "& '$opensslbinary' x509 -inform DER -in `"$pwd\.keys\cert.cert`" -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

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 # Check for openssl
 command -v openssl >/dev/null 2>&1 || { echo >&2 "openssl required but not found.  Aborting."; exit 1; }
@@ -15,6 +14,6 @@ fi
 mkdir "$DIR"
 
 # Generate new keys
-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	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 x509 -inform DER -in "$DIR/cert.cer" -out "$DIR/cert.pem"
+openssl x509 -inform DER -in "$DIR/cert.cert" -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

@@ -1,17 +1,14 @@
-$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") {
+if ($args[0] = "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

@@ -1,13 +1,12 @@
 #!/bin/bash
-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.cer /app/
+COPY cert.cert /app/
 
 RUN dotnet restore
 RUN dotnet publish -c Release -o /app --no-restore
@@ -11,4 +11,4 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0
 WORKDIR /app
 COPY --from=build /app .
 
-ENTRYPOINT ["dotnet", "/app/bitBetter.dll"]
+ENTRYPOINT [ "/app/bitBetter" ]

src/bitBetter/Dockerfile-bitwarden-patch

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

src/bitBetter/Program.cs

@@ -12,56 +12,64 @@ namespace bitBetter;
 
 internal class Program
 {
-	private static Int32 Main()
+    private static Int32 Main()
-	{
+    {
-		const String certFile = "/app/cert.cer";
+        const String certFile = "/app/cert.cert";
-		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
-			EmbeddedResource embeddedResourceToAdd = new("Bit.Core.licensing.cer", cert) { Attributes = embeddedResourceToRemove.Attributes };
+                .OfType<EmbeddedResource>()
-			moduleDefMd.Resources.Add(embeddedResourceToAdd);
+                .First(r => r.Name.Equals("Bit.Core.licensing.cer"));
-			moduleDefMd.Resources.Remove(embeddedResourceToRemove);
 
-			DataReader reader = embeddedResourceToRemove.CreateReader();
+            Console.WriteLine(embeddedResourceToRemove.Name);
-			X509Certificate2 existingCert = new(reader.ReadRemainingBytes());
 
-			Console.WriteLine($"Existing Cert Thumbprint: {existingCert.Thumbprint}");
+            EmbeddedResource embeddedResourceToAdd = new("Bit.Core.licensing.cer", cert) {Attributes = embeddedResourceToRemove.Attributes };
-			X509Certificate2 certificate = new(cert);
+            moduleDefMd.Resources.Add(embeddedResourceToAdd);
+            moduleDefMd.Resources.Remove(embeddedResourceToRemove);
 
-			Console.WriteLine($"New Cert Thumbprint: {certificate.Thumbprint}");
+            DataReader reader = embeddedResourceToRemove.CreateReader();
+            X509Certificate2 existingCert = new(reader.ReadRemainingBytes());
             
-			IEnumerable<TypeDef> services = moduleDefMd.Types.Where(t => t.Namespace == "Bit.Core.Billing.Services");
+            Console.WriteLine($"Existing Cert Thumbprint: {existingCert.Thumbprint}");
-			TypeDef type = services.First(t => t.Name == "LicensingService");
+            X509Certificate2 certificate = new(cert);
-			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));
+            Console.WriteLine($"New Cert Thumbprint: {certificate.Thumbprint}");
 
-			if (instructionToPatch != null)
+            IEnumerable<TypeDef> services = moduleDefMd.Types.Where(t => t.Namespace == "Bit.Core.Services");
-			{
+            TypeDef type = services.First(t => t.Name == "LicensingService");
-				instructionToPatch.Operand = certificate.Thumbprint;
+            MethodDef constructor = type.FindConstructors().First();
-			}
-			else
-			{
-				Console.WriteLine("Can't find constructor to patch");
-			}
             
-			ModuleWriterOptions moduleWriterOptions = new(moduleDefMd);
+            Instruction instructionToPatch =
-			moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.KeepOldMaxStack;
+                constructor.Body.Instructions
-			moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.PreserveAll;
+                    .FirstOrDefault(i => i.OpCode == OpCodes.Ldstr
-			moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.PreserveRids;
+                                         && String.Equals((String)i.Operand, existingCert.Thumbprint, StringComparison.InvariantCultureIgnoreCase));
             
-			moduleDefMd.Write(file + ".new");
+            if (instructionToPatch != null)
-			moduleDefMd.Dispose();
+            {
-			File.Delete(file);
+                instructionToPatch.Operand = certificate.Thumbprint;
-			File.Move(file + ".new", file);
+            }
-		}
+            else
+            {
+                Console.WriteLine("Can't find constructor to patch");
+            }
 
-		return 0;
+            ModuleWriterOptions moduleWriterOptions = new(moduleDefMd);
-	}
+            moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.KeepOldMaxStack;
+            moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.PreserveAll;
+            moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.PreserveRids;
+
+            moduleDefMd.Write(file + ".new");
+            moduleDefMd.Dispose();
+            File.Delete(file);
+            File.Move(file + ".new", file);
+        }
+
+        return 0;
+    }
 }

src/bitBetter/bitBetter.csproj

@@ -1,9 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="dnlib" Version="4.5.0" />
+    <PackageReference Include="dnlib" Version="4.4.0" />
   </ItemGroup>
+
 </Project>

src/licenseGen/Dockerfile

@@ -12,4 +12,4 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0
 WORKDIR /app
 COPY --from=build /app .
 
-ENTRYPOINT ["dotnet", "/app/licenseGen.dll", "--cert=/app/cert.pfx", "--core=/app/Core.dll"]
+ENTRYPOINT [ "dotnet", "/app/licenseGen.dll", "--core", "/app/Core.dll", "--cert", "/app/cert.pfx" ]

src/licenseGen/Program.cs

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

src/licenseGen/licenseGen.csproj

@@ -1,10 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
   </ItemGroup>
+
 </Project>