nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 16:12:49 -05:00
Code Activity

Added logging for Captchas

Browse Source 
(cherry picked from commit 0cb44ab926af0aa5ab4ed283e4f680c20c01381a)
This commit is contained in:
Todd Martin
2022-11-07 16:41:11 -05:00
parent 656eadd17d
commit a9466451f0
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,8 +281,7 @@ jobs:
DOCKER_CONTENT_TRUST: ${{ steps.check-matrix-dct.outputs.dct_enabled }} DOCKER_CONTENT_TRUST: ${{ steps.check-matrix-dct.outputs.dct_enabled }}
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 }}
SERVICE_NAME: ${{ steps.setup.outputs.service_name }} SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
run: | run: docker push bitwarden/$SERVICE_NAME:$_RELEASE_VERSION
docker push bitwarden/$SERVICE_NAME:$_RELEASE_VERSION
- name: Log out of Docker and disable Docker Notary - name: Log out of Docker and disable Docker Notary
if: matrix.origin_docker_repo == 'bitwarden' if: matrix.origin_docker_repo == 'bitwarden'
@ -328,8 +327,7 @@ jobs:
env: env:
SERVICE_NAME: ${{ steps.setup.outputs.service_name }} SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
REGISTRY: bitwardenqa.azurecr.io REGISTRY: bitwardenqa.azurecr.io
run: | run: docker push $REGISTRY/$SERVICE_NAME:$_RELEASE_VERSION
docker push $REGISTRY/$SERVICE_NAME:$_RELEASE_VERSION
- name: Log out of Docker - name: Log out of Docker
run: docker logout run: docker logout
@ -363,8 +361,7 @@ jobs:
env: env:
SERVICE_NAME: ${{ steps.setup.outputs.service_name }} SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
REGISTRY: bitwardenprod.azurecr.io REGISTRY: bitwardenprod.azurecr.io
run: | run: docker push $REGISTRY/$SERVICE_NAME:$_RELEASE_VERSION
docker push $REGISTRY/$SERVICE_NAME:$_RELEASE_VERSION
- name: Log out of Docker - name: Log out of Docker
if: matrix.prod_acr == true if: matrix.prod_acr == true

9
src/Core/Services/Implementations/HCaptchaValidationService.cs
View File

@ -77,6 +77,7 @@ public class HCaptchaValidationService : ICaptchaValidationService
if (!responseMessage.IsSuccessStatusCode) if (!responseMessage.IsSuccessStatusCode)
{ {
_logger.LogError("Error submitting Captcha token to HCaptcha: {status} - {message}", responseMessage.StatusCode, responseMessage.ReasonPhrase);
return response; return response;
} }
@ -86,6 +87,12 @@ public class HCaptchaValidationService : ICaptchaValidationService
response.MaybeBot = score >= _globalSettings.Captcha.MaybeBotScoreThreshold; response.MaybeBot = score >= _globalSettings.Captcha.MaybeBotScoreThreshold;
response.IsBot = score >= _globalSettings.Captcha.IsBotScoreThreshold; response.IsBot = score >= _globalSettings.Captcha.IsBotScoreThreshold;
response.Score = score; response.Score = score;
if (!response.Success && hcaptchaResponse.ErrorCodes != null && hcaptchaResponse.ErrorCodes.Any())
{
_logger.LogError("HCaptcha errors received when validating Captcha for user {email}: {@errors}", user.Email, hcaptchaResponse.ErrorCodes);
}
return response; return response;
} }
@ -125,6 +132,8 @@ public class HCaptchaValidationService : ICaptchaValidationService
public double? Score { get; set; } public double? Score { get; set; }
[JsonPropertyName("score_reason")] [JsonPropertyName("score_reason")]
public List<string> ScoreReason { get; set; } public List<string> ScoreReason { get; set; }
[JsonPropertyName("error-codes")]
public List<string> ErrorCodes { get; set; }
public void Dispose() { } public void Dispose() { }
} }