From 99148f6fafa5929f77c2cffd5a7168f8fd6cb203 Mon Sep 17 00:00:00 2001 From: Michiel Hazelhof Date: Tue, 12 Aug 2025 17:06:19 +0200 Subject: [PATCH] Use proper file extension --- .gitignore | 2 +- README.md | 4 ++-- build.ps1 | 8 ++++---- build.sh | 10 +++++----- generateKeys.sh | 4 ++-- src/bitBetter/Dockerfile | 2 +- src/bitBetter/Program.cs | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 249b5ef..56566e8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,5 @@ src/bitBetter/.vs/* *.pem .vscode/ *.pfx -*.cert +*.cer *.vsidx diff --git a/README.md b/README.md index 7225b9a..78a56f6 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,8 @@ If you wish to generate your self-signed cert & key manually, you can run the fo ```bash cd .keys -openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.cert -days 36500 -outform DER -passout pass:test -openssl x509 -inform DER -in cert.cert -out cert.pem +openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.cer -days 36500 -outform DER -passout pass:test +openssl x509 -inform DER -in cert.cer -out cert.pem openssl pkcs12 -export -out cert.pfx -inkey key.pem -in cert.pem -passin pass:test -passout pass:test ``` diff --git a/build.ps1 b/build.ps1 index e86a0b2..a48cfcd 100644 --- a/build.ps1 +++ b/build.ps1 @@ -19,8 +19,8 @@ if (Test-Path -Path "$pwd\src\licenseGen\cert.pfx" -PathType Leaf) { Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force } -if (Test-Path -Path "$pwd\src\bitBetter\cert.cert" -PathType Leaf) { - Remove-Item "$pwd\src\bitBetter\cert.cert" -Force +if (Test-Path -Path "$pwd\src\bitBetter\cert.cer" -PathType Leaf) { + Remove-Item "$pwd\src\bitBetter\cert.cer" -Force } # generate keys if none are available @@ -29,11 +29,11 @@ if (!(Test-Path "$pwd\.keys")) { } # copy the key to bitBetter -Copy-Item "$pwd\.keys\cert.cert" -Destination "$pwd\src\bitBetter" +Copy-Item "$pwd\.keys\cert.cer" -Destination "$pwd\src\bitBetter" # build bitBetter and clean the source directory after docker build --no-cache -t bitbetter/bitbetter "$pwd\src\bitBetter" -Remove-Item "$pwd\src\bitBetter\cert.cert" -Force +Remove-Item "$pwd\src\bitBetter\cert.cer" -Force # gather all running instances, cannot run a wildcard filter on Ancestor= :( $oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}' diff --git a/build.sh b/build.sh index 4282079..1938e79 100755 --- a/build.sh +++ b/build.sh @@ -20,8 +20,8 @@ if [ -f "$PWD/src/licenseGen/cert.pfx" ]; then rm -f "$PWD/src/licenseGen/cert.pfx" fi -if [ -f "$PWD/src/bitBetter/cert.cert" ]; then - rm -f "$PWD/src/bitBetter/cert.cert" +if [ -f "$PWD/src/bitBetter/cert.cer" ]; then + rm -f "$PWD/src/bitBetter/cert.cer" fi # generate keys if none are available @@ -30,11 +30,11 @@ if [ ! -d "$PWD/.keys" ]; then fi # copy the key to bitBetter -cp -f "$PWD/.keys/cert.cert" "$PWD/src/bitBetter" +cp -f "$PWD/.keys/cert.cer" "$PWD/src/bitBetter" # build bitBetter and clean the source directory after docker build --no-cache -t bitbetter/bitbetter "$PWD/src/bitBetter" -rm -f "$PWD/src/bitBetter/cert.cert" +rm -f "$PWD/src/bitBetter/cert.cer" # gather all running instances, cannot run a wildcard filter on Ancestor= :( OLDINSTANCES=$(docker container ps --all -f Name=bitwarden --format '{{.ID}}') @@ -98,7 +98,7 @@ docker run -v "$TEMPDIRECTORY:/app/mount" --rm bitbetter/bitbetter docker build . --tag bitwarden-patched --file "$PWD/src/bitBetter/Dockerfile-bitwarden-patch" # start all user requested instances -if [ -f "$PWD/src/bitBetter/cert.cert" ]; then +if [ -f "$PWD/src/bitBetter/cert.cer" ]; then sed -i 's/\r$//' "$PWD/.servers/serverlist.txt" cat "$PWD/.servers/serverlist.txt" | while read -r LINE; do if [[ $LINE == "#*" ]]; then diff --git a/generateKeys.sh b/generateKeys.sh index d561aee..a700ce6 100755 --- a/generateKeys.sh +++ b/generateKeys.sh @@ -15,6 +15,6 @@ fi mkdir "$DIR" # Generate new keys -openssl req -x509 -newkey rsa:4096 -keyout "$DIR/key.pem" -out "$DIR/cert.cert" -days 36500 -subj '/CN=www.mydom.com/O=My Company Name LTD./C=US' -outform DER -passout pass:test -openssl x509 -inform DER -in "$DIR/cert.cert" -out "$DIR/cert.pem" +openssl req -x509 -newkey rsa:4096 -keyout "$DIR/key.pem" -out "$DIR/cert.cer" -days 36500 -subj '/CN=www.mydom.com/O=My Company Name LTD./C=US' -outform DER -passout pass:test +openssl x509 -inform DER -in "$DIR/cert.cer" -out "$DIR/cert.pem" openssl pkcs12 -export -out "$DIR/cert.pfx" -inkey "$DIR/key.pem" -in "$DIR/cert.pem" -passin pass:test -passout pass:test diff --git a/src/bitBetter/Dockerfile b/src/bitBetter/Dockerfile index 3077c6a..e93b428 100644 --- a/src/bitBetter/Dockerfile +++ b/src/bitBetter/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /bitBetter COPY . /bitBetter -COPY cert.cert /app/ +COPY cert.cer /app/ RUN dotnet restore RUN dotnet publish -c Release -o /app --no-restore diff --git a/src/bitBetter/Program.cs b/src/bitBetter/Program.cs index a47fd6b..dec4970 100644 --- a/src/bitBetter/Program.cs +++ b/src/bitBetter/Program.cs @@ -14,7 +14,7 @@ internal class Program { private static Int32 Main() { - const String certFile = "/app/cert.cert"; + const String certFile = "/app/cert.cer"; String[] files = Directory.GetFiles("/app/mount", "Core.dll", SearchOption.AllDirectories); foreach (String file in files)