Skip to content

Conditional HTTPS hint on login page#2730

Merged
DL6ER merged 3 commits into
development-v6from
tweak/api_auth_https
Oct 9, 2023
Merged

Conditional HTTPS hint on login page#2730
DL6ER merged 3 commits into
development-v6from
tweak/api_auth_https

Conversation

@DL6ER

@DL6ER DL6ER commented Oct 8, 2023

Copy link
Copy Markdown
Member

What does this implement/fix?

Show HTTPS hint on login page only when HTTPS is actually served. If it is served on a port != 443, add this port as well to the link

Depends on FTL in pi-hole/FTL#1653

Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

…it is served an a port != 443, add this port as well

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team October 8, 2023 17:48
yubiuser
yubiuser previously approved these changes Oct 8, 2023

@yubiuser yubiuser left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Approving, but don't merge before the relevant FTL is merged. (Maybe changes here are required.)

I tried with ssl port 443, 8443 and non and it works as expected.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Comment thread scripts/pi-hole/js/login.js Outdated
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: DL6ER <DL6ER@users.noreply.github.com>
@DL6ER DL6ER requested review from a team and rdwebdesign October 9, 2023 15:38
@DL6ER DL6ER enabled auto-merge October 9, 2023 19:39
@DL6ER DL6ER dismissed rdwebdesign’s stale review October 9, 2023 19:39

Code suggestion applied

@DL6ER DL6ER merged commit d64dc0d into development-v6 Oct 9, 2023
@DL6ER DL6ER deleted the tweak/api_auth_https branch October 9, 2023 19:39
@PromoFaux PromoFaux mentioned this pull request Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

3 participants