Several small fixes for open issues #4143

BlackDex · 2023-12-06T22:29:10Z

Fix healthcheck when using an ENV file

If someone is using a .env file or configured the ENV_FILE variable
to use that as it's configuration, this was missed by the healthcheck.

So, DOMAIN and ROCKET_TLS were not seen, and not used in these cases.

This commit fixes this by checking for this file and if it exists, then
it will load those variables first.

Fixes #4112

Do not delete dir on file delete

Previously during a delete_file check we also tried to delete the
parent directory and ignored all errors, like not being empty for
example.

Since this function is called delete_file and does not mention
anything in regards to a directory i have removed that code and it will
now only delete the file and leave the rest as-is.

If this somehow is still needed or wanted, which i do not think we want,
then we should create a new function.

Fixes #4081

Check some `.git` paths to force a rebuild

When a checked-out repo switches to a specific tag, and that tag does
not have anything else changed in the files except the tag, it could
happen that the build process doesn't see any changes, while it could be
that the version string needs to be different.

This commit ensures that if some specific paths are changed within the
.git directory, cargo will be triggered to rebuild.

Fixes #4087

Remove useless variable

During some refactoring this seems to be overlooked.
This variable gets filled but isn't used at all afterwards.

Fixes #4105

Fix BWDC when re-run with cleared cache

Using the BWDC with a cleared cache caused invited users to be converted
to accepted users.

The problem was a wrong check for the restore function.

Fixes #4114

Add missing route

While there was a function and a derive, this endpoint wasn't part of
the routes. Since Bitwarden does have this endpoint ill add the route
instead of deleting it.

Fixes #4076
Fixes #4144

Update crates to update the openssl crate

Because of a bug in the openssl-sys crate we pinned the version to an
older version. This issue has been fixed and was released 2 days ago.

This commit updates the openssl crates including others.
This should also fix the issues with building Vaultwarden using newer
versions of LibreSSL.

And also fixes the security/dependabot tickets.

Fixes #4051

Using the BWDC with a cleared cache caused invited users to be converted to accepted users. The problem was a wrong check for the `restore` function. Fixes dani-garcia#4114

During some refactoring this seems to be overlooked. This variable gets filled but isn't used at all afterwards. Fixes dani-garcia#4105

When a checked-out repo switches to a specific tag, and that tag does not have anything else changed in the files except the tag, it could happen that the build process doesn't see any changes, while it could be that the version string needs to be different. This commit ensures that if some specific paths are changed within the .git directory, cargo will be triggered to rebuild. Fixes dani-garcia#4087

Previously during a `delete_file` check we also tried to delete the parent directory and ignored all errors, like not being empty for example. Since this function is called `delete_file` and does not mention anything in regards to a directory i have removed that code and it will now only delete the file and leave the rest as-is. If this somehow is still needed or wanted, which i do not think we want, then we should create a new function. Fixes dani-garcia#4081

If someone is using a `.env` file or configured the `ENV_FILE` variable to use that as it's configuration, this was missed by the healthcheck. So, `DOMAIN` and `ROCKET_TLS` were not seen, and not used in these cases. This commit fixes this by checking for this file and if it exists, then it will load those variables first. Fixes dani-garcia#4112

While there was a function and a derive, this endpoint wasn't part of the routes. Since Bitwarden does have this endpoint ill add the route instead of deleting it. Fixes dani-garcia#4076 Fixes dani-garcia#4144

Because of a bug in the openssl-sys crate we pinned the version to an older version. This issue has been fixed and was released 2 days ago. This commit updates the openssl crates including others. This should also fix the issues with building Vaultwarden using newer versions of LibreSSL. Fixes dani-garcia#4051

