Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

chore: support patch active for Azure (#19073)

ecmadaob378f9ede829
diff --git a/backend/api/directory-sync/webhook.go b/backend/api/directory-sync/webhook.go
index 898d0b591a..712920b8a9 100644
--- a/backend/api/directory-sync/webhook.go
+++ b/backend/api/directory-sync/webhook.go
@@ -117,7 +117,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
var scimUser SCIMUser
if err := json.Unmarshal(body, &scimUser); err != nil {
- return c.String(http.StatusInternalServerError, fmt.Sprintf("failed to unmarshal body, error %v", err))
+ return c.String(http.StatusBadRequest, fmt.Sprintf("failed to unmarshal body, error %v", err))
}
// Normalize email to lowercase as Bytebase requires lowercase emails
@@ -221,7 +221,9 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
// Normalize email to lowercase for consistent lookup
normalizedEmail := normalizeEmail(expr.Value)
if !common.IsValidEmail(normalizedEmail) {
- slog.Warn("skipping filter with non-ASCII email", slog.String("key", expr.Key), slog.String("value", expr.Value))
+ // Azure sends UUID as userName for connectivity health checks, expecting empty response.
+ // This is expected behavior, so we just log at debug level and return empty.
+ slog.Debug("skipping filter with invalid email format", slog.String("key", expr.Key), slog.String("value", expr.Value))
continue
}
find.Email = &normalizedEmail
@@ -279,7 +281,8 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
// Body format is same as POST (full SCIMUser object).
g.PUT("/workspaces/:workspaceID/Users/:userID", func(c *echo.Context) error {
ctx := c.Request().Context()
- slog.Debug("put user", slog.String("source", detectSCIMSource(c)), slog.String("id", c.Param("userID")))
+ source := detectSCIMSource(c)
+ slog.Debug("put user", slog.String("source", source), slog.String("id", c.Param("userID")))
user, err := s.getUser(ctx, c)
if err != nil {
@@ -292,7 +295,6 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
})
}
- source := detectSCIMSource(c)
body, err := io.ReadAll(c.Request().Body)
if err != nil {
return c.String(http.StatusInternalServerError, fmt.Sprintf("failed to read body, error %v", err))
@@ -300,7 +302,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
var scimUser SCIMUser
if err := json.Unmarshal(body, &scimUser); err != nil {
- return c.String(http.StatusInternalServerError, fmt.Sprintf("failed to unmarshal body, error %v", err))
+ return c.String(http.StatusBadRequest, fmt.Sprintf("failed to unmarshal body, error %v", err))
}
updatedUser, err := s.updateUserFromSCIM(ctx, user, &scimUser, source)
@@ -313,7 +315,8 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
g.PATCH("/workspaces/:workspaceID/Users/:userID", func(c *echo.Context) error {
ctx := c.Request().Context()
- slog.Debug("patch user", slog.String("source", detectSCIMSource(c)), slog.String("id", c.Param("userID")))
+ source := detectSCIMSource(c)
+ slog.Debug("patch user", slog.String("source", source), slog.String("id", c.Param("userID")))
body, err := io.ReadAll(c.Request().Body)
if err != nil {
@@ -322,7 +325,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
var patch PatchRequest
if err := json.Unmarshal(body, &patch); err != nil {
- return c.String(http.StatusInternalServerError, fmt.Sprintf("failed to unmarshal body, error %v", err))
+ return c.String(http.StatusBadRequest, fmt.Sprintf("failed to unmarshal body, error %v", err))
}
uid, err := strconv.Atoi(c.Param("userID"))
@@ -338,7 +341,12 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
return c.String(http.StatusNotFound, "cannot found user")
}
- updateUser := &store.UpdateUserMessage{}
+ updateUser := &store.UpdateUserMessage{
+ Profile: user.Profile,
+ }
+ if user.Profile.Source != source {
+ updateUser.Profile.Source = source
+ }
for _, op := range patch.Operations {
// SCIM PATCH operations are case-insensitive per RFC 7644.
// Azure uses PascalCase (Add/Replace), Okta uses lowercase (add/replace).
@@ -373,9 +381,9 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
}
updateUser.Email = &normalizedEmail
case "active":
- active, ok := op.Value.(bool)
+ active, ok := parseBoolValue(op.Value)
if !ok {
- slog.Warn("unsupport value, expect bool", slog.String("operation", op.OP), slog.String("path", op.Path))
+ slog.Warn("unsupport value, expect bool or string", slog.String("operation", op.OP), slog.String("path", op.Path), slog.Any("value", op.Value))
continue
}
isDelete := !active
@@ -401,7 +409,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
updateUser.Email = &normalizedEmail
}
}
- if active, ok := valueMap["active"].(bool); ok {
+ if active, ok := parseBoolValue(valueMap["active"]); ok {
isDelete := !active
updateUser.Delete = &isDelete
}
@@ -422,7 +430,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
default:
// Silently ignore other valid SCIM attributes that Bytebase doesn't use
// (e.g., externalId, name.givenName, name.familyName, preferredLanguage, addresses, phoneNumbers, etc.)
- slog.Debug("ignoring unsupported user patch path", slog.String("operation", op.OP), slog.String("path", op.Path))
+ slog.Debug("ignoring unsupported user patch path", slog.String("operation", op.OP), slog.String("path", op.Path), slog.Any("value", op.Value))
}
}
@@ -445,7 +453,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
var scimGroup SCIMGroup
if err := json.Unmarshal(body, &scimGroup); err != nil {
- return c.String(http.StatusInternalServerError, fmt.Sprintf("failed to unmarshal body, error %v", err))
+ return c.String(http.StatusBadRequest, fmt.Sprintf("failed to unmarshal body, error %v", err))
}
slog.Debug("post group", slog.String("source", detectSCIMSource(c)), slog.String("id", scimGroup.ExternalID), slog.String("email", scimGroup.Email))
@@ -640,7 +648,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
var scimGroup SCIMGroup
if err := json.Unmarshal(body, &scimGroup); err != nil {
- return c.String(http.StatusInternalServerError, fmt.Sprintf("failed to unmarshal body, error %v", err))
+ return c.String(http.StatusBadRequest, fmt.Sprintf("failed to unmarshal body, error %v", err))
}
updatedGroup, err := s.updateGroupFromSCIM(ctx, group, &scimGroup, source)
@@ -680,11 +688,15 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
var patch PatchRequest
if err := json.Unmarshal(body, &patch); err != nil {
- return c.String(http.StatusInternalServerError, fmt.Sprintf("failed to unmarshal body, error %v", err))
+ return c.String(http.StatusBadRequest, fmt.Sprintf("failed to unmarshal body, error %v", err))
}
updateGroup := &store.UpdateGroupMessage{
- ID: group.ID,
+ ID: group.ID,
+ Payload: group.Payload,
+ }
+ if group.Payload.Source != source {
+ updateGroup.Payload.Source = source
}
for _, op := range patch.Operations {
// SCIM PATCH operations are case-insensitive per RFC 7644.
@@ -698,9 +710,6 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
continue
}
- updateGroup.Payload = group.Payload
- updateGroup.Payload.Source = source
-
// For replace operation, clear existing members first
if opLower == "replace" {
updateGroup.Payload.Members = []*storepb.GroupMember{}
@@ -1006,3 +1015,20 @@ func convertToSCIMGroup(group *store.GroupMessage) *SCIMGroup {
func normalizeEmail(email string) string {
return strings.ToLower(email)
}
+
+// parseBoolValue parses a value that can be either a boolean or a string representation of a boolean.
+// Azure AD sends "True"/"False" as strings, while Okta sends actual booleans.
+func parseBoolValue(value any) (bool, bool) {
+ if b, ok := value.(bool); ok {
+ return b, true
+ }
+ if s, ok := value.(string); ok {
+ switch strings.ToLower(s) {
+ case "true":
+ return true, true
+ case "false":
+ return false, true
+ }
+ }
+ return false, false
+}