continuwuation/continuwuity
continuwuation/continuwuity
15
86
Fork 98
Code Issues 127 Pull requests 18 Releases 28 Packages 3 Activity Actions 7

Add TLS options for LDAP #1389

Merged
Jade merged 4 commits from getz/continuwuity:ldap-tls into main 2026-04-23 17:39:26 +00:00
Conversation 7 Commits 4 Files changed 4 +43 -4
getz commented 2026-02-16 00:38:25 +00:00
Contributor
Copy link

Optional StartTLS for LDAP and add option to skip TLS verification.

@RatCornu would you mind taking a look.

Optional StartTLS for LDAP and add option to skip TLS verification. @RatCornu would you mind taking a look.
Add LDAP options for TLS
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 5m16s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 14m13s
Details
0ae4eccf97 
Optional StartTLS for LDAP and add option to skip TLS verification.
Jade reviewed 2026-02-16 01:01:13 +00:00
src/service/users/mod.rs Outdated
@ -1400,2 +1419,3 @@
let (conn, mut ldap) = Self::create_ldap_connection(config, uri.as_str())
.await
.map_err(|e| err!(Ldap(error!(?user_dn, "LDAP connection setup error: {e}"))))?;
.map_err(|e| err!(Ldap(error!(%user_dn, "{e}"))))?;
Jade commented 2026-02-16 01:01:13 +00:00
Owner
Copy link

Why remove the error messages?

Why remove the error messages?
getz commented 2026-02-16 01:03:52 +00:00
Author
Contributor
Copy link

It's not removed look at the function created.

It's not removed look at the function created.
Jade commented 2026-02-16 01:05:14 +00:00
Owner
Copy link

In which case the double-mapping of the error is unnecesary

In which case the double-mapping of the error is unnecesary
nex commented 2026-03-03 18:41:12 +00:00
Owner
Copy link

@Jade wrote in #1389/files (comment):

In which case the double-mapping of the error is unnecesary

double-mapping is required to retain the user_dn thingy

@Jade wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1389/files#issuecomment-24296: > In which case the double-mapping of the error is unnecesary double-mapping is required to retain the user_dn thingy
RatCornu commented 2026-02-16 08:48:42 +00:00
Contributor
Copy link

This looks good to me: maybe it can be a good idea to add that both options are less secure than using TLS but I don't know the codebase enough to say if it's needed or not

This looks good to me: maybe it can be a good idea to add that both options are less secure than using TLS but I don't know the codebase enough to say if it's needed or not
ginger added this to the (deleted) milestone 2026-02-20 14:13:37 +00:00
nex requested review from Jade 2026-03-27 00:43:28 +00:00
getz force-pushed ldap-tls from 0ae4eccf97
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 5m16s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 14m13s
Details
to a570f381d2
Some checks are pending
Check Changelog / Check for changelog (pull_request_target) Successful in 10s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m15s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 26m26s
Details
Checks / Changelog / Check changelog is added (pull_request_target) Waiting to run
Details
2026-03-28 16:58:04 +00:00 Compare
forgejo-actions commented 2026-03-28 16:58:13 +00:00
Copy link

Please add a changelog fragment to changelog.d/ describing your changes.

<!-- changelog-check-action --> Please add a changelog fragment to `changelog.d/` describing your changes.
getz commented 2026-03-28 17:04:28 +00:00
Author
Contributor
Copy link

Updated to address comment by @Jade, the error is only mapped once at the call site.

Updated to address comment by @Jade, the error is only mapped once at the call site.
Jade approved these changes 2026-04-08 14:04:46 +00:00
Jade commented 2026-04-08 14:05:13 +00:00
Owner
Copy link

Missing a changelog, but otherwise looks good to squash merge

Missing a changelog, but otherwise looks good to squash merge
Jade force-pushed ldap-tls from a570f381d2
Some checks are pending
Check Changelog / Check for changelog (pull_request_target) Successful in 10s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m15s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 26m26s
Details
Checks / Changelog / Check changelog is added (pull_request_target) Waiting to run
Details
to 3f2ab551a9
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m18s
Details
Checks / Changelog / Check changelog is added (pull_request_target) Failing after 9s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m35s
Details
2026-04-15 13:29:55 +00:00 Compare
Jade commented 2026-04-15 13:31:00 +00:00
Owner
Copy link