This PR contains the following updates: | Package | Update | Change | |---|---|---| | alpine | patch | `3.19.0` -> `3.19.1` | | [fireflyiii/core](https://github.com/firefly-iii/docker) ([source](https://dev.azure.com/Firefly-III/_git/MainImage)) | patch | `version-6.1.6` -> `version-6.1.7` | | [fireflyiii/data-importer](https://github.com/firefly-iii/docker) ([source](https://dev.azure.com/Firefly-III/_git/ImportToolImage)) | patch | `version-1.4.0` -> `version-1.4.2` | | [linuxserver/unifi-network-application](https://github.com/linuxserver/docker-unifi-network-application/packages) ([source](https://github.com/linuxserver/docker-unifi-network-application)) | patch | `8.0.26` -> `8.0.28` | | [vaultwarden/server](https://github.com/dani-garcia/vaultwarden) | patch | `1.30.1` -> `1.30.2` | --- ### Release Notes <details> <summary>dani-garcia/vaultwarden (vaultwarden/server)</summary> ### [`v1.30.2`](https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.2) [Compare Source](dani-garcia/vaultwarden@1.30.1...1.30.2) ⚠️ **Note:** The WebSockets service for live sync has been integrated in the main HTTP server, which means simpler proxy setups that don't require a separate rule to redirect WS traffic to port 3012. Please check the updated examples in the [wiki](https://github.com/dani-garcia/vaultwarden/wiki/Proxy-examples). It's recommended to migrate to this new setup as using the old server on port 3012 is deprecated, won't receive new features and will be removed in the next release. #### What's Changed - Prevent generating an error during ws close by [@BlackDex](https://github.com/BlackDex) in dani-garcia/vaultwarden#4127 - Update Rust, Crates, Profile and Actions by [@BlackDex](https://github.com/BlackDex) in dani-garcia/vaultwarden#4126 - Several small fixes for open issues by [@BlackDex](https://github.com/BlackDex) in dani-garcia/vaultwarden#4143 - Fix the version string by [@BlackDex](https://github.com/BlackDex) in dani-garcia/vaultwarden#4153 - Decrease JWT Refresh/Auth token by [@BlackDex](https://github.com/BlackDex) in dani-garcia/vaultwarden#4163 - Update crates by [@BlackDex](https://github.com/BlackDex) in dani-garcia/vaultwarden#4173 - Add additional build target which optimizes for size by [@gladiac](https://github.com/gladiac) in dani-garcia/vaultwarden#4096 - Update web-vault to v2023.12.0 by [@BlackDex](https://github.com/BlackDex) in dani-garcia/vaultwarden#4201 - Update Rust and Crates by [@BlackDex](https://github.com/BlackDex) in dani-garcia/vaultwarden#4211 - Fix Single Org Policy check by [@BlackDex](https://github.com/BlackDex) in dani-garcia/vaultwarden#420...

BlackDex added 5 commits December 6, 2023 21:56

Fix BWDC when re-run with cleared cache

56d47d9

Using the BWDC with a cleared cache caused invited users to be converted to accepted users. The problem was a wrong check for the `restore` function. Fixes dani-garcia#4114

Remove useless variable

327a8d7

During some refactoring this seems to be overlooked. This variable gets filled but isn't used at all afterwards. Fixes dani-garcia#4105

zacknewman mentioned this pull request Dec 7, 2023

Remove post macro from api::core::emergency_access::post_emergency_access or add to routes! #4144

Closed

BlackDex added 2 commits December 7, 2023 11:28

Add missing route

e85ecc4

While there was a function and a derive, this endpoint wasn't part of the routes. Since Bitwarden does have this endpoint ill add the route instead of deleting it. Fixes dani-garcia#4076 Fixes dani-garcia#4144

BlackDex force-pushed the small-fixes branch from 60116a0 to ebb70b9 Compare December 7, 2023 11:03

BlackDex requested a review from dani-garcia December 8, 2023 23:40

dani-garcia approved these changes Dec 9, 2023

View reviewed changes

dani-garcia merged commit 8ab2002 into dani-garcia:main Dec 9, 2023
5 checks passed

BlackDex deleted the small-fixes branch December 13, 2023 16:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Several small fixes for open issues #4143

Several small fixes for open issues #4143

BlackDex commented Dec 6, 2023 •

edited

Loading

Several small fixes for open issues #4143

Several small fixes for open issues #4143

Conversation

BlackDex commented Dec 6, 2023 • edited Loading

Fix healthcheck when using an ENV file

Do not delete dir on file delete

Check some .git paths to force a rebuild

Remove useless variable

Fix BWDC when re-run with cleared cache

Add missing route

Update crates to update the openssl crate

BlackDex commented Dec 6, 2023 •

edited

Loading

Check some `.git` paths to force a rebuild