Commit Graph

83 Commits

Author SHA1 Message Date
juliokele
29add24126
licenseGen: fix OrganizationLicense namespace (#253)
Co-authored-by: juliokele <>
2025-08-03 18:11:30 +02:00
Joseph Gigantino
3689cc5ba1
Test generating user and organization licenses during build check (#251)
Add commands to build check to test if the created licensegen image can actually generate user and organization licenses. licenseGen.sh will print the generated license to stdout and return zero if successful. If an error occurs, a non zero error code is returned which should cause a build error.
2025-07-30 19:51:51 +02:00
Joseph Gigantino
34da077778
Update Program.cs (#241)
Remove duplicate instances of:
Set("UseRiskInsights", true);
Set("UseOrganizationDomains", true);     Set("UseAdminSponsoredFamilies", true);

Signed-off-by: Joseph Gigantino <128943406+Jgigantino31@users.noreply.github.com>
Co-authored-by: h44z <christoph.h@sprinternet.at>
2025-07-29 19:54:54 +02:00
juliokele
a3803cb3bc
[unified] Fix licenseGen according to upstream changes (#247)
* Dockerfile: remove not existing executable argument

* licenseGen: fix classes according to upstream changes

---------

Co-authored-by: juliokele <>
2025-07-29 19:49:52 +02:00
juliokele
01cdfa2842
[unified] Fix patch according to upstream changes and fix build errors (#243)
* Fix bitbetter patch according to upstream changes

* Fix the builds by removing redundant already removed and stopped old instance

---------

Co-authored-by: juliokele <>
2025-07-29 19:48:55 +02:00
Michiel Hazelhof
076b0a624b
Upstream patches (#240) 2025-07-15 10:00:09 +01:00
Joseph Gigantino
3d4c10d6f6
Update Program.cs (#236)
Set three new license options to true: UseRiskInsights, UseOrganizationDomains, and UseAdminSponsoredFamilies.

As mentioned in #229, licenses had to be regenerated starting in 2025.5.0. It looks like new options were added which default to false unless we set them to true here. I am not sure if the version needs to be bumped or not. I tested locally and I can now access the Claimed Domains page in my organization.

Signed-off-by: Joseph Gigantino <128943406+Jgigantino31@users.noreply.github.com>
2025-06-25 12:40:00 +00:00
Joseph Gigantino
1597800b89
Update serverlist.txt so that by default all lines are comments (#228) 2025-06-25 12:34:10 +00:00
juliokele
02740e84b6
build.sh: fix line endings in serverlist.txt before executing commands (#232)
Co-authored-by: Gyula Kelemen <kgydevelopement@gmail.com>
2025-06-10 20:47:53 +02:00
Joseph Gigantino
d71aa84e52
Update Unified branch to account for move from Docker Hub to GHCR (#227)
* Update build.sh to reflect move to GHCR

* Update build.ps1 to reflect move to GHCR

* Update README.md to reflect move to GHCR

* Update Dockerfile-bitwarden-patch to reflect move to GHCR
2025-03-29 17:15:16 +00:00
Michiel Hazelhof
770dcd33f6
Move Manually generating Certificate & Key section in README.md for unified (#220)
* Update Dockerfile

See #215 and #207

* Move Manually generating Certificate & Key section in README.md

See #216
2025-01-12 12:14:30 +01:00
Michiel Hazelhof
b6d2c9244c
Update Dockerfile (#217)
See #215 and #207
2024-11-24 19:05:26 +01:00
Michiel Hazelhof
b47fe37279
Update license to version 15 (#211) (#212)
Co-authored-by: captainhook <16797541+captainhook@users.noreply.github.com>
2024-10-15 11:12:55 +01:00
Michiel Hazelhof
f75731633c
Use new location (#201) 2024-06-30 01:30:58 +00:00
Michiel Hazelhof
0a45513872
Follow master updates and general improvements (#194)
* Use correct framework

* Upgrade packages

* Remove unused variable

* Migrate away from deprecated package

* Improve naming

* Fix typo

* Simplify constructors
2024-03-31 11:13:05 +01:00
Michiel Hazelhof
c8192610dc
Properly fix Dockerfiles (#189) 2024-03-04 21:16:30 +00:00
Michiel Hazelhof
e4da85d46e
Updated the unified branch (#180)
* Updated license version to 12, added SM options, increased max seats (short to int) (#172)

* - Updated license version to 12
- Added new SM license options
* Change seats, smseats, smserviceaccounts from short to int, like they are in the Bitwarden server code, to allow for the accurate maximum amount of seats

* Add extra ignore

* Code cleanup

* Ignore more VS cruft

* Bring up to date with upstream

(Update License to use Secrets Manager fully)

* Update to .NET 8.0
2024-02-23 14:44:27 +00:00
Michiel Hazelhof
38e6ebc5f9
Update licenseGen with latest version and options (#165) (#166)
Co-authored-by: Michiel Hazelhof <m.hazelhof@fyn.nl>
2023-04-23 12:41:27 +00:00
Michiel Hazelhof
d4abc9e5b7
Full Unified support including Linux and Windows (#155 / #154)
* Initial work

* Fix typo

* Fix typo

* Fix stupid issue

* Add comments and fix minor issues

* Add extra information

* Add Linux script for generating keys

* Add circleci

* Add comments

* Add extra option

* Add missing permissions and empty script for now

* Fix line endings

* Add missing mount point

* Simplify patch

* Fix scripts

* Reduce complexity

* Fix circleci

* Remove useless line

* Move to src folder and improve image creation
2023-01-16 21:13:43 +01:00
h44z
b819fe0c7d
update to dotnet 6.0 (#148) (#150) 2022-09-01 14:43:34 -07:00
h44z
960894cff4
update/remove json lib (#146)
* update/remove json lib

* remove json lib
2022-08-16 13:34:17 -07:00
h44z
6038a8668b
License gen fixes (#145)
* set default storage space to max (#122)

* update license fields to newest version

* strange characters for non-interactive mode (#123)
2022-08-16 22:32:39 +02:00
Alexander Detsch
101f078a98
Update README, E-Mail Verification constraint (#140)
thanks =)
2022-06-27 22:01:37 +02:00
Grommish
338ea68b08
BitBetter: update build.sh / update-bitwarden.sh (#135)
* BitBetter: update build.sh / update-bitwarden.sh

Bitwarden has changed the way they report version numbers for
self-hosted installations.

Fixes https://github.com/jakeswenson/BitBetter/issues/134

Credit to @Ayitaka for the fix

Tested and Verified, Updated install to 1.47.1

Signed-off-by: Donald Hoskins <grommish@gmail.com>

* Update build.sh

Remove extraneous comment
2022-04-08 21:49:08 -07:00
h44z
a58baf0186
Update README (#132)
- Update tested version
 - Add hint for upgrading from versions prior to 1.46.2
 - Add hint for Families Organization license
2022-03-22 11:49:13 +00:00
h44z
50cdb10b2c
Fix #128 (#129)
Fix #128
2022-03-21 21:20:32 +01:00
Reliacon Developer
d2377d0f84
Update bitwarden.sh path (#127)
* Update bitwarden.sh path

* Update update-bitwarden.sh

Co-authored-by: Alex Pearce <alexpearce92@gmail.com>
2022-03-03 19:28:02 +01:00
Grommish
0f2f9274cf
update-bitwarden.sh: Fix relative path (#111)
* update-bitwarden.sh: Fix relative path

update-bitwarden.sh attempted to update BitBetter via
./build.sh, but if run via crontab, you aren't in
the BitBetter directory.

Fixed to find it correctly.

Signed-off-by: Donald Hoskins <grommish@gmail.com>

* Update update-bitwarden.sh

Co-authored-by: h44z <christoph.h@sprinternet.at>

Co-authored-by: h44z <christoph.h@sprinternet.at>
2021-08-31 11:40:37 +02:00
clanto007
af2d744061
fix '3.1.0' was not found (#116)
* Update build.sh

* Update Dockerfile

* Update bitBetter.csproj

* Update Dockerfile

* Update Dockerfile

* Update licenseGen.csproj

* Apply suggestions from code review

Co-authored-by: h44z <christoph.h@sprinternet.at>

* Update src/licenseGen/Dockerfile

Co-authored-by: h44z <christoph.h@sprinternet.at>

* Update src/licenseGen/Dockerfile

Co-authored-by: h44z <christoph.h@sprinternet.at>
2021-08-31 10:18:29 +02:00
captainhook
a17681e82b
fix integer type (#110)
fix integer type for GenerateOrgLicense's "Seats" value
2021-08-09 18:10:49 +02:00
captainhook
21bffcf262
Update update-bitwarden.sh (#95)
Prune Docker images to reclaim space
2021-03-17 10:38:54 +01:00
p0thi
59ee2e3c3a
Make update-bitwarden.sh able to run non-interactive (#90)
* make update-bitwarden.sh able to run non-interactive

* changed script to be runnable by bash 3.x & README entry edited
2021-01-27 14:51:13 +01:00
kerenon
7ddf01fdf6
MaxStorageGb customization (#88)
* MaxStorageGb customization

* Defaulting to short.MaxValue if user entry is blank

* Update text prompt
2020-11-26 13:04:18 +00:00
captainhook
46934b0ddd
Update README.md (#84)
Correct licenseGen build step

Co-authored-by: h44z <christoph.h@sprinternet.at>
2020-10-06 14:52:55 +01:00
Joe S
a5516220fd
Fix wrong directory mistake, fix grammer (#83)
Fixed the license generator section
2020-10-06 15:49:47 +02:00
h44z
91d0155725
Fix build.sh and update script (#75) (#77)
* possible fix for #75

* Remove outdated bitbetter images as suggested by Ayitaka

* Fix exit status if no old images have been removed
2020-09-19 23:36:15 +01:00
h44z
f2b3b1babf
Updates 1.34.0 (#69)
* Use latest release of bitwarden as base image (#67, #66)

* Add a script which simplifies Bitwarden updates

* fix typo

* Add UseApi

* Updated version, created update section

* Workaround for docker-compose --ignore-pull-failures bugs (4377 and 7127)

* use version from docker script

* check if bitbetter images are outdated

Co-authored-by: Lework <kuailemy123@163.com>
Co-authored-by: Jake Swenson <jakeswenson@users.noreply.github.com>
Co-authored-by: Jeff Alyanak <jeff@alyanak.ca>
2020-09-10 15:39:20 -04:00
captainhook
7d8f0b1082
Make Sso available in org license (#73)
* Exclude cert.cert from git

* Use latest release of bitwarden as base image (#67, #66)

* Add a script which simplifies Bitwarden updates

* fix typo

* Add UseApi

* Updated version, created update section

* Workaround for docker-compose --ignore-pull-failures bugs (4377 and 7127)

* use version from docker script

* check if bitbetter images are outdated

* Make Sso available in org license

Add `UseSso` var and enable

* Update README.md

Co-authored-by: Christoph Haas <christoph.h@sprinternet.at>
Co-authored-by: Lework <kuailemy123@163.com>
Co-authored-by: Captainhook <ec14018@qmul.ac.uk>
2020-09-10 15:36:44 -04:00
h44z
6527ac8362
Exclude cert.cert from git (#68) 2020-09-10 11:59:12 -07:00
accolon
faf7833f44
Make policies available in generated org licenses. (#56)
* Make policies available in generated org licenses.

* Change license version to current value used in BitWarden. Add info about compatibility in README file.
2020-03-17 12:19:18 +00:00
Michiel Hazelhof
006fa1fecf
Update .net core and newtonsoft.json
Co-authored-by: Michiel Hazelhof <m.hazelhof@fyn.nl>

Due to compatibility issues laid out in issue #53:

Update from .net core 2.0 to 3.1 and newtonsoft.json 12.0.1 to 12.0.3.
2020-03-14 07:00:25 -04:00
Jan Schöppach
9c62a6f2ca
Update README.md (#50)
* Update README.md

Added note that testing has been done up to Bitwarden 1.32.0.

Replaced editing of `docker-compose.yml` with the update-resistant usage
of `docker-compose.override.yml`
2020-02-27 13:05:29 -05:00
Jeff Alyanak
a2189a874e
Updated Readme (#44)
* Updated Readme

Better description of dependencies, updated readme.

* Fixed default key directory

Script was not looking in the right place for the auto-generated key directory. This patch fixes issue #35.

* Cleans up Key Directory Patch

Key directory path fix was echoing the directory when run.
2020-01-18 14:33:03 -05:00
Jeff Alyanak
d98d4cad6a
Fixed default key directory (#46)
* Fixed default key directory

Script was not looking in the right place for the auto-generated key directory. This patch fixes issue #35.

* Cleans up Key Directory Patch

Key directory path fix was echoing the directory when run.
2019-12-27 19:25:41 -05:00
Vinrobot
3e44d7347b Improve build and scripts (#30)
* Use absolute path rather than relative path in scripts

* Remove src/bitBetter/.keys/cert.cert

* Build licenseGen in Docker
This way we don't have to install dotnet sdk on the host

* Build bitBetter in Docker
This way we don't have to install dotnet sdk on the host

* Change DIR in run.sh to point to the project root

* Replace echo in Dockerfiles by set -x and set -e

* Use same Dockerfile for api and identity images

* Update README.md

* Update CircleCI config
The Docker Executor can't mount volume.
https://support.circleci.com/hc/en-us/articles/360007324514
https://circleci.com/docs/2.0/executor-types/#using-machine

* Make scripts work with sh

* Remove the container used to build bitBetter
2019-07-07 12:18:27 -04:00
Jan Schöppach
5d01d3c661 Fix recreation of keys on every execution (#27)
* Fix recreation of keys on every execution
2019-06-19 09:34:33 -04:00
Jeff Alyanak
6c8789cd67
License Generator Interactive Mode (#23)
* Added a Key Generating script

To make the keygen process a bit easier I've added a `generate-keys.sh` script that can be found in the `.keys` directory. It will generate the key & cert and bundle them into the required pkcs#12 file.

I've updated the readme to include instructions on the script.

* Generate bitbetter/identiry container with modified Core.dll

Added the generation of a second modified container, bitbetter/identity, which contains the modified dll. Fixes #12.

This works on my testing environment but has not gone through extensive testing. I'd recommend a review and cleanup of this commit before it is merged into the develop or master branches.

* Updated Docs

I've taken the steps written out by @online-stuff and consolidated/organized them into the README. This closes #13.

In a future update it might be worth adding a docs/ directory and breaking the readme into several docs that link to one another.

* Updated build.sh

Build now checks for and creates missing .keys directories.

* Added subj to allow for non-interactive use.

* Generate keys on build.

* Circle-ci needs to gen keys to test build

* Generate keys if they don't exist.

Don't overwrite if keys already exist.

* Generate keys online in the .keys directory

* Updated README.md

* Added initial interactive options

* Functional implementation of licensegen interactive mode.

* Bumped Newtonson.Json version

Never versions of the dotnet-sdk have issues with older Newtonsoft versions. 12.0.1 seems to satisfy the widest variety of sdk versions.

* Removing old readme

* Removed Duplicate Section

* Fixed typo

This fixes and closes issue #24.
2019-06-05 14:19:39 -04:00
Jeff Alyanak
15371c362c
Bitbetter identity Core.dll (#14)
* Added a Key Generating script

To make the keygen process a bit easier I've added a `generate-keys.sh` script that can be found in the `.keys` directory. It will generate the key & cert and bundle them into the required pkcs#12 file automatically when running the build script if none already exist.

* Generate bitbetter/identiry container with modified Core.dll

Added the generation of a second modified container, bitbetter/identity, which contains the modified dll. Fixes #12.

This works on my testing environment but has not gone through extensive testing. I'd recommend a review and cleanup of this commit before it is merged into the develop or master branches.
2019-05-25 18:12:10 -04:00
Jeff Alyanak
5f85d83e45 Updated Docs (#15)
* Updated Docs

I've taken the steps written out by @online-stuff and consolidated/organized them into the README. This closes #13.

In a future update it might be worth adding a docs/ directory and breaking the readme into several docs that link to one another.

* Fixed Broken section Links
2019-05-20 22:21:10 -07:00
Jake Swenson
664b75ac81
Merge pull request #9 from online-stuff/master
Creating a Pull Request
2019-05-10 09:34:19 -07:00