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

letsencrypt: Add transip global_key parameter #3835

Merged
merged 5 commits into from
Dec 9, 2024

Conversation

nathansamson
Copy link
Contributor

@nathansamson nathansamson commented Nov 23, 2024

Fixes: #3606

Summary by CodeRabbit

Summary by CodeRabbit

  • New Features

    • Enhanced DNS management capabilities by adding a configuration parameter for the TransIP global key.
    • Updated documentation to include the new transip_global_key field in the DNS challenge section for improved user guidance.
    • Changelog updated to reflect the new version 5.2.8 with the addition of the transip global_key parameter.
  • Bug Fixes

    • Improved error handling and conditional checks to ensure relevant parameters are included based on configuration existence.

Copy link

@home-assistant home-assistant bot left a comment

Choose a reason for hiding this comment

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

Hi @nathansamson

It seems you haven't yet signed a CLA. Please do so here.

Once you do that we will be able to review and accept this pull request.

Thanks!

@home-assistant
Copy link

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@home-assistant home-assistant bot marked this pull request as draft November 23, 2024 11:01
@nathansamson nathansamson marked this pull request as ready for review November 23, 2024 11:03
Copy link
Contributor

coderabbitai bot commented Nov 23, 2024

Warning

Rate limit exceeded

@nathansamson has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 20 minutes and 52 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between 4d5b9d1 and 37641da.

📝 Walkthrough
📝 Walkthrough

Walkthrough

The file-structure.sh script has been updated to include a new configuration parameter, dns_transip_global_key, which is echoed into the /data/dnsapikey file. This modification allows for the integration of the TransIP global key, enhancing the script's functionality for DNS management. The overall structure, logic, and error handling of the script remain unchanged, ensuring that existing configurations are still processed correctly.

Changes

File Path Change Summary
letsencrypt/rootfs/etc/cont-init.d/file-structure.sh Added a new configuration parameter dns_transip_global_key to echo its value into /data/dnsapikey.
letsencrypt/DOCS.md Updated documentation to include transip_global_key in DNS challenge section and clarified usage.
letsencrypt/CHANGELOG.md Added version entry 5.2.8, noting the introduction of the transip global_key parameter.
letsencrypt/config.yaml Updated version from 5.2.7 to 5.2.8.

Assessment against linked issues

