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

Fix: Getting TLS certificate through proxy & prometheus update #4700

Merged
merged 5 commits into from
Apr 24, 2024

Conversation

chakflying
Copy link
Collaborator

⚠️⚠️⚠️ Since we do not accept all types of pull requests and do not want to waste your time. Please be sure that you have read pull request rules:
https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma

Tick the checkbox if you understand [x]:

  • I have read and understand the pull request rules.

Description

Fixes #4693
Fixes #4698
Also handles the issue in #3551 correctly

I think I found a way to listen for the secureConnect event, which eliminates the messy 2-step process of the previous fix. I also restored the old method of checking for the tlsSocket after the response is received, since the proxy-agent does not seem to work with the keylog event, but we can still obtain the TLS information through the socket.

Feel free to test.

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Checklist

  • My code follows the style guidelines of this project
  • I ran ESLint and other linters for modified files
  • I have performed a self-review of my own code and tested it
  • I have commented my code, particularly in hard-to-understand areas (including JSDoc for methods)
  • My changes generates no new warnings
  • My code needed automated testing. I have added them (this is optional task)

Screenshots (if any)

CommanderStorm

This comment was marked as resolved.

@CommanderStorm CommanderStorm added this to the 1.23.13 milestone Apr 21, 2024
@CommanderStorm CommanderStorm added area:monitor Everything related to monitors area:cert-expiry related to certificate expiry notifications labels Apr 21, 2024
@louislam louislam merged commit 1490443 into louislam:1.23.X Apr 24, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:cert-expiry related to certificate expiry notifications area:monitor Everything related to monitors
Projects
None yet
3 participants