nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 05:28:15 -05:00
Code

Remove DCT bypass for scim (#2451)

Browse Source
This commit is contained in:
Michał Chęciński 2022-12-06 15:48:55 +01:00 committed by GitHub
parent ae280a313c
commit f173988979
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -233,7 +233,6 @@ jobs:
base_path: ./bitwarden_license/src base_path: ./bitwarden_license/src
docker_repos: [bitwarden, bitwardenqa.azurecr.io] docker_repos: [bitwarden, bitwardenqa.azurecr.io]
dotnet: true dotnet: true
skip_dct: true
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
@ -334,7 +333,6 @@ jobs:
&& (github.ref == 'refs/heads/master' || && (github.ref == 'refs/heads/master' ||
github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/rc' ||
github.ref == 'refs/heads/hotfix-rc') github.ref == 'refs/heads/hotfix-rc')
&& (!matrix.skip_dct)
env: env:
DCT_DELEGATION_KEY_ID: "c9bde8ec820701516491e5e03d3a6354e7bd66d05fa3df2b0062f68b116dc59c" DCT_DELEGATION_KEY_ID: "c9bde8ec820701516491e5e03d3a6354e7bd66d05fa3df2b0062f68b116dc59c"
DCT_DELEGATE_KEY: ${{ steps.retrieve-secrets.outputs.dct-delegate-2-key }} DCT_DELEGATE_KEY: ${{ steps.retrieve-secrets.outputs.dct-delegate-2-key }}

13
.github/workflows/release.yml vendored
View File

@ -208,7 +208,6 @@ jobs:
origin_docker_repo: bitwarden origin_docker_repo: bitwarden
- project_name: Scim - project_name: Scim
origin_docker_repo: bitwarden origin_docker_repo: bitwarden
skip_dct: true
steps: steps:
- name: Print environment - name: Print environment
env: env:
@ -240,16 +239,6 @@ jobs:
azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }} azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
azure-keyvault-name: "bitwarden-prod-kv" azure-keyvault-name: "bitwarden-prod-kv"
- name: Check for DCT value
id: check-matrix-dct
if: matrix.origin_docker_repo == 'bitwarden'
run: |
if [[ "${{ matrix.skip_dct }}" == "true" ]]; then
echo "dct_enabled=0" >> $GITHUB_OUTPUT
else
echo "dct_enabled=1" >> $GITHUB_OUTPUT
fi
- name: Pull latest project image - name: Pull latest project image
if: matrix.origin_docker_repo == 'bitwarden' if: matrix.origin_docker_repo == 'bitwarden'
env: env:
@ -275,7 +264,7 @@ jobs:
- name: Push version and latest image - name: Push version and latest image
if: ${{ github.event.inputs.release_type != 'Dry Run' && matrix.origin_docker_repo == 'bitwarden' }} if: ${{ github.event.inputs.release_type != 'Dry Run' && matrix.origin_docker_repo == 'bitwarden' }}
env: env:
DOCKER_CONTENT_TRUST: ${{ steps.check-matrix-dct.outputs.dct_enabled }} DOCKER_CONTENT_TRUST: 1
DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }} DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
PROJECT_NAME: ${{ steps.setup.outputs.project_name }} PROJECT_NAME: ${{ steps.setup.outputs.project_name }}
run: docker push bitwarden/$PROJECT_NAME:$_RELEASE_VERSION run: docker push bitwarden/$PROJECT_NAME:$_RELEASE_VERSION