Skip to content

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 #3551

  • The previous method of obtaining the certificate information after response is processed is not reliable. I suspect this is because if the server does not keep the TCP connection alive, the socket might be gone by the time we try to get info from it. Listening for the keylog event should be more reliable.
  • Unfortunately, during the keylog event, whether the connection is valid and secure is not defined. Ideally we would listen for the secureConnect event for this, but using axios there does not seem to be a way to do this. Hence it is manually checked in the previous location.
  • Add handling for the authorizationError information and display it in the UI.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • User interface (UI)
  • New feature (non-breaking change which adds functionality)

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)

image

@CommanderStorm
Copy link
Collaborator

CommanderStorm commented Dec 26, 2023

More as a discussion point: Should this be backported or are there any breaking changes that I am not seeing
=> should this PR be based on the 1.23.X branch or should this be treated as a feature?

@chakflying
Copy link
Collaborator Author

The authorizationError part is a minor new feature. I can make a branch without that part for backporting if needed.

@CommanderStorm CommanderStorm added this to the 2.1.0 milestone Jan 4, 2024
@chakflying chakflying added A:cert-expiry Areas related to certificate expiry notifications A:core Issues or PRs describing changes to the core of uptime kuma labels Jan 5, 2024
@CommanderStorm
Copy link
Collaborator

I can make a branch without that part for backporting if needed.

I would prefer if you were to split this PR into the 1.23.X part and the 2.x part.
This way there won't be such a huge merge conflict ^^

@chakflying chakflying marked this pull request as draft April 21, 2024 15:55
@CommanderStorm CommanderStorm added the pr:please address review comments this PR needs a bit more work to be mergable label May 19, 2024
@github-actions github-actions bot added pr:please resolve merge conflict A merge-conflict needs to be addressed before reviewing makes sense again and removed pr:please resolve merge conflict A merge-conflict needs to be addressed before reviewing makes sense again labels May 19, 2024
@github-actions github-actions bot added pr:please resolve merge conflict A merge-conflict needs to be addressed before reviewing makes sense again and removed pr:please resolve merge conflict A merge-conflict needs to be addressed before reviewing makes sense again labels May 21, 2024
@CommanderStorm
Copy link
Collaborator

@chakflying I am unsure about this PR:
What of this PR is already in master, what not given the other PRs merged.

Do you think this is a v2.0 bugfix or a general feature?

@chakflying
Copy link
Collaborator Author

I took a quick look around the existing code in master and it seems like what's left here is mainly displaying the tls error reason in the frontend, and sending that info from the backend. This obviously need rebasing, and should be considered as a minor feature addition.

@CommanderStorm
Copy link
Collaborator

Feel free to ping for a review once the rebase/merge is done and you are happy ^^

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

Labels

A:cert-expiry Areas related to certificate expiry notifications A:core Issues or PRs describing changes to the core of uptime kuma needs:resolve-merge-conflict pr:please address review comments this PR needs a bit more work to be mergable pr:please resolve merge conflict A merge-conflict needs to be addressed before reviewing makes sense again

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Cert Exp not shown in overview, but service marked as down when expired

3 participants