Objective Addressed Explanation
Support global keys for TransIP in the Letsencrypt add-on (#3606)
Document the new configuration option for TransIP (#3606)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai or @coderabbitai title anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (1)
letsencrypt/rootfs/etc/cont-init.d/file-structure.sh (1)

64-64: Consider using a more secure method for writing credentials.

While the file permissions are correctly set to 600, writing credentials using echo could potentially expose them in process listings. Consider using a more secure method like printf with a heredoc or writing directly to the file descriptor.

Here's a suggested pattern for writing credentials more securely:

- echo -e "dns_transip_global_key = $(bashio::config 'dns.transip_global_key')\n" \
+ printf '%s\n' "dns_transip_global_key = $(bashio::config 'dns.transip_global_key')" \

This approach reduces the risk of credential exposure in process listings while maintaining the same functionality.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between de2dfd9 and 900711c.

📒 Files selected for processing (1)
  • letsencrypt/rootfs/etc/cont-init.d/file-structure.sh (1 hunks)

@@ -61,6 +61,7 @@ echo -e "dns_desec_token = $(bashio::config 'dns.desec_token')\n" \
"dns_sakuracloud_api_token = $(bashio::config 'dns.sakuracloud_api_token')\n" \
"dns_sakuracloud_api_secret = $(bashio::config 'dns.sakuracloud_api_secret')\n" \
"dns_transip_username = $(bashio::config 'dns.transip_username')\n" \
"dns_transip_global_key = $(bashio::config 'dns.transip_global_key')\n" \
Copy link
Contributor

Choose a reason for hiding this comment

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

💡 Codebase verification

Documentation needs to be updated for TransIP global key

The new dns.transip_global_key parameter is added to the configuration but not documented in DOCS.md. The documentation only mentions the username and API key authentication method.

  • Update letsencrypt/DOCS.md to include:
    • Documentation for the new transip_global_key parameter
    • Example configuration showing the global key authentication method
    • Any specific requirements or limitations for using the global key
🔗 Analysis chain

LGTM! Verify TransIP global key integration.

The new parameter is correctly integrated alongside existing TransIP configurations and follows the established naming convention.

Let's verify the TransIP configuration handling:

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify TransIP configuration handling and documentation

# Check if TransIP configuration is documented
rg -l "transip_global_key" --type md

# Check for any existing TransIP key handling patterns
rg "transip.*key" --type bash

Length of output: 97


Script:

#!/bin/bash
# Let's try different approaches to verify TransIP configuration

# Check documentation files for TransIP global key
rg -l "transip.*global.*key" --type-add 'docs:*.{md,txt,rst}' -tdocs

# Check shell scripts for TransIP key handling (using .sh extension)
fd -e sh -x rg -l "transip.*key" {}

# Look for TransIP configuration patterns in shell scripts
fd -e sh -x rg "dns.transip" {}

# Check for any documentation about TransIP DNS configuration
rg -l "transip" --type-add 'docs:*.{md,txt,rst}' -tdocs

Length of output: 603


Script:

#!/bin/bash
# Let's check the documentation content and related configuration

# Check the content of DOCS.md for TransIP documentation
rg -A 5 -B 5 "transip" letsencrypt/DOCS.md

# Look for any configuration schema that might define these parameters
fd -e json -x rg -l "transip" {}
fd -e json -x cat {} | grep -i "transip" -A 5 -B 5

Length of output: 1253

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
letsencrypt/DOCS.md (1)

650-651: Improve URL formatting and parameter documentation

  1. Format the URL using markdown link syntax instead of a bare URL
  2. Specify the exact value to use for the parameter

Apply this diff to improve the documentation:

-If you can't use IP whitelisting, use the `transip_global_key` and set it to yes. (https://github.com/hsmade/certbot-dns-transip/blob/master/USAGE.rst#ip-whitelistsing)
+If you can't use IP whitelisting, set the `transip_global_key` parameter to `'yes'`. See [TransIP DNS plugin documentation](https://github.com/hsmade/certbot-dns-transip/blob/master/USAGE.rst#ip-whitelistsing) for more details.
🧰 Tools
🪛 Markdownlint (0.35.0)

650-650: null
Bare URL used

(MD034, no-bare-urls)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 900711c and 3a53f5a.

📒 Files selected for processing (1)
  • letsencrypt/DOCS.md (2 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
letsencrypt/DOCS.md (6)

Pattern */**(html|markdown|md): - For instructional content in documentation, use a direct and authoritative tone. Avoid expressions of politeness such as 'may' or 'please', and ensure the goal of the instruction is fronted.

  • Apply the Microsoft Style Guide to ensure documentation maintains clarity and conciseness.
  • In step-by-step instructions, front the location phrase in the instructional sentence.
  • In step-by-step instructions, front the 'goal' in the instructional sentence.
  • In step-by-step instructions, if in doubt what to front, front the 'goal' before the location phrase in the instructional sentence.
  • do not hyphenate terms like 'top-right' or 'bottom-left' with 'corner'

Pattern */**(html|markdown|md): - Use bold to mark UI strings.

  • If "" are used to mark UI strings, replace them by bold.

Pattern */**(html|markdown|md): - Be brief in your replies and don't add fluff like "thank you for..." and "Please let me know if"


Pattern */**(html|markdown|md): - Use sentence-style capitalization also in headings.


Pattern */**(html|markdown|md): do not comment on HTML used for icons


Pattern */**(html|markdown|md): Avoid flagging inline HTML for embedding videos in future reviews for this repository.

🪛 Markdownlint (0.35.0)
letsencrypt/DOCS.md

650-650: null
Bare URL used

(MD034, no-bare-urls)

🔇 Additional comments (1)
letsencrypt/DOCS.md (1)

149-149: LGTM!

The new configuration parameter is correctly added to the DNS provider configuration list.

@agners
Copy link
Member

agners commented Dec 3, 2024

Thanks for your contribution! This requires at least a patch version bump in config.yaml and an entry in CHANGELOG.md.

@agners agners changed the title letsencrypt Addon: Fix issue 3606. Add transip global_key parameter letsencrypt: Add transip global_key parameter Dec 3, 2024
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
letsencrypt/DOCS.md (1)

682-683: Format the URL as a proper markdown link

The bare URL should be formatted as a proper markdown link for better readability and consistency.

Apply this change:

-If you can't use IP whitelisting, use the `transip_global_key` and set it to yes. (https://github.com/hsmade/certbot-dns-transip/blob/master/USAGE.rst#ip-whitelistsing)
+If you can't use IP whitelisting, use the `transip_global_key` and set it to yes. See [IP whitelisting documentation](https://github.com/hsmade/certbot-dns-transip/blob/master/USAGE.rst#ip-whitelistsing).
🧰 Tools
🪛 Markdownlint (0.35.0)

682-682: null
Bare URL used

(MD034, no-bare-urls)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 3a53f5a and 03bd3f1.

📒 Files selected for processing (2)
  • letsencrypt/DOCS.md (2 hunks)
  • letsencrypt/rootfs/etc/cont-init.d/file-structure.sh (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • letsencrypt/rootfs/etc/cont-init.d/file-structure.sh
🧰 Additional context used
📓 Path-based instructions (1)
letsencrypt/DOCS.md (6)

Pattern */**(html|markdown|md): - For instructional content in documentation, use a direct and authoritative tone. Avoid expressions of politeness such as 'may' or 'please', and ensure the goal of the instruction is fronted.

  • Apply the Microsoft Style Guide to ensure documentation maintains clarity and conciseness.
  • In step-by-step instructions, front the location phrase in the instructional sentence.
  • In step-by-step instructions, front the 'goal' in the instructional sentence.
  • In step-by-step instructions, if in doubt what to front, front the 'goal' before the location phrase in the instructional sentence.
  • do not hyphenate terms like 'top-right' or 'bottom-left' with 'corner'

Pattern */**(html|markdown|md): - Use bold to mark UI strings.

  • If "" are used to mark UI strings, replace them by bold.

Pattern */**(html|markdown|md): - Be brief in your replies and don't add fluff like "thank you for..." and "Please let me know if"


Pattern */**(html|markdown|md): - Use sentence-style capitalization also in headings.


Pattern */**(html|markdown|md): do not comment on HTML used for icons


Pattern */**(html|markdown|md): Avoid flagging inline HTML for embedding videos in future reviews for this repository.

🪛 Markdownlint (0.35.0)
letsencrypt/DOCS.md

682-682: null
Bare URL used

(MD034, no-bare-urls)

🔇 Additional comments (1)
letsencrypt/DOCS.md (1)

154-154: LGTM: New TransIP configuration parameter added correctly

The transip_global_key parameter has been properly added to the DNS provider configuration section, maintaining consistency with other parameters.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
letsencrypt/CHANGELOG.md (1)

5-5: Enhance the changelog entry to be more descriptive.

While concise, the current entry could better explain the purpose and impact of this change.

Consider expanding it to:

- Add transip global_key parameter
+ Add transip global_key parameter to support authentication without IP whitelist requirements
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 03bd3f1 and 4d5b9d1.

📒 Files selected for processing (3)
  • letsencrypt/CHANGELOG.md (1 hunks)
  • letsencrypt/DOCS.md (2 hunks)
  • letsencrypt/config.yaml (1 hunks)
✅ Files skipped from review due to trivial changes (1)
  • letsencrypt/config.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • letsencrypt/DOCS.md
🧰 Additional context used
📓 Path-based instructions (1)
letsencrypt/CHANGELOG.md (6)

Pattern */**(html|markdown|md): - For instructional content in documentation, use a direct and authoritative tone. Avoid expressions of politeness such as 'may' or 'please', and ensure the goal of the instruction is fronted.

  • Apply the Microsoft Style Guide to ensure documentation maintains clarity and conciseness.
  • In step-by-step instructions, front the location phrase in the instructional sentence.
  • In step-by-step instructions, front the 'goal' in the instructional sentence.
  • In step-by-step instructions, if in doubt what to front, front the 'goal' before the location phrase in the instructional sentence.
  • do not hyphenate terms like 'top-right' or 'bottom-left' with 'corner'

Pattern */**(html|markdown|md): - Use bold to mark UI strings.

  • If "" are used to mark UI strings, replace them by bold.

Pattern */**(html|markdown|md): - Be brief in your replies and don't add fluff like "thank you for..." and "Please let me know if"


Pattern */**(html|markdown|md): - Use sentence-style capitalization also in headings.


Pattern */**(html|markdown|md): do not comment on HTML used for icons


Pattern */**(html|markdown|md): Avoid flagging inline HTML for embedding videos in future reviews for this repository.

🔇 Additional comments (1)
letsencrypt/CHANGELOG.md (1)

3-4: LGTM! Version bump is appropriate.

The patch version increment from 5.2.7 to 5.2.8 is correct for adding a new configuration parameter.

@nathansamson
Copy link
Contributor Author

Thanks for your contribution! This requires at least a patch version bump in config.yaml and an entry in CHANGELOG.md.

I've done so. It feels weird to choose a new version number though

I would expect to add an entry to the changelog under Unreleased, and then let the release maintainer fill in the version number...

If I did it wrong, let me know

Copy link
Member

@sairon sairon left a comment

Choose a reason for hiding this comment

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

I've done so. It feels weird to choose a new version number though

I would expect to add an entry to the changelog under Unreleased, and then let the release maintainer fill in the version number...

I get your point, but currently merging to master immediately deploys the add-on to the add-on repository. If it were supposed to work as you suggest, it would need a two-stage process where the PRs first go to a different branch and are merged/deployed later. So far there hasn't been pressure for changing this process but never say never :)

Otherwise, LGTM!

@agners agners merged commit 422dbf6 into home-assistant:master Dec 9, 2024
11 checks passed
@Goopher
Copy link
Contributor

Goopher commented Dec 9, 2024

This still doesn't seem to work, getting the following error:

Encountered exception during recovery: ValueError: dns_transip_global_key should have either 'yes' or 'no' as value
An unexpected error occurred:
ValueError: dns_transip_global_key should have either 'yes' or 'no' as value

@nathansamson
Copy link
Contributor Author

This still doesn't seem to work, getting the following error:

Encountered exception during recovery: ValueError: dns_transip_global_key should have either 'yes' or 'no' as value An unexpected error occurred: ValueError: dns_transip_global_key should have either 'yes' or 'no' as value

How does your config file look (please exclude any secrets)

@rdoubleu
Copy link

rdoubleu commented Dec 10, 2024

Same issue here. When i add single qoute homeassistant change this to double qoute. as shown below.

domains:
  - my.domain.nl
email: my@domain.nl
keyfile: privkey.pem
certfile: fullchain.pem
challenge: dns
dns:
  provider: dns-transip
  transip_username: username
  dns_transip_global_key: "yes"
  transip_api_key: |
    -----BEGIN PRIVATE KEY-----
    ********************
    -----END PRIVATE KEY-----

@rdoubleu
Copy link

@agners @nathansamson I dont know if the update today should fix the issue? but this did not fix the Quote issue. still the samen error message in the logging.

[17:25:42] INFO: Selected DNS Provider: dns-transip [17:25:42] INFO: Use propagation seconds: 60 [17:25:42] INFO: Increasing DNS propagation limit for TransIP to at least 240 seconds. [17:25:42] INFO: Detecting existing certificate type for home.rdoubleu.nl Saving debug log to /var/log/letsencrypt/letsencrypt.log [17:25:46] INFO: No certificate found - using 'ecdsa' key type. Saving debug log to /var/log/letsencrypt/letsencrypt.log Requesting a certificate for my.domain.nl Encountered exception during recovery: ValueError: dns_transip_global_key should have either 'yes' or 'no' as value An unexpected error occurred: ValueError: dns_transip_global_key should have either 'yes' or 'no' as value Ask for help or search for solutions at https://community.letsencrypt.org. See the logfile /var/log/letsencrypt/letsencrypt.log or re-run Certbot with -v for more details. s6-rc: info: service legacy-services: stopping s6-rc: info: service legacy-services successfully stopped s6-rc: info: service legacy-cont-init: stopping s6-rc: info: service legacy-cont-init successfully stopped s6-rc: info: service fix-attrs: stopping s6-rc: info: service fix-attrs successfully stopped s6-rc: info: service s6rc-oneshot-runner: stopping s6-rc: info: service s6rc-oneshot-runner successfully stopped

@agners
Copy link
Member

agners commented Dec 12, 2024

@agners @nathansamson I dont know if the update today should fix the issue? but this did not fix the Quote issue. still the samen error message in the logging.

Yesterday's update was somethign different. This just got fixed with #3855 today, 5.2.10.

@rielzzapps
Copy link

Same issue here. When i add single qoute homeassistant change this to double qoute. as shown below.

domains:
  - my.domain.nl
email: my@domain.nl
keyfile: privkey.pem
certfile: fullchain.pem
challenge: dns
dns:
  provider: dns-transip
  transip_username: username
  dns_transip_global_key: "yes"
  transip_api_key: |
    -----BEGIN PRIVATE KEY-----
    ********************
    -----END PRIVATE KEY-----

You need
transip_global_key

in the dns section, not add dns_ in front.

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

Successfully merging this pull request may close these issues.

TransIP method in letsencrypt doesn't support global keys
6 participants