This needs some manual intervention to regenerate config

This needs some manual intervention to regenerate config
Jade force-pushed ldap-tls from 3f2ab551a9
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m18s
Details
Checks / Changelog / Check changelog is added (pull_request_target) Failing after 9s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m35s
Details
to 6599182220
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Failing after 8s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m18s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
2026-04-23 17:33:20 +00:00 Compare
docs: Changelog
All checks were successful
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 32s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m35s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 9m11s
Details
4cc8b4e616
Jade merged commit 980bd475b6 into main 2026-04-23 17:39:26 +00:00
Jade referenced this pull request from a commit 2026-04-23 17:39:26 +00:00
feat: Add TLS options for LDAP (#1389)
Sign in to join this conversation.
Reviewers
No reviewers
Jade
Labels
Clear labels   
Blocked
This pull request or issue is currently blocked from being merged/closed

  
Bug
Something isn't working as intended

  
Changelog
Added
 Changelog entry added

  
Changelog
Missing
 No changelog when one is needed

  
Changelog
None
 Changelog is unnecesary for this change

  
Cherry-picking
Commits picked from other conduit projects

  
Database
This requires or includes changes to the database

  
Dependencies
Something dependency related

  
Dependencies/Renovate
Automatic dependency upgrades by Renovate

  
Difficulty
Easy
 Low difficulty to implement - touches few parts of the codebase, low complexity

  
Difficulty
Hard
 High difficulty to implement - touches many parts of the codebase, high complexity

  
Difficulty
Medium
 Medium difficulty to implement - touches more parts of the codebase, higher complexity

  
Documentation
Improvements or additions to documentation

  
Enhancement
New feature or request

  
Good first issue
Good for newcomers

  
Help wanted
Additional eyes and keyboards are required for this one

  
Inherited
Issues that have been inhereted from the project pre-fork

  
Matrix/Administration
Features pertaining to homeserver administration

  
Matrix/Appservices
Features pertaining to the appservice API

  
Matrix/Auth
Features pertaining to authentication

  
Matrix/Client
Features pertaining to client-to-server interactions

  
Matrix/Core
Issues relating to core matrix functionality, such as state resolution and PDU formats

  
Matrix/E2EE
Issues related to end to end encryption

  
Matrix/Federation
Features pertaining to server-to-server interactions

  
Matrix/Hydra
Issues related to room version 12 and related changes (temporary label)

  
Matrix/MSC
Features pertaining to unstable matrix features

  
Matrix/Media
Features pertaining to media interactions

  
Matrix/T&S
Changes or issues related to trust & safety tooling

  
Merge
This PR is ready to be merged

  
Merge/Manual
This PR should be manually merged

  
Merge/Squash
This PR should be squashed when it is merged

  
Meta
Related to housekeeping, maintenance, or other repo-meta.

  
Meta/CI
Issues related to CI changes

  
Meta/Packaging
Packaging

  
Priority
Blocking
 This issue is blocking the next release

  
Priority
High
 This issue is very important

  
Priority
Low
 This issue is of a rather low priority

  
Security
This item is related to general security

  
Status
Confirmed
 This issue has enough information and is confirmed

  
Status
Duplicate
 This issue or pull request already exists

  
Status
Invalid
 This issue doesn't seem right

  
Status
Needs Investigation
 This issue needs further investigation

  
Support
Questions or support requests

  
Wont fix
This will not be worked on

  
old/ci/cd
Ci/CD

Archived

  
old/rust
Pull requests that update Rust code

Archived

No labels
Blocked
Bug
Changelog
Added
Changelog
Missing
Changelog
None
Cherry-picking
Database
Dependencies
Dependencies/Renovate
Difficulty
Easy
Difficulty
Hard
Difficulty
Medium
Documentation
Enhancement
Good first issue
Help wanted
Inherited
Matrix/Administration
Matrix/Appservices
Matrix/Auth
Matrix/Client
Matrix/Core
Matrix/E2EE
Matrix/Federation
Matrix/Hydra
Matrix/MSC
Matrix/Media
Matrix/T&S
Merge
Merge/Manual
Merge/Squash
Meta
Meta/CI
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
Support
Wont fix
old/ci/cd
old/rust
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
5 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
continuwuation/continuwuity!1389
No description provided.