mirror of
https://github.com/jakeswenson/BitBetter.git
synced 2025-12-20 23:36:44 +00:00
Compare commits
3 Commits
0e34e638b0
...
lite
| Author | SHA1 | Date | |
|---|---|---|---|
|
389be8cea8 | ||
|
f6d7470ce8 | ||
|
|
9bc010cb57 |
@@ -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
|
command: ./licenseGen.sh org TestName TestEmail@example.com 4a619d4a-522d-4c70-8596-affb5b607c23
|
||||||
19
.editorconfig
Normal file
19
.editorconfig
Normal file
@@ -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
|
||||||
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
* text eol=lf
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -9,3 +9,4 @@ src/bitBetter/.vs/*
|
|||||||
*.pfx
|
*.pfx
|
||||||
*.cer
|
*.cer
|
||||||
*.vsidx
|
*.vsidx
|
||||||
|
.DS_Store
|
||||||
|
|||||||
@@ -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 --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 --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
|
||||||
|
|||||||
27
README.md
27
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.
|
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.
|
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
|
# Table of Contents
|
||||||
- [BitBetter](#bitbetter)
|
- [BitBetter](#bitbetter)
|
||||||
@@ -30,7 +32,7 @@ The following instructions are for unix-based systems (Linux, BSD, macOS) and Wi
|
|||||||
## Dependencies
|
## Dependencies
|
||||||
Aside from docker, which you also need for Bitwarden, BitBetter requires the following:
|
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)
|
* 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
|
## Setting up BitBetter
|
||||||
@@ -63,14 +65,14 @@ The scripts supports running and patching multi instances.
|
|||||||
Edit the .servers/serverlist.txt file and fill in the missing values, they can be replaced with existing installation values.
|
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.
|
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:
|
From the BitBetter directory, simply run:
|
||||||
```
|
```
|
||||||
./build.[sh|ps1]
|
./build.[sh|ps1]
|
||||||
```
|
```
|
||||||
|
|
||||||
This will create a new self-signed certificate in the `.keys` directory if one does not already exist and then create a modified version of the official `ghcr.io/bitwarden/self-host` image called `bitwarden-patched`.
|
This will create a new self-signed certificate in the `.keys` directory if one does not already exist and then create a modified version of the official `ghcr.io/bitwarden/lite` image called `bitwarden-patched`.
|
||||||
|
|
||||||
Afterwards it will automatically generate the license generator and start all previously specified containers which are **now ready to accept self-issued licenses.**
|
Afterwards it will automatically generate the license generator and start all previously specified containers which are **now ready to accept self-issued licenses.**
|
||||||
|
|
||||||
@@ -100,7 +102,7 @@ If you ran the build script, you can **simply run the license gen in interactive
|
|||||||
|
|
||||||
## Migrating from mssql to a real database
|
## 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/docker-unified/settings.env)
|
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).
|
Make sure you can get the data from either the backup file or by connecting directly to the mssql database (navicat has a trial).
|
||||||
|
|
||||||
@@ -156,8 +158,17 @@ docker exec bitwarden ln -s /usr/share/zoneinfo/Europe/Amsterdam /etc/localtime
|
|||||||
|
|
||||||
Require a recreation of the docker container, build.sh will suffice too.
|
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
|
# Footnotes
|
||||||
|
|
||||||
<a name="#f1"><sup>1</sup></a>This tool builds on top of the `bitbetter/api` container image so make sure you've built that above using the root `./build.sh` script.
|
<a name="#f1"><sup>1</sup></a>This tool builds on top of the `bitbetter/api` container image so make sure you've built that above using the root `./build.sh` script.
|
||||||
|
|
||||||
<a name="#f2"><sup>2</sup></a> If you wish to change this you'll need to change the value that `licenseGen/Program.cs` uses for its `GenerateUserLicense` and `GenerateOrgLicense` calls. Remember, this is really unnecessary as this certificate does not represent any type of security-related certificate.
|
<a name="#f2"><sup>2</sup></a> If you wish to change this you'll need to change the value that `licenseGen/Program.cs` uses for its `GenerateUserLicense` and `GenerateOrgLicense` calls. Remember, this is really unnecessary as this certificate does not represent any type of security-related certificate.
|
||||||
|
|||||||
260
build.ps1
260
build.ps1
@@ -1,128 +1,132 @@
|
|||||||
$ErrorActionPreference = 'Stop'
|
$ErrorActionPreference = 'Stop'
|
||||||
$PSNativeCommandUseErrorActionPreference = $true
|
$PSNativeCommandUseErrorActionPreference = $true
|
||||||
|
|
||||||
# detect buildx, ErrorActionPreference will ensure the script stops execution if not found
|
# detect buildx, ErrorActionPreference will ensure the script stops execution if not found
|
||||||
docker buildx version
|
docker buildx version
|
||||||
|
|
||||||
# define temporary directory
|
# Enable BuildKit for better build experience and to ensure platform args are populated
|
||||||
$tempdirectory = "$pwd\temp"
|
$env:DOCKER_BUILDKIT=1
|
||||||
# define services to patch
|
$env:COMPOSE_DOCKER_CLI_BUILD=1
|
||||||
$components = "Api","Identity"
|
|
||||||
|
# define temporary directory
|
||||||
# delete old directories / files if applicable
|
$tempdirectory = "$pwd\temp"
|
||||||
if (Test-Path "$tempdirectory" -PathType Container) {
|
# define services to patch
|
||||||
Remove-Item "$tempdirectory" -Recurse -Force
|
$components = "Api","Identity"
|
||||||
}
|
|
||||||
|
# delete old directories / files if applicable
|
||||||
if (Test-Path -Path "$pwd\src\licenseGen\Core.dll" -PathType Leaf) {
|
if (Test-Path "$tempdirectory" -PathType Container) {
|
||||||
Remove-Item "$pwd\src\licenseGen\Core.dll" -Force
|
Remove-Item "$tempdirectory" -Recurse -Force
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Test-Path -Path "$pwd\src\licenseGen\cert.pfx" -PathType Leaf) {
|
if (Test-Path -Path "$pwd\src\licenseGen\Core.dll" -PathType Leaf) {
|
||||||
Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
|
Remove-Item "$pwd\src\licenseGen\Core.dll" -Force
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Test-Path -Path "$pwd\src\bitBetter\cert.cer" -PathType Leaf) {
|
if (Test-Path -Path "$pwd\src\licenseGen\cert.pfx" -PathType Leaf) {
|
||||||
Remove-Item "$pwd\src\bitBetter\cert.cer" -Force
|
Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Test-Path "$pwd\.keys\cert.cert" -PathType Leaf) {
|
if (Test-Path -Path "$pwd\src\bitBetter\cert.cer" -PathType Leaf) {
|
||||||
Rename-Item -Path "$pwd\.keys\cert.cert" -NewName "$pwd\.keys\cert.cer"
|
Remove-Item "$pwd\src\bitBetter\cert.cer" -Force
|
||||||
}
|
}
|
||||||
|
|
||||||
# generate keys if none are available
|
if (Test-Path "$pwd\.keys\cert.cert" -PathType Leaf) {
|
||||||
if (!(Test-Path "$pwd\.keys" -PathType Container)) {
|
Rename-Item -Path "$pwd\.keys\cert.cert" -NewName "$pwd\.keys\cert.cer"
|
||||||
.\generateKeys.ps1
|
}
|
||||||
}
|
|
||||||
|
# generate keys if none are available
|
||||||
# copy the key to bitBetter
|
if (!(Test-Path "$pwd\.keys" -PathType Container)) {
|
||||||
Copy-Item "$pwd\.keys\cert.cer" -Destination "$pwd\src\bitBetter"
|
.\generateKeys.ps1
|
||||||
|
}
|
||||||
# build bitBetter and clean the source directory after
|
|
||||||
docker build --no-cache -t bitbetter/bitbetter "$pwd\src\bitBetter"
|
# copy the key to bitBetter
|
||||||
Remove-Item "$pwd\src\bitBetter\cert.cer" -Force
|
Copy-Item "$pwd\.keys\cert.cer" -Destination "$pwd\src\bitBetter"
|
||||||
|
|
||||||
# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden*
|
# build bitBetter and clean the source directory after
|
||||||
$oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}'
|
docker build --no-cache -t bitbetter/bitbetter "$pwd\src\bitBetter"
|
||||||
|
Remove-Item "$pwd\src\bitBetter\cert.cer" -Force
|
||||||
# stop and remove all running instances
|
|
||||||
foreach ($instance in $oldinstances) {
|
# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden*
|
||||||
docker stop $instance
|
$oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}'
|
||||||
docker rm $instance
|
|
||||||
}
|
# stop and remove all running instances
|
||||||
|
foreach ($instance in $oldinstances) {
|
||||||
# update bitwarden itself
|
docker stop $instance
|
||||||
if ($args[0] -eq 'update') {
|
docker rm $instance
|
||||||
docker pull ghcr.io/bitwarden/self-host:beta
|
}
|
||||||
} else {
|
|
||||||
$confirmation = Read-Host "Update (or get) bitwarden source container (y/n)"
|
# update bitwarden itself
|
||||||
if ($confirmation -eq 'y') {
|
if ($args[0] -eq 'update') {
|
||||||
docker pull ghcr.io/bitwarden/self-host:beta
|
docker pull ghcr.io/bitwarden/lite:latest
|
||||||
}
|
} else {
|
||||||
}
|
$confirmation = Read-Host "Update (or get) bitwarden source container (y/n)"
|
||||||
|
if ($confirmation -eq 'y') {
|
||||||
# stop and remove previous existing patch(ed) container
|
docker pull ghcr.io/bitwarden/lite:latest
|
||||||
$oldinstances = docker container ps --all -f Ancestor=bitwarden-patched --format '{{.ID}}'
|
}
|
||||||
foreach ($instance in $oldinstances) {
|
}
|
||||||
docker stop $instance
|
|
||||||
docker rm $instance
|
# stop and remove previous existing patch(ed) container
|
||||||
}
|
$oldinstances = docker container ps --all -f Ancestor=bitwarden-patched --format '{{.ID}}'
|
||||||
$oldinstances = docker image ls bitwarden-patched --format '{{.ID}}'
|
foreach ($instance in $oldinstances) {
|
||||||
foreach ($instance in $oldinstances) {
|
docker stop $instance
|
||||||
docker image rm $instance
|
docker rm $instance
|
||||||
}
|
}
|
||||||
|
$oldinstances = docker image ls bitwarden-patched --format '{{.ID}}'
|
||||||
# remove old extract containers
|
foreach ($instance in $oldinstances) {
|
||||||
$oldinstances = docker container ps --all -f Name=bitwarden-extract --format '{{.ID}}'
|
docker image rm $instance
|
||||||
foreach ($instance in $oldinstances) {
|
}
|
||||||
docker stop $instance
|
|
||||||
docker rm $instance
|
# remove old extract containers
|
||||||
}
|
$oldinstances = docker container ps --all -f Name=bitwarden-extract --format '{{.ID}}'
|
||||||
|
foreach ($instance in $oldinstances) {
|
||||||
# start a new bitwarden instance so we can patch it
|
docker stop $instance
|
||||||
$patchinstance = docker run -d --name bitwarden-extract ghcr.io/bitwarden/self-host:beta
|
docker rm $instance
|
||||||
|
}
|
||||||
# create our temporary directory
|
|
||||||
New-item -ItemType Directory -Path $tempdirectory
|
# start a new bitwarden instance so we can patch it
|
||||||
|
$patchinstance = docker run -d --name bitwarden-extract ghcr.io/bitwarden/lite:latest
|
||||||
# extract the files that need to be patched from the services that need to be patched into our temporary directory
|
|
||||||
foreach ($component in $components) {
|
# create our temporary directory
|
||||||
New-item -itemtype Directory -path "$tempdirectory\$component"
|
New-item -ItemType Directory -Path $tempdirectory
|
||||||
docker cp $patchinstance`:/app/$component/Core.dll "$tempdirectory\$component\Core.dll"
|
|
||||||
}
|
# extract the files that need to be patched from the services that need to be patched into our temporary directory
|
||||||
|
foreach ($component in $components) {
|
||||||
# stop and remove our temporary container
|
New-item -itemtype Directory -path "$tempdirectory\$component"
|
||||||
docker stop bitwarden-extract
|
docker cp $patchinstance`:/app/$component/Core.dll "$tempdirectory\$component\Core.dll"
|
||||||
docker rm bitwarden-extract
|
}
|
||||||
|
|
||||||
# run bitBetter, this applies our patches to the required files
|
# stop and remove our temporary container
|
||||||
docker run -v "$tempdirectory`:/app/mount" --rm bitbetter/bitbetter
|
docker stop bitwarden-extract
|
||||||
|
docker rm bitwarden-extract
|
||||||
# create a new image with the patched files
|
|
||||||
docker build . --tag bitwarden-patched --file "$pwd\src\bitBetter\Dockerfile-bitwarden-patch"
|
# run bitBetter, this applies our patches to the required files
|
||||||
|
docker run -v "$tempdirectory`:/app/mount" --rm bitbetter/bitbetter
|
||||||
# start all user requested instances
|
|
||||||
if (Test-Path -Path "$pwd\.servers\serverlist.txt" -PathType Leaf) {
|
# create a new image with the patched files
|
||||||
foreach($line in Get-Content "$pwd\.servers\serverlist.txt") {
|
docker build . --tag bitwarden-patched --file "$pwd\src\bitBetter\Dockerfile-bitwarden-patch"
|
||||||
if (!($line.StartsWith("#"))) {
|
|
||||||
Invoke-Expression "& $line"
|
# 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"
|
# remove our bitBetter image
|
||||||
Copy-Item "$pwd\.keys\cert.pfx" -Destination "$pwd\src\licenseGen"
|
docker image rm bitbetter/bitbetter
|
||||||
|
|
||||||
# build the licenseGen
|
# copy our patched library to the licenseGen source directory
|
||||||
docker build -t bitbetter/licensegen "$pwd\src\licenseGen"
|
Copy-Item "$tempdirectory\Identity\Core.dll" -Destination "$pwd\src\licenseGen"
|
||||||
|
Copy-Item "$pwd\.keys\cert.pfx" -Destination "$pwd\src\licenseGen"
|
||||||
# clean the licenseGen source directory
|
|
||||||
Remove-Item "$pwd\src\licenseGen\Core.dll" -Force
|
# build the licenseGen
|
||||||
Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
|
docker build -t bitbetter/licensegen "$pwd\src\licenseGen"
|
||||||
|
|
||||||
# remove our temporary directory
|
# clean the licenseGen source directory
|
||||||
Remove-Item "$tempdirectory" -Recurse -Force
|
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
|
||||||
|
|||||||
20
build.sh
20
build.sh
@@ -4,6 +4,10 @@ set -e
|
|||||||
# detect buildx, set -e will ensure the script stops execution if not found
|
# detect buildx, set -e will ensure the script stops execution if not found
|
||||||
docker buildx version
|
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
|
# define temporary directory
|
||||||
TEMPDIRECTORY="$PWD/temp"
|
TEMPDIRECTORY="$PWD/temp"
|
||||||
|
|
||||||
@@ -16,19 +20,19 @@ if [ -d "$TEMPDIRECTORY" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$PWD/src/licenseGen/Core.dll" ]; then
|
if [ -f "$PWD/src/licenseGen/Core.dll" ]; then
|
||||||
rm -f "$PWD/src/licenseGen/Core.dll"
|
rm -f "$PWD/src/licenseGen/Core.dll"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$PWD/src/licenseGen/cert.pfx" ]; then
|
if [ -f "$PWD/src/licenseGen/cert.pfx" ]; then
|
||||||
rm -f "$PWD/src/licenseGen/cert.pfx"
|
rm -f "$PWD/src/licenseGen/cert.pfx"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$PWD/src/bitBetter/cert.cer" ]; then
|
if [ -f "$PWD/src/bitBetter/cert.cer" ]; then
|
||||||
rm -f "$PWD/src/bitBetter/cert.cer"
|
rm -f "$PWD/src/bitBetter/cert.cer"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$PWD/.keys/cert.cert" ]; then
|
if [ -f "$PWD/.keys/cert.cert" ]; then
|
||||||
mv "$PWD/.keys/cert.cert" "$PWD/.keys/cert.cer"
|
mv "$PWD/.keys/cert.cert" "$PWD/.keys/cert.cer"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# generate keys if none are available
|
# generate keys if none are available
|
||||||
@@ -54,11 +58,11 @@ done
|
|||||||
|
|
||||||
# update bitwarden itself
|
# update bitwarden itself
|
||||||
if [ "$1" = "update" ]; then
|
if [ "$1" = "update" ]; then
|
||||||
docker pull ghcr.io/bitwarden/self-host:beta
|
docker pull ghcr.io/bitwarden/lite:latest
|
||||||
else
|
else
|
||||||
read -p "Update (or get) bitwarden source container (y/n): "
|
read -p "Update (or get) bitwarden source container (y/n): "
|
||||||
if [[ $REPLY =~ ^[Yy]$ ]]; then
|
if [[ $REPLY =~ ^[Yy]$ ]]; then
|
||||||
docker pull ghcr.io/bitwarden/self-host:beta
|
docker pull ghcr.io/bitwarden/lite:latest
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -81,7 +85,7 @@ for INSTANCE in ${OLDINSTANCES[@]}; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
# start a new bitwarden instance so we can patch it
|
# start a new bitwarden instance so we can patch it
|
||||||
PATCHINSTANCE=$(docker run -d --name bitwarden-extract ghcr.io/bitwarden/self-host:beta)
|
PATCHINSTANCE=$(docker run -d --name bitwarden-extract ghcr.io/bitwarden/lite:latest)
|
||||||
|
|
||||||
# create our temporary directory
|
# create our temporary directory
|
||||||
mkdir $TEMPDIRECTORY
|
mkdir $TEMPDIRECTORY
|
||||||
@@ -128,4 +132,4 @@ rm -f "$PWD/src/licenseGen/Core.dll"
|
|||||||
rm -f "$PWD/src/licenseGen/cert.pfx"
|
rm -f "$PWD/src/licenseGen/cert.pfx"
|
||||||
|
|
||||||
# remove our temporary directory
|
# remove our temporary directory
|
||||||
rm -rf "$TEMPDIRECTORY"
|
rm -rf "$TEMPDIRECTORY"
|
||||||
|
|||||||
@@ -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.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.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.cer`" -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"
|
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"
|
||||||
@@ -2,16 +2,16 @@ $ErrorActionPreference = 'Stop'
|
|||||||
$PSNativeCommandUseErrorActionPreference = $true
|
$PSNativeCommandUseErrorActionPreference = $true
|
||||||
|
|
||||||
if ($($args.Count) -lt 1) {
|
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
|
Exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($args[0] -eq "interactive") {
|
if ($args[0] -eq "interactive") {
|
||||||
docker run -it --rm bitbetter/licensegen interactive
|
docker run -it --rm bitbetter/licensegen interactive
|
||||||
} else {
|
} else {
|
||||||
docker run bitbetter/licensegen $args
|
docker run bitbetter/licensegen $args
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,12 +2,12 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [ $# -lt 1 ]; then
|
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
|
fi
|
||||||
|
|
||||||
if [ "$1" = "interactive" ]; then
|
if [ "$1" = "interactive" ]; then
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
FROM ghcr.io/bitwarden/self-host:beta
|
FROM ghcr.io/bitwarden/lite:latest
|
||||||
|
|
||||||
COPY ./temp/ /app/
|
COPY ./temp/ /app/
|
||||||
@@ -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.cer";
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="dnlib" Version="4.5.0" />
|
<PackageReference Include="dnlib" Version="4.5.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -12,4 +12,4 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=build /app .
|
COPY --from=build /app .
|
||||||
|
|
||||||
ENTRYPOINT ["dotnet", "/app/licenseGen.dll", "--cert=/app/cert.pfx", "--core=/app/Core.dll"]
|
ENTRYPOINT ["dotnet", "/app/licenseGen.dll", "--cert=/app/cert.pfx", "--core=/app/Core.dll"]
|
||||||
@@ -1,485 +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", "Certificate 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 (Cert == null || String.IsNullOrWhiteSpace(Cert.Value()))
|
if (Cert == null || String.IsNullOrWhiteSpace(Cert.Value()))
|
||||||
{
|
{
|
||||||
App.Error.WriteLine("No certificate specified");
|
App.Error.WriteLine("No certificate specified");
|
||||||
App.ShowHelp();
|
App.ShowHelp();
|
||||||
Environment.Exit(1);
|
Environment.Exit(1);
|
||||||
}
|
}
|
||||||
else if (CoreDll == null || String.IsNullOrWhiteSpace(CoreDll.Value()))
|
else if (CoreDll == null || String.IsNullOrWhiteSpace(CoreDll.Value()))
|
||||||
{
|
{
|
||||||
App.Error.WriteLine("No core dll specified");
|
App.Error.WriteLine("No core dll specified");
|
||||||
App.ShowHelp();
|
App.ShowHelp();
|
||||||
Environment.Exit(1);
|
Environment.Exit(1);
|
||||||
}
|
}
|
||||||
else if (!File.Exists(Cert.Value()))
|
else if (!File.Exists(Cert.Value()))
|
||||||
{
|
{
|
||||||
App.Error.WriteLine($"Can't find certificate at: {Cert.Value()}");
|
App.Error.WriteLine($"Can't find certificate at: {Cert.Value()}");
|
||||||
App.ShowHelp();
|
App.ShowHelp();
|
||||||
Environment.Exit(1);
|
Environment.Exit(1);
|
||||||
}
|
}
|
||||||
else if (!File.Exists(CoreDll.Value()))
|
else if (!File.Exists(CoreDll.Value()))
|
||||||
{
|
{
|
||||||
App.Error.WriteLine($"Can't find core dll at: {CoreDll.Value()}");
|
App.Error.WriteLine($"Can't find core dll at: {CoreDll.Value()}");
|
||||||
App.ShowHelp();
|
App.ShowHelp();
|
||||||
Environment.Exit(1);
|
Environment.Exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// checkUsername Checks that the username is a valid username
|
// checkUsername Checks that the username is a valid username
|
||||||
private static Boolean CheckUsername(String s)
|
private static Boolean CheckUsername(String s)
|
||||||
{
|
{
|
||||||
// TODO: Actually validate
|
// TODO: Actually validate
|
||||||
if (!String.IsNullOrWhiteSpace(s)) return true;
|
if (!String.IsNullOrWhiteSpace(s)) return true;
|
||||||
|
|
||||||
Console.WriteLine("The username provided doesn't appear to be valid!");
|
Console.WriteLine("The username provided doesn't appear to be valid!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// checkBusinessName Checks that the Business Name is a valid username
|
// checkBusinessName Checks that the Business Name is a valid username
|
||||||
private static Boolean CheckBusinessName(String s)
|
private static Boolean CheckBusinessName(String s)
|
||||||
{
|
{
|
||||||
// TODO: Actually validate
|
// TODO: Actually validate
|
||||||
if (!String.IsNullOrWhiteSpace(s)) return true;
|
if (!String.IsNullOrWhiteSpace(s)) return true;
|
||||||
|
|
||||||
Console.WriteLine("The Business Name provided doesn't appear to be valid!");
|
Console.WriteLine("The Business Name provided doesn't appear to be valid!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// checkEmail Checks that the email address is a valid email address
|
// checkEmail Checks that the email address is a valid email address
|
||||||
private static Boolean CheckEmail(String s)
|
private static Boolean CheckEmail(String s)
|
||||||
{
|
{
|
||||||
// TODO: Actually validate
|
// TODO: Actually validate
|
||||||
if (!String.IsNullOrWhiteSpace(s)) return true;
|
if (!String.IsNullOrWhiteSpace(s)) return true;
|
||||||
|
|
||||||
Console.WriteLine("The email provided doesn't appear to be valid!");
|
Console.WriteLine("The email provided doesn't appear to be valid!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// checkStorage Checks that the storage is in a valid range
|
// checkStorage Checks that the storage is in a valid range
|
||||||
private static Boolean CheckStorage(String s)
|
private static Boolean CheckStorage(String s)
|
||||||
{
|
{
|
||||||
if (String.IsNullOrWhiteSpace(s))
|
if (String.IsNullOrWhiteSpace(s))
|
||||||
{
|
{
|
||||||
Console.WriteLine("The storage provided doesn't appear to be valid!");
|
Console.WriteLine("The storage provided doesn't appear to be valid!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(Double.Parse(s) > Int16.MaxValue) && !(Double.Parse(s) < 0)) return true;
|
if (!(Double.Parse(s) > Int16.MaxValue) && !(Double.Parse(s) < 0)) return true;
|
||||||
|
|
||||||
Console.WriteLine("The storage value provided is outside the accepted range of [0-" + Int16.MaxValue + "]!");
|
Console.WriteLine("The storage value provided is outside the accepted range of [0-" + Int16.MaxValue + "]!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static readonly JsonSerializerOptions JsonOptions = new() { WriteIndented = true };
|
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)
|
private static void GenerateUserLicense(X509Certificate2 cert, String corePath, String userName, String email, Int16 storage, Guid userId, String key)
|
||||||
{
|
{
|
||||||
Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(Path.GetFullPath(corePath));
|
Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(Path.GetFullPath(corePath));
|
||||||
|
|
||||||
Type type = core.GetType("Bit.Core.Billing.Models.Business.UserLicense");
|
Type type = core.GetType("Bit.Core.Billing.Models.Business.UserLicense");
|
||||||
Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
|
Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
|
||||||
|
|
||||||
if (type == null)
|
if (type == null)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Could not find type!");
|
Console.WriteLine("Could not find type!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (licenseTypeEnum == null)
|
if (licenseTypeEnum == null)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Could not find license licenseTypeEnum!");
|
Console.WriteLine("Could not find license licenseTypeEnum!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Object license = Activator.CreateInstance(type);
|
Object license = Activator.CreateInstance(type);
|
||||||
|
|
||||||
MethodInfo computeHash = type.GetMethod("ComputeHash");
|
MethodInfo computeHash = type.GetMethod("ComputeHash");
|
||||||
if (computeHash == null)
|
if (computeHash == null)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Could not find ComputeHash!");
|
Console.WriteLine("Could not find ComputeHash!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
MethodInfo sign = type.GetMethod("Sign");
|
MethodInfo sign = type.GetMethod("Sign");
|
||||||
if (sign == null)
|
if (sign == null)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Could not find sign!");
|
Console.WriteLine("Could not find sign!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Set(type, license, "LicenseKey", String.IsNullOrWhiteSpace(key) ? Guid.NewGuid().ToString("n") : key);
|
Set(type, license, "LicenseKey", String.IsNullOrWhiteSpace(key) ? Guid.NewGuid().ToString("n") : key);
|
||||||
Set(type, license, "Id", userId);
|
Set(type, license, "Id", userId);
|
||||||
Set(type, license, "Name", userName);
|
Set(type, license, "Name", userName);
|
||||||
Set(type, license, "Email", email);
|
Set(type, license, "Email", email);
|
||||||
Set(type, license, "Premium", true);
|
Set(type, license, "Premium", true);
|
||||||
Set(type, license, "MaxStorageGb", storage == 0 ? Int16.MaxValue : storage);
|
Set(type, license, "MaxStorageGb", storage == 0 ? Int16.MaxValue : storage);
|
||||||
Set(type, license, "Version", 1);
|
Set(type, license, "Version", 1);
|
||||||
Set(type, license, "Issued", DateTime.UtcNow);
|
Set(type, license, "Issued", DateTime.UtcNow);
|
||||||
Set(type, license, "Refresh", DateTime.UtcNow.AddYears(100).AddMonths(-1));
|
Set(type, license, "Refresh", DateTime.UtcNow.AddYears(100).AddMonths(-1));
|
||||||
Set(type, license, "Expires", DateTime.UtcNow.AddYears(100));
|
Set(type, license, "Expires", DateTime.UtcNow.AddYears(100));
|
||||||
Set(type, license, "Trial", false);
|
Set(type, license, "Trial", false);
|
||||||
Set(type, license, "LicenseType", Enum.Parse(licenseTypeEnum, "User"));
|
Set(type, license, "LicenseType", Enum.Parse(licenseTypeEnum, "User"));
|
||||||
Set(type, license, "Hash", Convert.ToBase64String(((Byte[])computeHash.Invoke(license, []))!));
|
Set(type, license, "Hash", Convert.ToBase64String(((Byte[])computeHash.Invoke(license, []))!));
|
||||||
Set(type, license, "Signature", Convert.ToBase64String((Byte[])sign.Invoke(license, [cert])!));
|
Set(type, license, "Signature", Convert.ToBase64String((Byte[])sign.Invoke(license, [cert])!));
|
||||||
|
|
||||||
Console.WriteLine(JsonSerializer.Serialize(license, JsonOptions));
|
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 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));
|
Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(Path.GetFullPath(corePath));
|
||||||
Type type = core.GetType("Bit.Core.Billing.Organizations.Models.OrganizationLicense");
|
Type type = core.GetType("Bit.Core.Billing.Organizations.Models.OrganizationLicense");
|
||||||
Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
|
Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
|
||||||
Type planTypeEnum = core.GetType("Bit.Core.Billing.Enums.PlanType");
|
Type planTypeEnum = core.GetType("Bit.Core.Billing.Enums.PlanType");
|
||||||
|
|
||||||
if (type == null)
|
if (type == null)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Could not find type!");
|
Console.WriteLine("Could not find type!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (licenseTypeEnum == null)
|
if (licenseTypeEnum == null)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Could not find licenseTypeEnum!");
|
Console.WriteLine("Could not find licenseTypeEnum!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (planTypeEnum == null)
|
if (planTypeEnum == null)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Could not find planTypeEnum!");
|
Console.WriteLine("Could not find planTypeEnum!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Object license = Activator.CreateInstance(type);
|
Object license = Activator.CreateInstance(type);
|
||||||
|
|
||||||
MethodInfo computeHash = type.GetMethod("ComputeHash");
|
MethodInfo computeHash = type.GetMethod("ComputeHash");
|
||||||
if (computeHash == null)
|
if (computeHash == null)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Could not find ComputeHash!");
|
Console.WriteLine("Could not find ComputeHash!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
MethodInfo sign = type.GetMethod("Sign");
|
MethodInfo sign = type.GetMethod("Sign");
|
||||||
if (sign == null)
|
if (sign == null)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Could not find sign!");
|
Console.WriteLine("Could not find sign!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Set(type, license, "LicenseKey", String.IsNullOrWhiteSpace(key) ? Guid.NewGuid().ToString("n") : key);
|
Set(type, license, "LicenseKey", String.IsNullOrWhiteSpace(key) ? Guid.NewGuid().ToString("n") : key);
|
||||||
Set(type, license, "InstallationId", instalId);
|
Set(type, license, "InstallationId", instalId);
|
||||||
Set(type, license, "Id", Guid.NewGuid());
|
Set(type, license, "Id", Guid.NewGuid());
|
||||||
Set(type, license, "Name", userName);
|
Set(type, license, "Name", userName);
|
||||||
Set(type, license, "BillingEmail", email);
|
Set(type, license, "BillingEmail", email);
|
||||||
Set(type, license, "BusinessName", String.IsNullOrWhiteSpace(businessName) ? "BitBetter" : businessName);
|
Set(type, license, "BusinessName", String.IsNullOrWhiteSpace(businessName) ? "BitBetter" : businessName);
|
||||||
Set(type, license, "Enabled", true);
|
Set(type, license, "Enabled", true);
|
||||||
Set(type, license, "Plan", "Enterprise (Annually)");
|
Set(type, license, "Plan", "Enterprise (Annually)");
|
||||||
Set(type, license, "PlanType", Enum.Parse(planTypeEnum, "EnterpriseAnnually"));
|
Set(type, license, "PlanType", Enum.Parse(planTypeEnum, "EnterpriseAnnually"));
|
||||||
Set(type, license, "Seats", Int32.MaxValue);
|
Set(type, license, "Seats", Int32.MaxValue);
|
||||||
Set(type, license, "MaxCollections", Int16.MaxValue);
|
Set(type, license, "MaxCollections", Int16.MaxValue);
|
||||||
Set(type, license, "UsePolicies", true);
|
Set(type, license, "UsePolicies", true);
|
||||||
Set(type, license, "UseSso", true);
|
Set(type, license, "UseSso", true);
|
||||||
Set(type, license, "UseKeyConnector", true);
|
Set(type, license, "UseKeyConnector", true);
|
||||||
Set(type, license, "UseScim", true);
|
Set(type, license, "UseScim", true);
|
||||||
Set(type, license, "UseGroups", true);
|
Set(type, license, "UseGroups", true);
|
||||||
Set(type, license, "UseEvents", true);
|
Set(type, license, "UseEvents", true);
|
||||||
Set(type, license, "UseDirectory", true);
|
Set(type, license, "UseDirectory", true);
|
||||||
Set(type, license, "UseTotp", true);
|
Set(type, license, "UseTotp", true);
|
||||||
Set(type, license, "Use2fa", true);
|
Set(type, license, "Use2fa", true);
|
||||||
Set(type, license, "UseApi", true);
|
Set(type, license, "UseApi", true);
|
||||||
Set(type, license, "UseResetPassword", true);
|
Set(type, license, "UseResetPassword", true);
|
||||||
Set(type, license, "MaxStorageGb", storage == 0 ? Int16.MaxValue : storage);
|
Set(type, license, "MaxStorageGb", storage == 0 ? Int16.MaxValue : storage);
|
||||||
Set(type, license, "SelfHost", true);
|
Set(type, license, "SelfHost", true);
|
||||||
Set(type, license, "UsersGetPremium", true);
|
Set(type, license, "UsersGetPremium", true);
|
||||||
Set(type, license, "UseCustomPermissions", true);
|
Set(type, license, "UseCustomPermissions", true);
|
||||||
Set(type, license, "Version", 16);
|
Set(type, license, "Version", 16);
|
||||||
Set(type, license, "Issued", DateTime.UtcNow);
|
Set(type, license, "Issued", DateTime.UtcNow);
|
||||||
Set(type, license, "Refresh", DateTime.UtcNow.AddYears(100).AddMonths(-1));
|
Set(type, license, "Refresh", DateTime.UtcNow.AddYears(100).AddMonths(-1));
|
||||||
Set(type, license, "Expires", DateTime.UtcNow.AddYears(100));
|
Set(type, license, "Expires", DateTime.UtcNow.AddYears(100));
|
||||||
Set(type, license, "ExpirationWithoutGracePeriod", DateTime.UtcNow.AddYears(100));
|
Set(type, license, "ExpirationWithoutGracePeriod", DateTime.UtcNow.AddYears(100));
|
||||||
Set(type, license, "UsePasswordManager", true);
|
Set(type, license, "UsePasswordManager", true);
|
||||||
Set(type, license, "UseSecretsManager", true);
|
Set(type, license, "UseSecretsManager", true);
|
||||||
Set(type, license, "SmSeats", Int32.MaxValue);
|
Set(type, license, "SmSeats", Int32.MaxValue);
|
||||||
Set(type, license, "SmServiceAccounts", Int32.MaxValue);
|
Set(type, license, "SmServiceAccounts", Int32.MaxValue);
|
||||||
Set(type, license, "UseRiskInsights", true);
|
Set(type, license, "UseRiskInsights", true);
|
||||||
Set(type, license, "LimitCollectionCreationDeletion", true);
|
Set(type, license, "LimitCollectionCreationDeletion", true);
|
||||||
Set(type, license, "AllowAdminAccessToAllCollectionItems", true);
|
Set(type, license, "AllowAdminAccessToAllCollectionItems", true);
|
||||||
Set(type, license, "Trial", false);
|
Set(type, license, "Trial", false);
|
||||||
Set(type, license, "LicenseType", Enum.Parse(licenseTypeEnum, "Organization"));
|
Set(type, license, "LicenseType", Enum.Parse(licenseTypeEnum, "Organization"));
|
||||||
Set(type, license, "UseOrganizationDomains", true);
|
Set(type, license, "UseOrganizationDomains", true);
|
||||||
Set(type, license, "UseAdminSponsoredFamilies", true);
|
Set(type, license, "UseAdminSponsoredFamilies", true);
|
||||||
Set(type, license, "Hash", Convert.ToBase64String((Byte[])computeHash.Invoke(license, [])!));
|
Set(type, license, "Hash", Convert.ToBase64String((Byte[])computeHash.Invoke(license, [])!));
|
||||||
Set(type, license, "Signature", Convert.ToBase64String((Byte[])sign.Invoke(license, [cert])!));
|
Set(type, license, "Signature", Convert.ToBase64String((Byte[])sign.Invoke(license, [cert])!));
|
||||||
|
|
||||||
Console.WriteLine(JsonSerializer.Serialize(license, JsonOptions));
|
Console.WriteLine(JsonSerializer.Serialize(license, JsonOptions));
|
||||||
}
|
}
|
||||||
private static void Set(Type type, Object license, String name, Object value)
|
private static void Set(Type type, Object license, String name, Object value)
|
||||||
{
|
{
|
||||||
type.GetProperty(name)?.SetValue(license, value);
|
type.GetProperty(name)?.SetValue(license, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7,4 +7,4 @@
|
|||||||
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
|
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
|
||||||
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
|
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
Reference in New Issue
Block a user