feat(RHOAIENG-50753): add LDAP user and group autocomplete for workspace sharing #805
+1,368
−9
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| package handlers | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
| "net/http" | ||
|
|
||
| "ambient-code-backend/ldap" | ||
|
|
||
| "github.com/gin-gonic/gin" | ||
| ) | ||
|
|
||
| // LDAPClient is the shared LDAP client instance, initialized in main.go when LDAP_URL is set. | ||
| // Access is gated in the frontend by the "ldap.autocomplete.enabled" workspace feature flag. | ||
| var LDAPClient *ldap.Client | ||
|
|
||
| // SearchLDAPUsers handles GET /api/ldap/users?q={query} | ||
| func SearchLDAPUsers(c *gin.Context) { | ||
| reqK8s, _ := GetK8sClientsForRequest(c) | ||
| if reqK8s == nil { | ||
| c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid or missing token"}) | ||
| c.Abort() | ||
| return | ||
| } | ||
|
Comment on lines
+18
to
+24
There was a problem hiding this comment. 🧹 Nitpick | 🔵 Trivial Consider logging the discarded error from The error returned by ♻️ Proposed fix to log auth errors func SearchLDAPUsers(c *gin.Context) {
- reqK8s, _ := GetK8sClientsForRequest(c)
+ reqK8s, err := GetK8sClientsForRequest(c)
if reqK8s == nil {
+ if err != nil {
+ log.Printf("LDAP auth error: %v", err)
+ }
c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid or missing token"})
c.Abort()
return
}Apply the same pattern to Also applies to: 48-54, 78-84 🤖 Prompt for AI Agents |
||
|
|
||
| query := c.Query("q") | ||
| if len(query) < ldap.MinQueryLength { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("query must be at least %d characters", ldap.MinQueryLength)}) | ||
| return | ||
| } | ||
|
|
||
| if LDAPClient == nil { | ||
| c.JSON(http.StatusOK, gin.H{"users": []ldap.LDAPUser{}}) | ||
| return | ||
| } | ||
|
|
||
| users, err := LDAPClient.SearchUsers(query) | ||
| if err != nil { | ||
| log.Printf("LDAP user search error for query %q: %v", query, err) | ||
| c.JSON(http.StatusServiceUnavailable, gin.H{"error": "LDAP search unavailable"}) | ||
| return | ||
| } | ||
|
|
||
| c.JSON(http.StatusOK, gin.H{"users": users}) | ||
|
Comment on lines
+37
to
+44
There was a problem hiding this comment. 🧹 Nitpick | 🔵 Trivial Inconsistent HTTP status codes for LDAP errors.
♻️ Proposed fix for consistency user, err := LDAPClient.GetUser(uid)
if err != nil {
log.Printf("LDAP user get error for uid %q: %v", uid, err)
- c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to look up user"})
+ c.JSON(http.StatusServiceUnavailable, gin.H{"error": "LDAP lookup unavailable"})
return
}Also applies to: 67-74, 97-102 🤖 Prompt for AI Agents |
||
| } | ||
|
|
||
| // SearchLDAPGroups handles GET /api/ldap/groups?q={query} | ||
| func SearchLDAPGroups(c *gin.Context) { | ||
| reqK8s, _ := GetK8sClientsForRequest(c) | ||
| if reqK8s == nil { | ||
| c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid or missing token"}) | ||
| c.Abort() | ||
| return | ||
| } | ||
|
|
||
| query := c.Query("q") | ||
| if len(query) < ldap.MinQueryLength { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("query must be at least %d characters", ldap.MinQueryLength)}) | ||
| return | ||
| } | ||
|
|
||
| if LDAPClient == nil { | ||
| c.JSON(http.StatusOK, gin.H{"groups": []ldap.LDAPGroup{}}) | ||
| return | ||
| } | ||
|
|
||
| groups, err := LDAPClient.SearchGroups(query) | ||
| if err != nil { | ||
| log.Printf("LDAP group search error for query %q: %v", query, err) | ||
| c.JSON(http.StatusServiceUnavailable, gin.H{"error": "LDAP search unavailable"}) | ||
| return | ||
| } | ||
|
|
||
| c.JSON(http.StatusOK, gin.H{"groups": groups}) | ||
| } | ||
|
|
||
| // GetLDAPUser handles GET /api/ldap/users/:uid | ||
| func GetLDAPUser(c *gin.Context) { | ||
| reqK8s, _ := GetK8sClientsForRequest(c) | ||
| if reqK8s == nil { | ||
| c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid or missing token"}) | ||
| c.Abort() | ||
| return | ||
| } | ||
|
|
||
| uid := c.Param("uid") | ||
| if uid == "" { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": "uid is required"}) | ||
| return | ||
| } | ||
|
|
||
| if LDAPClient == nil { | ||
| c.JSON(http.StatusNotFound, gin.H{"error": "LDAP not configured"}) | ||
| return | ||
| } | ||
|
|
||
| user, err := LDAPClient.GetUser(uid) | ||
| if err != nil { | ||
| log.Printf("LDAP user get error for uid %q: %v", uid, err) | ||
| c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to look up user"}) | ||
| return | ||
| } | ||
|
|
||
| if user == nil { | ||
| c.JSON(http.StatusNotFound, gin.H{"error": "User not found"}) | ||
| return | ||
| } | ||
|
|
||
| c.JSON(http.StatusOK, user) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧹 Nitpick | 🔵 Trivial
Promote
github.com/go-ldap/ldap/v3to a direct requirement if the new LDAP client imports it.If any backend file imports this module directly, keeping Line 39 as
// indirectjust creates churn the next timego mod tidyruns. If it is only transitive, ignore this.Verify whether the dependency is directly imported
Minimal fix if the import is direct
📝 Committable suggestion
🤖 Prompt for AI Agents