Skip to content

ldap: use ldaps:// scheme when adding LDAP config if SSL is enabled - #14452

Open
weizhouapache wants to merge 2 commits into
apache:mainfrom
weizhouapache:4.22-fix-ldaps
Open

weizhouapache wants to merge 2 commits into
apache:mainfrom
weizhouapache:4.22-fix-ldaps

Conversation

@weizhouapache

Copy link
Copy Markdown
Member

Description

This PR fixes the issue below:

addConfigurationInternal always built the connectivity-test provider URL with the plain ldap:// scheme, even when domain/global SSL (truststore) settings are configured, unlike LdapConfiguration.getProviderUrl() used elsewhere which already selects ldaps:// based on SSL status.

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • Build/CI
  • Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

@codecov

codecov Bot commented Oct 21, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 20.68%. Comparing base (82e5ede) to head (cb86246).
⚠️ Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...va/org/apache/cloudstack/ldap/LdapManagerImpl.java 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #14452      +/-   ##
============================================
- Coverage     20.68%   20.68%   -0.01%     
  Complexity    21724    21724              
============================================
  Files          6489     6489              
  Lines        590173   590173              
  Branches      72362    72362              
============================================
- Hits         122060   122054       -6     
- Misses       454842   454850       +8     
+ Partials      13271    13269       -2     
Flag Coverage Δ
uitests 3.74% <ø> (ø)
unittests 21.99% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@weizhouapache
weizhouapache changed the base branch from 4.22 to main October 21, 2026 08:02
@weizhouapache weizhouapache reopened this Oct 21, 2026

@DaanHoogland DaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

clgtm, but should we make the protocol selection a utility method to be used in both (or all) places?

Copilot AI balanced review requested due to automatic review settings October 26, 2026 08:46

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota.

@weizhouapache

Copy link
Copy Markdown
Member Author

clgtm, but should we make the protocol selection a utility method to be used in both (or all) places?

good point. @DaanHoogland

change is done.

addConfigurationInternal always built the connectivity-test provider
URL with the plain ldap:// scheme, even when domain/global SSL
(truststore) settings are configured, unlike LdapConfiguration.getProviderUrl()
used elsewhere which already selects ldaps:// based on SSL status.
Copilot AI balanced review requested due to automatic review settings October 26, 2026 10:59

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota.

This branch has not been deployed

No deployments
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.

3 participants