Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add recaptcha_{private,public}_key_path config option #17984

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

V02460
Copy link
Contributor

@V02460 V02460 commented Dec 2, 2024

Another config option on my quest to a *_path variant for every secret. Adds the config options recaptcha_private_key_path and recaptcha_public_key_path. Tests and docs are included.

A public key is of course no secret, but it is closely related to the private key, so it’s still useful to have a *_path variant for it.

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
    • Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
  • Code style is correct
    (run the linters)

@V02460 V02460 requested a review from a team as a code owner December 2, 2024 15:35
@github-actions github-actions bot deployed to PR Documentation Preview December 2, 2024 15:37 Active
Comment on lines +29 to +30
You have configured both `recaptcha_private_key` and
`recaptcha_private_key_path`. These are mutually incompatible.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can dumb this down a bit:

Suggested change
You have configured both `recaptcha_private_key` and
`recaptcha_private_key_path`. These are mutually incompatible.
You have configured both `recaptcha_private_key` and
`recaptcha_private_key_path`. Only one or the other can be specified at a time.

Comment on lines +29 to +30
You have configured both `recaptcha_private_key` and
`recaptcha_private_key_path`. These are mutually incompatible.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a slight variation on the typical error message we've been using for this:

Conflicting options 'macaroon_secret_key' and 'macaroon_secret_key_path' are
both defined in config file.

I like the version that this PR has but we should probably be consistent and update all the other similar errors.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants