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

chore(deps): upgrade http/https/socks proxy agents #5548

Merged
merged 3 commits into from
Jan 26, 2025

Conversation

TheBoroer
Copy link
Contributor

@TheBoroer TheBoroer commented Jan 18, 2025

⚠️⚠️⚠️ 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

This fixes a bug where a monitor using a HTTPS proxy server which is configured with a cert that uses a newer root cert (e.g. LetsEncrypt) would throw an error saying self-signed certificate but it's actually valid. Checking the https proxy manually in any browser works + using any ssl checker tool also verifies that the cert is valid. Currently the only way to get the http check to pass is to enable the Ignore TLS/SSL error for HTTPS websites checkbox.

Upgrading the https-proxy-agent package fixes this issue. Since the HttpsProxyAgent syntax changed slightly (requiring a proxy url string instead of proxyOptions to be fed in), I've also gone ahead and upgraded http-proxy-agent and socks-proxy-agent so that all proxy options use the same syntax now.

I can provide a test https proxy that causes monitor checks to fail on the latest version of uptime-kuma but works with this fix, just lmk and I'll get you a temp user/pass combo for this PR.

Type of change

Please delete any options that are not relevant.

  • 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)

Please do not use any external image service. Instead, just paste in or drag and drop the image here, and it will be uploaded automatically.

@TheBoroer TheBoroer changed the base branch from master to 1.23.X January 18, 2025 07:38
@TheBoroer TheBoroer marked this pull request as ready for review January 18, 2025 07:47
@TheBoroer TheBoroer force-pushed the upgrade-proxy-agents branch from d6c772d to 315f638 Compare January 19, 2025 18:56
@TheBoroer TheBoroer changed the title Upgrade http/https/socks proxy agents Bugfix: upgrade http/https/socks proxy agents Jan 20, 2025
@CommanderStorm CommanderStorm changed the title Bugfix: upgrade http/https/socks proxy agents Upgrade http/https/socks proxy agents Jan 24, 2025
@CommanderStorm CommanderStorm changed the title Upgrade http/https/socks proxy agents chore: upgrade http/https/socks proxy agents Jan 24, 2025
@CommanderStorm
Copy link
Collaborator

I can provide a test https proxy that causes monitor checks to fail on the latest version of uptime-kuma but works with this fix, just lmk and I'll get you a temp user/pass combo for this PR.

Either this or the pinky-promise that you have tested both proxys still work:

  • http and
  • sock

I'd like to pull this to v2 as a "feature".

@CommanderStorm CommanderStorm added the pr:please address review comments this PR needs a bit more work to be mergable label Jan 24, 2025
@TheBoroer
Copy link
Contributor Author

Either this or the pinky-promise that you have tested both proxys still work:

  • http and
  • sock

I'd like to pull this to v2 as a "feature".

I'll take the pinky-promise (and here's my proof 🫡 🤝 )

image

@CommanderStorm CommanderStorm changed the base branch from 1.23.X to master January 24, 2025 18:53
Copy link
Collaborator

@CommanderStorm CommanderStorm left a comment

Choose a reason for hiding this comment

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

I have changed the base to be v2.
There are now a two merge conflicts, could you fix them? ^^

@CommanderStorm CommanderStorm added the area:monitor Everything related to monitors label Jan 24, 2025
@CommanderStorm CommanderStorm changed the title chore: upgrade http/https/socks proxy agents chore(deps): upgrade http/https/socks proxy agents Jan 26, 2025
Copy link
Collaborator

@CommanderStorm CommanderStorm left a comment

Choose a reason for hiding this comment

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

LGTM

@CommanderStorm CommanderStorm added pr:depends on other pending other things to be done first and removed pr:please address review comments this PR needs a bit more work to be mergable labels Jan 26, 2025
@CommanderStorm CommanderStorm merged commit 20820f5 into louislam:master Jan 26, 2025
19 checks passed
itsmeasaurus pushed a commit to itsmeasaurus/uptime-kuma that referenced this pull request Jan 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:monitor Everything related to monitors pr:depends on other pending other things to be done first
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants