Skip to content

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

feat: support generic OIDC workload identity providers (#21309)

ecmadaoae05f503b495
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index ce0217856b..a3987e8aaa 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -22298,7 +22298,7 @@ components:
properties:
providerType:
title: provider_type
- description: Platform type (currently only GITHUB is supported)
+ description: Provider configuration mode.
$ref: '#/components/schemas/bytebase.v1.WorkloadIdentityConfig.ProviderType'
issuerUrl:
type: string
@@ -22314,6 +22314,10 @@ components:
type: string
title: subject_pattern
description: Subject pattern to match (e.g., "repo:owner/repo:ref:refs/heads/main")
+ jwksUrl:
+ type: string
+ title: jwks_url
+ description: Optional JWKS endpoint. When empty, use OIDC discovery from issuer_url.
title: WorkloadIdentityConfig
additionalProperties: false
description: WorkloadIdentityConfig for API layer
@@ -22324,7 +22328,8 @@ components:
- PROVIDER_TYPE_UNSPECIFIED
- GITHUB
- GITLAB
- description: ProviderType identifies the CI/CD platform.
+ - OIDC
+ description: ProviderType identifies the workload identity configuration mode.
bytebase.v1.Workspace:
type: object
properties:
diff --git a/backend/api/v1/audit_redact_inventory_test.go b/backend/api/v1/audit_redact_inventory_test.go
index a7a398302b..6dbb8fb6ca 100644
--- a/backend/api/v1/audit_redact_inventory_test.go
+++ b/backend/api/v1/audit_redact_inventory_test.go
@@ -1052,6 +1052,7 @@ var auditRecordedFields = []string{
"bytebase.v1.WorkloadIdentity.title",
"bytebase.v1.WorkloadIdentityConfig.allowed_audiences",
"bytebase.v1.WorkloadIdentityConfig.issuer_url",
+ "bytebase.v1.WorkloadIdentityConfig.jwks_url",
"bytebase.v1.WorkloadIdentityConfig.subject_pattern",
"bytebase.v1.Workspace.logo",
"bytebase.v1.Workspace.name",
diff --git a/backend/api/v1/workload_identity_service.go b/backend/api/v1/workload_identity_service.go
index ef7c042d7f..854ee53edf 100644
--- a/backend/api/v1/workload_identity_service.go
+++ b/backend/api/v1/workload_identity_service.go
@@ -14,6 +14,7 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
+ "github.com/bytebase/bytebase/backend/plugin/idp/wif"
"github.com/bytebase/bytebase/backend/store"
)
@@ -90,6 +91,9 @@ func (s *WorkloadIdentityService) CreateWorkloadIdentity(ctx context.Context, re
// Convert API workload identity config to store workload identity config
var storeConfig *storepb.WorkloadIdentityConfig
if wi.WorkloadIdentityConfig != nil {
+ if err := validateWorkloadIdentityConfig(wi.WorkloadIdentityConfig); err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrap(err, "invalid workload_identity_config"))
+ }
storeConfig = convertToStoreWorkloadIdentityConfig(wi.WorkloadIdentityConfig)
}
@@ -232,6 +236,9 @@ func (s *WorkloadIdentityService) UpdateWorkloadIdentity(ctx context.Context, re
patch.Name = &request.Msg.WorkloadIdentity.Title
case "workload_identity_config":
if request.Msg.WorkloadIdentity.WorkloadIdentityConfig != nil {
+ if err := validateWorkloadIdentityConfig(request.Msg.WorkloadIdentity.WorkloadIdentityConfig); err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrap(err, "invalid workload_identity_config"))
+ }
patch.Config = convertToStoreWorkloadIdentityConfig(request.Msg.WorkloadIdentity.WorkloadIdentityConfig)
} else {
patch.Config = &storepb.WorkloadIdentityConfig{}
@@ -308,6 +315,47 @@ func (s *WorkloadIdentityService) UndeleteWorkloadIdentity(ctx context.Context,
return connect.NewResponse(convertToWorkloadIdentity(restoredWI)), nil
}
+func validateWorkloadIdentityConfig(config *v1pb.WorkloadIdentityConfig) error {
+ if config == nil {
+ return nil
+ }
+
+ switch config.ProviderType {
+ case v1pb.WorkloadIdentityConfig_GITHUB, v1pb.WorkloadIdentityConfig_GITLAB:
+ return nil
+ case v1pb.WorkloadIdentityConfig_OIDC:
+ issuerURL := strings.TrimSpace(config.IssuerUrl)
+ if issuerURL == "" {
+ return errors.New("issuer_url is required for OIDC")
+ }
+ if err := wif.ValidateIssuerURL(issuerURL); err != nil {
+ return err
+ }
+ jwksURL := strings.TrimSpace(config.JwksUrl)
+ if jwksURL != "" {
+ if err := wif.ValidateJWKSURL(jwksURL); err != nil {
+ return err
+ }
+ }
+ if len(config.AllowedAudiences) == 0 {
+ return errors.New("allowed_audiences is required for OIDC")
+ }
+ for _, audience := range config.AllowedAudiences {
+ if strings.TrimSpace(audience) == "" {
+ return errors.New("allowed_audiences must not contain an empty value")
+ }
+ }
+ if strings.TrimSpace(config.SubjectPattern) == "" {
+ return errors.New("subject_pattern is required for OIDC")
+ }
+ return nil
+ case v1pb.WorkloadIdentityConfig_PROVIDER_TYPE_UNSPECIFIED:
+ return errors.New("provider_type is required")
+ default:
+ return errors.New("provider_type is invalid")
+ }
+}
+
// convertToWorkloadIdentity converts a store.WorkloadIdentityMessage to a v1pb.WorkloadIdentity.
func convertToWorkloadIdentity(wi *store.WorkloadIdentityMessage) *v1pb.WorkloadIdentity {
result := &v1pb.WorkloadIdentity{
@@ -330,11 +378,27 @@ func convertToStoreWorkloadIdentityConfig(config *v1pb.WorkloadIdentityConfig) *
if config == nil {
return nil
}
+
+ issuerURL := config.IssuerUrl
+ jwksURL := config.JwksUrl
+ allowedAudiences := config.AllowedAudiences
+ subjectPattern := config.SubjectPattern
+ if config.ProviderType == v1pb.WorkloadIdentityConfig_OIDC {
+ issuerURL = strings.TrimSpace(issuerURL)
+ jwksURL = strings.TrimSpace(jwksURL)
+ allowedAudiences = make([]string, len(config.AllowedAudiences))
+ for i, audience := range config.AllowedAudiences {
+ allowedAudiences[i] = strings.TrimSpace(audience)
+ }
+ subjectPattern = strings.TrimSpace(subjectPattern)
+ }
+
return &storepb.WorkloadIdentityConfig{
ProviderType: storepb.WorkloadIdentityConfig_ProviderType(config.ProviderType),
- IssuerUrl: config.IssuerUrl,
- AllowedAudiences: config.AllowedAudiences,
- SubjectPattern: config.SubjectPattern,
+ IssuerUrl: issuerURL,
+ AllowedAudiences: allowedAudiences,
+ SubjectPattern: subjectPattern,
+ JwksUrl: jwksURL,
}
}
@@ -348,5 +412,6 @@ func convertToAPIWorkloadIdentityConfig(config *storepb.WorkloadIdentityConfig)
IssuerUrl: config.IssuerUrl,
AllowedAudiences: config.AllowedAudiences,
SubjectPattern: config.SubjectPattern,
+ JwksUrl: config.JwksUrl,
}
}
diff --git a/backend/api/v1/workload_identity_service_test.go b/backend/api/v1/workload_identity_service_test.go
new file mode 100644
index 0000000000..31fff0c26c
--- /dev/null
+++ b/backend/api/v1/workload_identity_service_test.go
@@ -0,0 +1,153 @@
+package v1
+
+import (
+ "testing"
+
+ "github.com/stretchr/testify/require"
+
+ v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
+)
+
+func TestValidateWorkloadIdentityConfig(t *testing.T) {
+ tests := []struct {
+ name string
+ config *v1pb.WorkloadIdentityConfig
+ wantErr string
+ }{
+ {
+ name: "nil config",
+ },
+ {
+ name: "github compatibility",
+ config: &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_GITHUB,
+ },
+ },
+ {
+ name: "gitlab compatibility",
+ config: &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_GITLAB,
+ },
+ },
+ {
+ name: "oidc valid",
+ config: &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_OIDC,
+ IssuerUrl: "https://nomad.example.com",
+ JwksUrl: "https://keys.example.com/jwks.json",
+ AllowedAudiences: []string{"bytebase"},
+ SubjectPattern: "nomad_job:atlantis:*",
+ },
+ },
+ {
+ name: "oidc discovery valid",
+ config: &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_OIDC,
+ IssuerUrl: "https://nomad.example.com",
+ AllowedAudiences: []string{"bytebase"},
+ SubjectPattern: "nomad_job:atlantis:*",
+ },
+ },
+ {
+ name: "oidc invalid issuer URL",
+ config: &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_OIDC,
+ IssuerUrl: "not-a-url",
+ AllowedAudiences: []string{"bytebase"},
+ SubjectPattern: "nomad_job:atlantis:*",
+ },
+ wantErr: "issuer URL must use HTTPS",
+ },
+ {
+ name: "oidc invalid JWKS URL",
+ config: &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_OIDC,
+ IssuerUrl: "https://nomad.example.com",
+ JwksUrl: "http://keys.example.com/jwks.json",
+ AllowedAudiences: []string{"bytebase"},
+ SubjectPattern: "nomad_job:atlantis:*",
+ },
+ wantErr: "JWKS URL must use HTTPS",
+ },
+ {
+ name: "oidc missing issuer",
+ config: &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_OIDC,
+ AllowedAudiences: []string{"bytebase"},
+ SubjectPattern: "nomad_job:atlantis:*",
+ },
+ wantErr: "issuer_url is required",
+ },
+ {
+ name: "oidc missing audience",
+ config: &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_OIDC,
+ IssuerUrl: "https://nomad.example.com",
+ SubjectPattern: "nomad_job:atlantis:*",
+ },
+ wantErr: "allowed_audiences is required",
+ },
+ {
+ name: "oidc empty audience",
+ config: &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_OIDC,
+ IssuerUrl: "https://nomad.example.com",
+ AllowedAudiences: []string{""},
+ SubjectPattern: "nomad_job:atlantis:*",
+ },
+ wantErr: "allowed_audiences must not contain an empty value",
+ },
+ {
+ name: "oidc missing subject",
+ config: &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_OIDC,
+ IssuerUrl: "https://nomad.example.com",
+ AllowedAudiences: []string{"bytebase"},
+ },
+ wantErr: "subject_pattern is required",
+ },
+ {
+ name: "provider unspecified",
+ config: &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_PROVIDER_TYPE_UNSPECIFIED,
+ },
+ wantErr: "provider_type is required",
+ },
+ {
+ name: "provider unknown",
+ config: &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_ProviderType(99),
+ },
+ wantErr: "provider_type is invalid",
+ },
+ }
+
+ for _, test := range tests {
+ t.Run(test.name, func(t *testing.T) {
+ err := validateWorkloadIdentityConfig(test.config)
+ if test.wantErr == "" {
+ require.NoError(t, err)
+ return
+ }
+ require.ErrorContains(t, err, test.wantErr)
+ })
+ }
+}
+
+func TestConvertToStoreWorkloadIdentityConfigNormalizesOIDCValues(t *testing.T) {
+ config := &v1pb.WorkloadIdentityConfig{
+ ProviderType: v1pb.WorkloadIdentityConfig_OIDC,
+ IssuerUrl: " https://nomad.example.com ",
+ JwksUrl: " https://keys.example.com/jwks.json ",
+ AllowedAudiences: []string{" bytebase ", " terraform "},
+ SubjectPattern: " nomad_job:atlantis:* ",
+ }
+ require.NoError(t, validateWorkloadIdentityConfig(config))
+
+ converted := convertToStoreWorkloadIdentityConfig(config)
+
+ require.Equal(t, "https://nomad.example.com", converted.IssuerUrl)
+ require.Equal(t, "https://keys.example.com/jwks.json", converted.JwksUrl)
+ require.Equal(t, []string{"bytebase", "terraform"}, converted.AllowedAudiences)
+ require.Equal(t, "nomad_job:atlantis:*", converted.SubjectPattern)
+}
diff --git a/backend/generated-go/store/user.pb.go b/backend/generated-go/store/user.pb.go
index 73bcac1113..c84f023da7 100644
--- a/backend/generated-go/store/user.pb.go
+++ b/backend/generated-go/store/user.pb.go
@@ -78,13 +78,14 @@ func (PrincipalType) EnumDescriptor() ([]byte, []int) {
return file_store_user_proto_rawDescGZIP(), []int{0}
}
-// ProviderType identifies the CI/CD platform.
+// ProviderType identifies the workload identity configuration mode.
type WorkloadIdentityConfig_ProviderType int32
const (
WorkloadIdentityConfig_PROVIDER_TYPE_UNSPECIFIED WorkloadIdentityConfig_ProviderType = 0
WorkloadIdentityConfig_GITHUB WorkloadIdentityConfig_ProviderType = 1
WorkloadIdentityConfig_GITLAB WorkloadIdentityConfig_ProviderType = 2
+ WorkloadIdentityConfig_OIDC WorkloadIdentityConfig_ProviderType = 3
)
// Enum value maps for WorkloadIdentityConfig_ProviderType.
@@ -93,11 +94,13 @@ var (
0: "PROVIDER_TYPE_UNSPECIFIED",
1: "GITHUB",
2: "GITLAB",
+ 3: "OIDC",
}
WorkloadIdentityConfig_ProviderType_value = map[string]int32{
"PROVIDER_TYPE_UNSPECIFIED": 0,
"GITHUB": 1,
"GITLAB": 2,
+ "OIDC": 3,
}
)
@@ -284,7 +287,7 @@ func (x *UserProfile) GetLastLoginWorkspace() string {
// WorkloadIdentityConfig stores OIDC configuration for workload identity.
type WorkloadIdentityConfig struct {
state protoimpl.MessageState `protogen:"open.v1"`
- // Provider type (currently only GITHUB is supported)
+ // Provider configuration mode.
ProviderType WorkloadIdentityConfig_ProviderType `protobuf:"varint,1,opt,name=provider_type,json=providerType,proto3,enum=bytebase.store.WorkloadIdentityConfig_ProviderType" json:"provider_type,omitempty"`
// OIDC issuer URL
IssuerUrl string `protobuf:"bytes,2,opt,name=issuer_url,json=issuerUrl,proto3" json:"issuer_url,omitempty"`
@@ -292,8 +295,10 @@ type WorkloadIdentityConfig struct {
AllowedAudiences []string `protobuf:"bytes,3,rep,name=allowed_audiences,json=allowedAudiences,proto3" json:"allowed_audiences,omitempty"`
// Subject pattern to match against token subject claim
SubjectPattern string `protobuf:"bytes,4,opt,name=subject_pattern,json=subjectPattern,proto3" json:"subject_pattern,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // Optional JWKS endpoint. When empty, use OIDC discovery from issuer_url.
+ JwksUrl string `protobuf:"bytes,5,opt,name=jwks_url,json=jwksUrl,proto3" json:"jwks_url,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *WorkloadIdentityConfig) Reset() {
@@ -354,6 +359,13 @@ func (x *WorkloadIdentityConfig) GetSubjectPattern() string {
return ""
}
+func (x *WorkloadIdentityConfig) GetJwksUrl() string {
+ if x != nil {
+ return x.JwksUrl
+ }
+ return ""
+}
+
var File_store_user_proto protoreflect.FileDescriptor
const file_store_user_proto_rawDesc = "" +
@@ -370,19 +382,21 @@ const file_store_user_proto_rawDesc = "" +
"\x0flast_login_time\x18\x01 \x01(\v2\x1a.google.protobuf.TimestampR\rlastLoginTime\x12U\n" +
"\x19last_change_password_time\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\x16lastChangePasswordTime\x12\x16\n" +
"\x06source\x18\x03 \x01(\tR\x06source\x120\n" +
- "\x14last_login_workspace\x18\x05 \x01(\tR\x12lastLoginWorkspaceJ\x04\b\x04\x10\x05\"\xae\x02\n" +
+ "\x14last_login_workspace\x18\x05 \x01(\tR\x12lastLoginWorkspaceJ\x04\b\x04\x10\x05\"\xd3\x02\n" +
"\x16WorkloadIdentityConfig\x12X\n" +
"\rprovider_type\x18\x01 \x01(\x0e23.bytebase.store.WorkloadIdentityConfig.ProviderTypeR\fproviderType\x12\x1d\n" +
"\n" +
"issuer_url\x18\x02 \x01(\tR\tissuerUrl\x12+\n" +
"\x11allowed_audiences\x18\x03 \x03(\tR\x10allowedAudiences\x12'\n" +
- "\x0fsubject_pattern\x18\x04 \x01(\tR\x0esubjectPattern\"E\n" +
+ "\x0fsubject_pattern\x18\x04 \x01(\tR\x0esubjectPattern\x12\x19\n" +
+ "\bjwks_url\x18\x05 \x01(\tR\ajwksUrl\"O\n" +
"\fProviderType\x12\x1d\n" +
"\x19PROVIDER_TYPE_UNSPECIFIED\x10\x00\x12\n" +
"\n" +
"\x06GITHUB\x10\x01\x12\n" +
"\n" +
- "\x06GITLAB\x10\x02*i\n" +
+ "\x06GITLAB\x10\x02\x12\b\n" +
+ "\x04OIDC\x10\x03*i\n" +
"\rPrincipalType\x12\x1e\n" +
"\x1aPRINCIPAL_TYPE_UNSPECIFIED\x10\x00\x12\f\n" +
"\bEND_USER\x10\x01\x12\x15\n" +
diff --git a/backend/generated-go/store/user_equal.pb.go b/backend/generated-go/store/user_equal.pb.go
index c82b75310a..e3a1f3685d 100644
--- a/backend/generated-go/store/user_equal.pb.go
+++ b/backend/generated-go/store/user_equal.pb.go
@@ -84,5 +84,8 @@ func (x *WorkloadIdentityConfig) Equal(y *WorkloadIdentityConfig) bool {
if x.SubjectPattern != y.SubjectPattern {
return false
}
+ if x.JwksUrl != y.JwksUrl {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/workload_identity_service.pb.go b/backend/generated-go/v1/workload_identity_service.pb.go
index 2a32a30c65..51962343a0 100644
--- a/backend/generated-go/v1/workload_identity_service.pb.go
+++ b/backend/generated-go/v1/workload_identity_service.pb.go
@@ -26,13 +26,14 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// ProviderType identifies the CI/CD platform.
+// ProviderType identifies the workload identity configuration mode.
type WorkloadIdentityConfig_ProviderType int32
const (
WorkloadIdentityConfig_PROVIDER_TYPE_UNSPECIFIED WorkloadIdentityConfig_ProviderType = 0
WorkloadIdentityConfig_GITHUB WorkloadIdentityConfig_ProviderType = 1
WorkloadIdentityConfig_GITLAB WorkloadIdentityConfig_ProviderType = 2
+ WorkloadIdentityConfig_OIDC WorkloadIdentityConfig_ProviderType = 3
)
// Enum value maps for WorkloadIdentityConfig_ProviderType.
@@ -41,11 +42,13 @@ var (
0: "PROVIDER_TYPE_UNSPECIFIED",
1: "GITHUB",
2: "GITLAB",
+ 3: "OIDC",
}
WorkloadIdentityConfig_ProviderType_value = map[string]int32{
"PROVIDER_TYPE_UNSPECIFIED": 0,
"GITHUB": 1,
"GITLAB": 2,
+ "OIDC": 3,
}
)
@@ -173,7 +176,7 @@ func (x *WorkloadIdentity) GetWorkloadIdentityConfig() *WorkloadIdentityConfig {
// WorkloadIdentityConfig for API layer
type WorkloadIdentityConfig struct {
state protoimpl.MessageState `protogen:"open.v1"`
- // Platform type (currently only GITHUB is supported)
+ // Provider configuration mode.
ProviderType WorkloadIdentityConfig_ProviderType `protobuf:"varint,1,opt,name=provider_type,json=providerType,proto3,enum=bytebase.v1.WorkloadIdentityConfig_ProviderType" json:"provider_type,omitempty"`
// OIDC Issuer URL (auto-filled based on provider_type, can be overridden)
IssuerUrl string `protobuf:"bytes,2,opt,name=issuer_url,json=issuerUrl,proto3" json:"issuer_url,omitempty"`
@@ -181,8 +184,10 @@ type WorkloadIdentityConfig struct {
AllowedAudiences []string `protobuf:"bytes,3,rep,name=allowed_audiences,json=allowedAudiences,proto3" json:"allowed_audiences,omitempty"`
// Subject pattern to match (e.g., "repo:owner/repo:ref:refs/heads/main")
SubjectPattern string `protobuf:"bytes,4,opt,name=subject_pattern,json=subjectPattern,proto3" json:"subject_pattern,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // Optional JWKS endpoint. When empty, use OIDC discovery from issuer_url.
+ JwksUrl string `protobuf:"bytes,5,opt,name=jwks_url,json=jwksUrl,proto3" json:"jwks_url,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *WorkloadIdentityConfig) Reset() {
@@ -243,6 +248,13 @@ func (x *WorkloadIdentityConfig) GetSubjectPattern() string {
return ""
}
+func (x *WorkloadIdentityConfig) GetJwksUrl() string {
+ if x != nil {
+ return x.JwksUrl
+ }
+ return ""
+}
+
// Request message for creating a workload identity.
type CreateWorkloadIdentityRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
@@ -682,19 +694,21 @@ const file_v1_workload_identity_service_proto_rawDesc = "" +
"\vcreate_time\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\n" +
"createTime\x12]\n" +
"\x18workload_identity_config\x18\x06 \x01(\v2#.bytebase.v1.WorkloadIdentityConfigR\x16workloadIdentityConfig:>\xeaA;\n" +
- "\x1dbytebase.com/WorkloadIdentity\x12\x1aworkloadIdentities/{email}\"\xab\x02\n" +
+ "\x1dbytebase.com/WorkloadIdentity\x12\x1aworkloadIdentities/{email}\"\xd0\x02\n" +
"\x16WorkloadIdentityConfig\x12U\n" +
"\rprovider_type\x18\x01 \x01(\x0e20.bytebase.v1.WorkloadIdentityConfig.ProviderTypeR\fproviderType\x12\x1d\n" +
"\n" +
"issuer_url\x18\x02 \x01(\tR\tissuerUrl\x12+\n" +
"\x11allowed_audiences\x18\x03 \x03(\tR\x10allowedAudiences\x12'\n" +
- "\x0fsubject_pattern\x18\x04 \x01(\tR\x0esubjectPattern\"E\n" +
+ "\x0fsubject_pattern\x18\x04 \x01(\tR\x0esubjectPattern\x12\x19\n" +
+ "\bjwks_url\x18\x05 \x01(\tR\ajwksUrl\"O\n" +
"\fProviderType\x12\x1d\n" +
"\x19PROVIDER_TYPE_UNSPECIFIED\x10\x00\x12\n" +
"\n" +
"\x06GITHUB\x10\x01\x12\n" +
"\n" +
- "\x06GITLAB\x10\x02\"\xda\x01\n" +
+ "\x06GITLAB\x10\x02\x12\b\n" +
+ "\x04OIDC\x10\x03\"\xda\x01\n" +
"\x1dCreateWorkloadIdentityRequest\x121\n" +
"\x06parent\x18\x01 \x01(\tB\x19\xfaA\x16\n" +
"\x14bytebase.com/ProjectR\x06parent\x125\n" +
diff --git a/backend/generated-go/v1/workload_identity_service_equal.pb.go b/backend/generated-go/v1/workload_identity_service_equal.pb.go
index 9fe75b2b1a..8baa9296df 100644
--- a/backend/generated-go/v1/workload_identity_service_equal.pb.go
+++ b/backend/generated-go/v1/workload_identity_service_equal.pb.go
@@ -60,6 +60,9 @@ func (x *WorkloadIdentityConfig) Equal(y *WorkloadIdentityConfig) bool {
if x.SubjectPattern != y.SubjectPattern {
return false
}
+ if x.JwksUrl != y.JwksUrl {
+ return false
+ }
return true
}
diff --git a/backend/plugin/idp/wif/jwks.go b/backend/plugin/idp/wif/jwks.go
index 0613e8365e..80a10297ae 100644
--- a/backend/plugin/idp/wif/jwks.go
+++ b/backend/plugin/idp/wif/jwks.go
@@ -34,64 +34,106 @@ type oidcConfig struct {
JwksURI string `json:"jwks_uri"`
}
-// FetchJWKS fetches the JWKS from an OIDC issuer with caching.
-func FetchJWKS(ctx context.Context, issuerURL string) (*jose.JSONWebKeySet, error) {
+// FetchJWKS fetches the JWKS from an OIDC issuer or a direct JWKS URL with caching.
+func FetchJWKS(ctx context.Context, issuerURL, jwksURL string) (*jose.JSONWebKeySet, error) {
// Validate issuer URL format
- if err := validateIssuerURL(issuerURL); err != nil {
+ if err := ValidateIssuerURL(issuerURL); err != nil {
return nil, err
}
- // Check cache
- jwksCacheLock.RLock()
- if cached, ok := jwksCache[issuerURL]; ok {
- if time.Since(cached.fetchedAt) < cacheDuration {
- jwksCacheLock.RUnlock()
- return cached.jwks, nil
- }
+ discoveryMode := jwksURL == ""
+ cacheKey := "jwks:" + jwksURL
+ if discoveryMode {
+ cacheKey = "issuer:" + issuerURL
+ }
+ if cached := getCachedJWKS(cacheKey); cached != nil {
+ return cached.jwks, nil
}
- jwksCacheLock.RUnlock()
- // Fetch OIDC configuration
- configURL := fmt.Sprintf("%s/.well-known/openid-configuration", issuerURL)
- config, err := fetchOIDCConfig(ctx, configURL)
- if err != nil {
+ effectiveJWKSURL := jwksURL
+ if discoveryMode {
+ configURL := fmt.Sprintf("%s/.well-known/openid-configuration", issuerURL)
+ config, err := fetchOIDCConfig(ctx, configURL)
+ if err != nil {
+ return nil, err
+ }
+ effectiveJWKSURL = config.JwksURI
+ }
+ if err := ValidateJWKSURL(effectiveJWKSURL); err != nil {
return nil, err
}
+ if discoveryMode {
+ if cached := getCachedJWKS("jwks:" + effectiveJWKSURL); cached != nil {
+ setCachedJWKS(cached, "issuer:"+issuerURL)
+ return cached.jwks, nil
+ }
+ }
+
// Fetch JWKS
- jwks, err := fetchJWKSFromURL(ctx, config.JwksURI)
+ jwks, err := fetchJWKSFromURL(ctx, effectiveJWKSURL)
if err != nil {
return nil, err
}
- // Update cache
- jwksCacheLock.Lock()
- jwksCache[issuerURL] = &cachedJWKS{
+ cached := &cachedJWKS{
jwks: jwks,
fetchedAt: time.Now(),
}
- jwksCacheLock.Unlock()
+ setCachedJWKS(cached, "jwks:"+effectiveJWKSURL)
+ if discoveryMode {
+ setCachedJWKS(cached, "issuer:"+issuerURL)
+ }
return jwks, nil
}
-// validateIssuerURL validates that the issuer URL is a valid HTTPS URL.
-func validateIssuerURL(issuerURL string) error {
- parsed, err := url.Parse(issuerURL)
+func getCachedJWKS(key string) *cachedJWKS {
+ jwksCacheLock.RLock()
+ defer jwksCacheLock.RUnlock()
+
+ cached, ok := jwksCache[key]
+ if !ok || time.Since(cached.fetchedAt) >= cacheDuration {
+ return nil
+ }
+ return cached
+}
+
+func setCachedJWKS(cached *cachedJWKS, keys ...string) {
+ jwksCacheLock.Lock()
+ defer jwksCacheLock.Unlock()
+
+ for _, key := range keys {
+ jwksCache[key] = cached
+ }
+}
+
+// ValidateIssuerURL validates that the issuer URL is a valid HTTPS URL.
+func ValidateIssuerURL(issuerURL string) error {
+ return validateRemoteURL(issuerURL, "issuer URL")
+}
+
+// ValidateJWKSURL validates that the JWKS URL is a valid HTTPS URL.
+func ValidateJWKSURL(jwksURL string) error {
+ return validateRemoteURL(jwksURL, "JWKS URL")
+}
+
+func validateRemoteURL(rawURL, label string) error {
+ parsed, err := url.Parse(rawURL)
if err != nil {
- return errors.Wrap(err, "invalid issuer URL")
+ return errors.Wrapf(err, "invalid %s", label)
}
if parsed.Scheme != "https" {
- return errors.Errorf("issuer URL must use HTTPS: %s", issuerURL)
+ return errors.Errorf("%s must use HTTPS: %s", label, rawURL)
}
if parsed.Host == "" {
- return errors.Errorf("issuer URL must have a host: %s", issuerURL)
+ return errors.Errorf("%s must have a host: %s", label, rawURL)
}
// Prevent localhost and private IPs in production (basic SSRF prevention)
host := strings.ToLower(parsed.Hostname())
if host == "localhost" || strings.HasPrefix(host, "127.") || strings.HasPrefix(host, "10.") ||
strings.HasPrefix(host, "192.168.") || strings.HasPrefix(host, "172.") {
- return errors.Errorf("issuer URL cannot be a private address: %s", issuerURL)
+ return errors.Errorf("%s cannot be a private address: %s", label, rawURL)
}
return nil
}
diff --git a/backend/plugin/idp/wif/jwks_test.go b/backend/plugin/idp/wif/jwks_test.go
new file mode 100644
index 0000000000..01a0823a3e
--- /dev/null
+++ b/backend/plugin/idp/wif/jwks_test.go
@@ -0,0 +1,203 @@
+package wif
+
+import (
+ "context"
+ "io"
+ "net/http"
+ "strings"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+)
+
+type roundTripFunc func(*http.Request) (*http.Response, error)
+
+func (f roundTripFunc) RoundTrip(request *http.Request) (*http.Response, error) {
+ return f(request)
+}
+
+func TestFetchJWKSUsesDiscoveryWhenDirectURLIsEmpty(t *testing.T) {
+ var requestedURLs []string
+ setJWKSHTTPClientForTest(t, roundTripFunc(func(request *http.Request) (*http.Response, error) {
+ requestedURLs = append(requestedURLs, request.URL.String())
+ switch request.URL.String() {
+ case "https://issuer.example.com/.well-known/openid-configuration":
+ return jsonHTTPResponse(http.StatusOK, `{"jwks_uri":"https://keys.example.com/discovered.json"}`), nil
+ case "https://keys.example.com/discovered.json":
+ return jsonHTTPResponse(http.StatusOK, `{"keys":[]}`), nil
+ default:
+ return jsonHTTPResponse(http.StatusNotFound, `{}`), nil
+ }
+ }))
+
+ _, err := FetchJWKS(context.Background(), "https://issuer.example.com", "")
+ require.NoError(t, err)
+ require.Equal(t, []string{
+ "https://issuer.example.com/.well-known/openid-configuration",
+ "https://keys.example.com/discovered.json",
+ }, requestedURLs)
+}
+
+func TestFetchJWKSUsesDirectURLWithoutDiscovery(t *testing.T) {
+ var requestedURLs []string
+ setJWKSHTTPClientForTest(t, roundTripFunc(func(request *http.Request) (*http.Response, error) {
+ requestedURLs = append(requestedURLs, request.URL.String())
+ return jsonHTTPResponse(http.StatusOK, `{"keys":[]}`), nil
+ }))
+
+ _, err := FetchJWKS(
+ context.Background(),
+ "https://issuer.example.com",
+ "https://keys.example.com/direct.json",
+ )
+ require.NoError(t, err)
+ require.Equal(t, []string{"https://keys.example.com/direct.json"}, requestedURLs)
+}
+
+func TestFetchJWKSUsesDiscoveredURLAsCacheKey(t *testing.T) {
+ requestCount := map[string]int{}
+ setJWKSHTTPClientForTest(t, roundTripFunc(func(request *http.Request) (*http.Response, error) {
+ requestCount[request.URL.String()]++
+ if strings.HasSuffix(request.URL.String(), "/.well-known/openid-configuration") {
+ return jsonHTTPResponse(http.StatusOK, `{"jwks_uri":"https://keys.example.com/shared.json"}`), nil
+ }
+ return jsonHTTPResponse(http.StatusOK, `{"keys":[]}`), nil
+ }))
+
+ for _, issuerURL := range []string{
+ "https://first-issuer.example.com",
+ "https://second-issuer.example.com",
+ } {
+ _, err := FetchJWKS(context.Background(), issuerURL, "")
+ require.NoError(t, err)
+ }
+
+ require.Equal(t, 1, requestCount["https://keys.example.com/shared.json"])
+}
+
+func TestFetchJWKSReusesCachedDiscoveryResult(t *testing.T) {
+ requestCount := map[string]int{}
+ setJWKSHTTPClientForTest(t, roundTripFunc(func(request *http.Request) (*http.Response, error) {
+ requestCount[request.URL.String()]++
+ switch request.URL.String() {
+ case "https://issuer.example.com/.well-known/openid-configuration":
+ return jsonHTTPResponse(http.StatusOK, `{"jwks_uri":"https://keys.example.com/discovered.json"}`), nil
+ case "https://keys.example.com/discovered.json":
+ return jsonHTTPResponse(http.StatusOK, `{"keys":[]}`), nil
+ default:
+ return jsonHTTPResponse(http.StatusNotFound, `{}`), nil
+ }
+ }))
+
+ for range 2 {
+ _, err := FetchJWKS(context.Background(), "https://issuer.example.com", "")
+ require.NoError(t, err)
+ }
+
+ require.Equal(t, map[string]int{
+ "https://issuer.example.com/.well-known/openid-configuration": 1,
+ "https://keys.example.com/discovered.json": 1,
+ }, requestCount)
+}
+
+func TestFetchJWKSSeparatesDirectURLCacheEntries(t *testing.T) {
+ requestCount := map[string]int{}
+ setJWKSHTTPClientForTest(t, roundTripFunc(func(request *http.Request) (*http.Response, error) {
+ requestCount[request.URL.String()]++
+ return jsonHTTPResponse(http.StatusOK, `{"keys":[]}`), nil
+ }))
+
+ for _, keyURL := range []string{
+ "https://keys.example.com/first.json",
+ "https://keys.example.com/second.json",
+ "https://keys.example.com/first.json",
+ } {
+ _, err := FetchJWKS(context.Background(), "https://issuer.example.com", keyURL)
+ require.NoError(t, err)
+ }
+
+ require.Equal(t, map[string]int{
+ "https://keys.example.com/first.json": 1,
+ "https://keys.example.com/second.json": 1,
+ }, requestCount)
+}
+
+func TestFetchJWKSKeepsIssuerAndDirectURLCacheKeysSeparate(t *testing.T) {
+ requestCount := map[string]int{}
+ setJWKSHTTPClientForTest(t, roundTripFunc(func(request *http.Request) (*http.Response, error) {
+ requestCount[request.URL.String()]++
+ switch request.URL.String() {
+ case "https://issuer.example.com/.well-known/openid-configuration":
+ return jsonHTTPResponse(http.StatusOK, `{"jwks_uri":"https://keys.example.com/discovered.json"}`), nil
+ default:
+ return jsonHTTPResponse(http.StatusOK, `{"keys":[]}`), nil
+ }
+ }))
+
+ _, err := FetchJWKS(context.Background(), "https://issuer.example.com", "")
+ require.NoError(t, err)
+ _, err = FetchJWKS(
+ context.Background(),
+ "https://other-issuer.example.com",
+ "https://issuer.example.com",
+ )
+ require.NoError(t, err)
+
+ require.Equal(t, 1, requestCount["https://issuer.example.com"])
+}
+
+func TestFetchJWKSRejectsInvalidDirectURL(t *testing.T) {
+ setJWKSHTTPClientForTest(t, roundTripFunc(func(_ *http.Request) (*http.Response, error) {
+ t.Fatal("HTTP client must not be called for an invalid URL")
+ return nil, nil
+ }))
+
+ for _, keyURL := range []string{
+ "http://keys.example.com/jwks.json",
+ "https://localhost/jwks.json",
+ "https://127.0.0.1/jwks.json",
+ "https://10.0.0.1/jwks.json",
+ "https://192.168.1.1/jwks.json",
+ } {
+ t.Run(keyURL, func(t *testing.T) {
+ _, err := FetchJWKS(context.Background(), "https://issuer.example.com", keyURL)
+ require.Error(t, err)
+ })
+ }
+}
+
+func TestFetchJWKSErrorDoesNotIncludeResponseBody(t *testing.T) {
+ const secretBody = "sensitive-upstream-response"
+ setJWKSHTTPClientForTest(t, roundTripFunc(func(_ *http.Request) (*http.Response, error) {
+ return jsonHTTPResponse(http.StatusInternalServerError, secretBody), nil
+ }))
+
+ _, err := FetchJWKS(
+ context.Background(),
+ "https://issuer.example.com",
+ "https://keys.example.com/direct.json",
+ )
+ require.Error(t, err)
+ require.NotContains(t, err.Error(), secretBody)
+}
+
+func setJWKSHTTPClientForTest(t *testing.T, transport http.RoundTripper) {
+ t.Helper()
+
+ previousClient := httpClient
+ previousCache := jwksCache
+ httpClient = &http.Client{Transport: transport}
+ jwksCache = make(map[string]*cachedJWKS)
+ t.Cleanup(func() {
+ httpClient = previousClient
+ jwksCache = previousCache
+ })
+}
+
+func jsonHTTPResponse(statusCode int, body string) *http.Response {
+ return &http.Response{
+ StatusCode: statusCode,
+ Header: make(http.Header),
+ Body: io.NopCloser(strings.NewReader(body)),
+ }
+}
diff --git a/backend/plugin/idp/wif/wif.go b/backend/plugin/idp/wif/wif.go
index bb844e59b4..d81ee04159 100644
--- a/backend/plugin/idp/wif/wif.go
+++ b/backend/plugin/idp/wif/wif.go
@@ -30,7 +30,7 @@ func ValidateToken(ctx context.Context, tokenString string, config *storepb.Work
}
// Get JWKS from issuer
- jwks, err := FetchJWKS(ctx, config.IssuerUrl)
+ jwks, err := FetchJWKS(ctx, config.IssuerUrl, config.JwksUrl)
if err != nil {
return nil, errors.Wrap(err, "failed to fetch JWKS")
}
diff --git a/backend/plugin/idp/wif/wif_test.go b/backend/plugin/idp/wif/wif_test.go
index 78c4d13593..1c91ede61e 100644
--- a/backend/plugin/idp/wif/wif_test.go
+++ b/backend/plugin/idp/wif/wif_test.go
@@ -185,7 +185,7 @@ func TestValidateIssuerURL(t *testing.T) {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
- err := validateIssuerURL(tc.issuerURL)
+ err := ValidateIssuerURL(tc.issuerURL)
if tc.wantErr {
require.Error(t, err)
} else {
diff --git a/frontend/scripts/ui-guideline-legacy-debt.json b/frontend/scripts/ui-guideline-legacy-debt.json
index 6541a13cca..b6ef1ab749 100644
--- a/frontend/scripts/ui-guideline-legacy-debt.json
+++ b/frontend/scripts/ui-guideline-legacy-debt.json
@@ -210,12 +210,6 @@
"token": "button",
"count": 1
},
- {
- "path": "src/components/CreateWorkloadIdentitySheet.tsx",
- "rule": "no-native-control",
- "token": "select",
- "count": 2
- },
{
"path": "src/components/CustomApproval/RulesSection.tsx",
"rule": "no-native-control",
diff --git a/frontend/src/components/CreateWorkloadIdentitySheet.test.tsx b/frontend/src/components/CreateWorkloadIdentitySheet.test.tsx
index abe4c93efd..c773de009c 100644
--- a/frontend/src/components/CreateWorkloadIdentitySheet.test.tsx
+++ b/frontend/src/components/CreateWorkloadIdentitySheet.test.tsx
@@ -1,6 +1,12 @@
+import { create } from "@bufbuild/protobuf";
import { act } from "react";
import { createRoot } from "react-dom/client";
import { afterEach, describe, expect, test, vi } from "vitest";
+import {
+ WorkloadIdentityConfig_ProviderType,
+ WorkloadIdentityConfigSchema,
+ WorkloadIdentitySchema,
+} from "@/types/proto-es/v1/workload_identity_service_pb";
import { CreateWorkloadIdentitySheet } from "./CreateWorkloadIdentitySheet";
(
@@ -76,7 +82,17 @@ vi.mock("@/utils", () => ({
provider === 1 ? "GitLab" : "GitHub Actions",
hasProjectPermissionV2: () => true,
hasWorkspacePermissionV2: () => true,
- parseWorkloadIdentitySubjectPattern: () => undefined,
+ parseWorkloadIdentitySubjectPattern: (workloadIdentity: {
+ workloadIdentityConfig?: { subjectPattern: string };
+ }) => {
+ if (
+ workloadIdentity.workloadIdentityConfig?.subjectPattern ===
+ "project_path:group/project:environment:production"
+ ) {
+ return { owner: "group", repo: "project", branch: "" };
+ }
+ return undefined;
+ },
}));
describe("CreateWorkloadIdentitySheet", () => {
@@ -160,4 +176,362 @@ describe("CreateWorkloadIdentitySheet", () => {
root.unmount();
});
});
+
+ test("omits the blank preset audience when creating a GitHub identity", async () => {
+ const created = create(WorkloadIdentitySchema, {
+ name: "workloadIdentities/[email protected]",
+ email: "[email protected]",
+ title: "deploy",
+ });
+ mocks.store.createWorkloadIdentity.mockResolvedValue(created);
+
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ const root = createRoot(container);
+
+ await act(async () => {
+ root.render(
+ <CreateWorkloadIdentitySheet
+ open
+ onClose={() => undefined}
+ onCreated={() => undefined}
+ />
+ );
+ });
+
+ const fields = Array.from(
+ container.querySelectorAll('[data-slot="form-field"]')
+ );
+ const fieldInput = (label: string) =>
+ fields
+ .find((field) => field.textContent?.includes(label))
+ ?.querySelector("input");
+ const setInputValue = (
+ input: HTMLInputElement | null | undefined,
+ value: string
+ ) => {
+ if (!input) return;
+ Object.getOwnPropertyDescriptor(
+ HTMLInputElement.prototype,
+ "value"
+ )?.set?.call(input, value);
+ input.dispatchEvent(new Event("input", { bubbles: true }));
+ };
+
+ await act(async () => {
+ setInputValue(fieldInput("common.email"), "deploy");
+ setInputValue(
+ fieldInput("settings.members.workload-identity-owner"),
+ "bytebase"
+ );
+ });
+
+ const createButton = Array.from(container.querySelectorAll("button")).find(
+ (button) => button.textContent === "common.create"
+ );
+ expect(createButton?.disabled).toBe(false);
+ await act(async () => {
+ createButton?.click();
+ });
+
+ expect(mocks.store.createWorkloadIdentity).toHaveBeenCalledOnce();
+ const [, workloadIdentity] =
+ mocks.store.createWorkloadIdentity.mock.calls[0];
+ expect(
+ workloadIdentity.workloadIdentityConfig?.allowedAudiences
+ ).toEqual([]);
+
+ act(() => {
+ root.unmount();
+ });
+ });
+
+ test("preserves a custom subject pattern when updating another field", async () => {
+ const subjectPattern =
+ "project_path:group/project:environment:production";
+ const workloadIdentity = create(WorkloadIdentitySchema, {
+ name: "workloadIdentities/[email protected]",
+ email: "[email protected]",
+ title: "Atlantis",
+ workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {
+ providerType: WorkloadIdentityConfig_ProviderType.GITLAB,
+ issuerUrl: "https://nomad.example.com",
+ allowedAudiences: ["bytebase"],
+ subjectPattern,
+ }),
+ });
+ mocks.store.updateWorkloadIdentity.mockResolvedValue(workloadIdentity);
+
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ const root = createRoot(container);
+
+ await act(async () => {
+ root.render(
+ <CreateWorkloadIdentitySheet
+ open
+ workloadIdentity={workloadIdentity}
+ onClose={() => undefined}
+ onCreated={() => undefined}
+ />
+ );
+ });
+
+ const advancedButton = Array.from(container.querySelectorAll("button")).find(
+ (button) =>
+ button.textContent?.includes(
+ "settings.members.workload-identity-advanced"
+ )
+ );
+ expect(advancedButton).toBeTruthy();
+ await act(async () => {
+ advancedButton?.click();
+ });
+
+ const subjectField = Array.from(
+ container.querySelectorAll('[data-slot="form-field"]')
+ ).find((field) =>
+ field.textContent?.includes("settings.members.workload-identity-subject")
+ );
+ const subjectInput = subjectField?.querySelector("input");
+ expect(subjectInput?.value).toBe(subjectPattern);
+
+ const titleInput = container.querySelector("input");
+ expect(titleInput).toBeTruthy();
+ await act(async () => {
+ if (titleInput) {
+ Object.getOwnPropertyDescriptor(
+ HTMLInputElement.prototype,
+ "value"
+ )?.set?.call(titleInput, "Updated Atlantis");
+ titleInput.dispatchEvent(new Event("input", { bubbles: true }));
+ }
+ });
+
+ const updateButton = Array.from(container.querySelectorAll("button")).find(
+ (button) => button.textContent === "common.update"
+ );
+ expect(updateButton).toBeTruthy();
+ await act(async () => {
+ updateButton?.click();
+ });
+
+ expect(mocks.store.updateWorkloadIdentity).toHaveBeenCalledOnce();
+ const [updatedWorkloadIdentity] =
+ mocks.store.updateWorkloadIdentity.mock.calls[0];
+ expect(
+ updatedWorkloadIdentity.workloadIdentityConfig?.subjectPattern
+ ).toBe(subjectPattern);
+
+ act(() => {
+ root.unmount();
+ });
+ });
+
+ test("shows and submits generic OIDC fields without preset controls", async () => {
+ const workloadIdentity = create(WorkloadIdentitySchema, {
+ name: "workloadIdentities/[email protected]",
+ email: "[email protected]",
+ title: "Atlantis",
+ workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {
+ providerType: WorkloadIdentityConfig_ProviderType.OIDC,
+ issuerUrl: "https://nomad.example.com",
+ jwksUrl: "https://nomad-verifier.example.com/jwks.json",
+ allowedAudiences: ["bytebase", "terraform"],
+ subjectPattern: "nomad_job:atlantis:namespace:production",
+ }),
+ });
+ mocks.store.updateWorkloadIdentity.mockResolvedValue(workloadIdentity);
+
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ const root = createRoot(container);
+
+ await act(async () => {
+ root.render(
+ <CreateWorkloadIdentitySheet
+ open
+ workloadIdentity={workloadIdentity}
+ onClose={() => undefined}
+ onCreated={() => undefined}
+ />
+ );
+ });
+
+ const fields = Array.from(
+ container.querySelectorAll('[data-slot="form-field"]')
+ );
+ const fieldInput = (label: string) =>
+ fields
+ .find((field) => field.textContent?.includes(label))
+ ?.querySelector("input");
+
+ expect(
+ fields.some((field) =>
+ field.textContent?.includes("settings.members.workload-identity-owner")
+ )
+ ).toBe(false);
+ expect(
+ fields.some((field) =>
+ field.textContent?.includes("settings.members.workload-identity-repo")
+ )
+ ).toBe(false);
+ expect(fieldInput("settings.members.workload-identity-issuer")?.value).toBe(
+ "https://nomad.example.com"
+ );
+ expect(fieldInput("settings.members.workload-identity-jwks-url")?.value).toBe(
+ "https://nomad-verifier.example.com/jwks.json"
+ );
+ const audienceField = fields.find((field) =>
+ field.textContent?.includes(
+ "settings.members.workload-identity-audience"
+ )
+ );
+ expect(
+ Array.from(audienceField?.querySelectorAll("input") ?? []).map(
+ (input) => input.value
+ )
+ ).toEqual(["bytebase", "terraform"]);
+ expect(fieldInput("settings.members.workload-identity-subject")?.value).toBe(
+ "nomad_job:atlantis:namespace:production"
+ );
+
+ const titleInput = container.querySelector("input");
+ expect(titleInput).toBeTruthy();
+ await act(async () => {
+ if (titleInput) {
+ Object.getOwnPropertyDescriptor(
+ HTMLInputElement.prototype,
+ "value"
+ )?.set?.call(titleInput, "Updated Atlantis");
+ titleInput.dispatchEvent(new Event("input", { bubbles: true }));
+ }
+ });
+
+ const updateButton = Array.from(container.querySelectorAll("button")).find(
+ (button) => button.textContent === "common.update"
+ );
+ expect(updateButton).toBeTruthy();
+ await act(async () => {
+ updateButton?.click();
+ });
+
+ expect(mocks.store.updateWorkloadIdentity).toHaveBeenCalledOnce();
+ const [updatedWorkloadIdentity, updateMask] =
+ mocks.store.updateWorkloadIdentity.mock.calls[0];
+ expect(updatedWorkloadIdentity.workloadIdentityConfig).toMatchObject({
+ providerType: WorkloadIdentityConfig_ProviderType.OIDC,
+ issuerUrl: "https://nomad.example.com",
+ jwksUrl: "https://nomad-verifier.example.com/jwks.json",
+ allowedAudiences: ["bytebase", "terraform"],
+ subjectPattern: "nomad_job:atlantis:namespace:production",
+ });
+ expect(updateMask.paths).toEqual(["title"]);
+
+ act(() => {
+ root.unmount();
+ });
+ });
+
+ test("adds and removes generic OIDC audiences", async () => {
+ const workloadIdentity = create(WorkloadIdentitySchema, {
+ name: "workloadIdentities/[email protected]",
+ email: "[email protected]",
+ title: "Atlantis",
+ workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {
+ providerType: WorkloadIdentityConfig_ProviderType.OIDC,
+ issuerUrl: "https://nomad.example.com",
+ allowedAudiences: ["bytebase", "terraform"],
+ subjectPattern: "nomad_job:atlantis:namespace:production",
+ }),
+ });
+ mocks.store.updateWorkloadIdentity.mockResolvedValue(workloadIdentity);
+
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ const root = createRoot(container);
+
+ await act(async () => {
+ root.render(
+ <CreateWorkloadIdentitySheet
+ open
+ workloadIdentity={workloadIdentity}
+ onClose={() => undefined}
+ onCreated={() => undefined}
+ />
+ );
+ });
+
+ const audienceField = Array.from(
+ container.querySelectorAll('[data-slot="form-field"]')
+ ).find((field) =>
+ field.textContent?.includes(
+ "settings.members.workload-identity-audience"
+ )
+ );
+ const addButton = audienceField?.querySelector<HTMLButtonElement>(
+ 'button[aria-label="common.add"]'
+ );
+ expect(addButton).toBeTruthy();
+
+ await act(async () => {
+ addButton?.click();
+ });
+
+ let audienceInputs = Array.from(
+ audienceField?.querySelectorAll("input") ?? []
+ );
+ expect(audienceInputs.map((input) => input.value)).toEqual([
+ "bytebase",
+ "terraform",
+ "",
+ ]);
+
+ const updateButton = Array.from(container.querySelectorAll("button")).find(
+ (button) => button.textContent === "common.update"
+ );
+ expect(updateButton?.disabled).toBe(true);
+
+ await act(async () => {
+ const newAudienceInput = audienceInputs[2];
+ Object.getOwnPropertyDescriptor(
+ HTMLInputElement.prototype,
+ "value"
+ )?.set?.call(newAudienceInput, "deployment");
+ newAudienceInput.dispatchEvent(new Event("input", { bubbles: true }));
+ });
+
+ const removeButtons = audienceField?.querySelectorAll<HTMLButtonElement>(
+ 'button[aria-label="common.remove"]'
+ );
+ expect(removeButtons).toHaveLength(3);
+ await act(async () => {
+ removeButtons?.[1]?.click();
+ });
+
+ audienceInputs = Array.from(
+ audienceField?.querySelectorAll("input") ?? []
+ );
+ expect(audienceInputs.map((input) => input.value)).toEqual([
+ "bytebase",
+ "deployment",
+ ]);
+ expect(updateButton?.disabled).toBe(false);
+
+ await act(async () => {
+ updateButton?.click();
+ });
+
+ expect(mocks.store.updateWorkloadIdentity).toHaveBeenCalledOnce();
+ const [updatedWorkloadIdentity, updateMask] =
+ mocks.store.updateWorkloadIdentity.mock.calls[0];
+ expect(
+ updatedWorkloadIdentity.workloadIdentityConfig?.allowedAudiences
+ ).toEqual(["bytebase", "deployment"]);
+ expect(updateMask.paths).toEqual(["workload_identity_config"]);
+
+ act(() => {
+ root.unmount();
+ });
+ });
});
diff --git a/frontend/src/components/CreateWorkloadIdentitySheet.tsx b/frontend/src/components/CreateWorkloadIdentitySheet.tsx
index 09ac9c3066..c2a2ea8f74 100644
--- a/frontend/src/components/CreateWorkloadIdentitySheet.tsx
+++ b/frontend/src/components/CreateWorkloadIdentitySheet.tsx
@@ -1,12 +1,19 @@
import { create } from "@bufbuild/protobuf";
import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
-import { ChevronDown, ChevronUp } from "lucide-react";
+import { ChevronDown, ChevronUp, PlusIcon, XIcon } from "lucide-react";
import { useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { RoleSelect } from "@/components/RoleSelect";
import { Button } from "@/components/ui/button";
import { FormField } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/components/ui/select";
import {
Sheet,
SheetBody,
@@ -15,6 +22,7 @@ import {
SheetHeader,
SheetTitle,
} from "@/components/ui/sheet";
+import { Tooltip } from "@/components/ui/tooltip";
import { useProjectByName } from "@/hooks/useProjectByName";
import { pushNotification } from "@/stores";
import { useAppStore } from "@/stores/app";
@@ -169,8 +177,13 @@ function WorkloadIdentityForm({
workloadIdentity?.workloadIdentityConfig?.issuerUrl ??
PLATFORM_PRESETS[initialProviderType]?.issuerUrl ??
"";
- const initialAudience =
- workloadIdentity?.workloadIdentityConfig?.allowedAudiences[0] ?? "";
+ const initialAudiences = useMemo(() => {
+ const audiences =
+ workloadIdentity?.workloadIdentityConfig?.allowedAudiences;
+ return audiences?.length ? [...audiences] : [""];
+ }, []);
+ const initialJwksUrl =
+ workloadIdentity?.workloadIdentityConfig?.jwksUrl ?? "";
const initialSubjectPattern =
workloadIdentity?.workloadIdentityConfig?.subjectPattern ?? "";
const initialTitle = workloadIdentity?.title ?? "";
@@ -204,7 +217,8 @@ function WorkloadIdentityForm({
const [branch, setBranch] = useState(initialBranch);
const [refType, setRefType] = useState<RefType>(initialRefType);
const [issuerUrl, setIssuerUrl] = useState(initialIssuerUrl);
- const [audience, setAudience] = useState(initialAudience);
+ const [jwksUrl, setJwksUrl] = useState(initialJwksUrl);
+ const [audiences, setAudiences] = useState(initialAudiences);
const [subjectPattern, setSubjectPattern] = useState(initialSubjectPattern);
const [showAdvanced, setShowAdvanced] = useState(false);
const [roles, setRoles] = useState<string[]>([]);
@@ -212,18 +226,25 @@ function WorkloadIdentityForm({
const isUpdatingFromPatternRef = useRef(false);
const isUpdatingFromFieldsRef = useRef(false);
+ const didInitializeSubjectFieldsRef = useRef(false);
+ const isGenericOIDC =
+ providerType === WorkloadIdentityConfig_ProviderType.OIDC;
useEffect(() => {
- if (isUpdatingFromPatternRef.current) return;
+ if (!didInitializeSubjectFieldsRef.current) {
+ didInitializeSubjectFieldsRef.current = true;
+ return;
+ }
+ if (isGenericOIDC || isUpdatingFromPatternRef.current) return;
isUpdatingFromFieldsRef.current = true;
setSubjectPattern(
computeSubjectPattern(providerType, owner, repo, branch, refType)
);
isUpdatingFromFieldsRef.current = false;
- }, [owner, repo, branch, providerType, refType]);
+ }, [owner, repo, branch, providerType, refType, isGenericOIDC]);
useEffect(() => {
- if (isUpdatingFromFieldsRef.current) return;
+ if (isGenericOIDC || isUpdatingFromFieldsRef.current) return;
const parsed = parseWorkloadIdentitySubjectPattern({
workloadIdentityConfig: {
subjectPattern,
@@ -240,14 +261,20 @@ function WorkloadIdentityForm({
}
isUpdatingFromPatternRef.current = false;
}
- }, [subjectPattern]);
+ }, [subjectPattern, providerType, isGenericOIDC]);
const handlePlatformChange = (value: WorkloadIdentityConfig_ProviderType) => {
setProviderType(value);
const preset = PLATFORM_PRESETS[value];
if (preset) {
setIssuerUrl(preset.issuerUrl);
- setAudience(preset.audience);
+ setAudiences([preset.audience]);
+ setJwksUrl("");
+ } else {
+ setIssuerUrl("");
+ setJwksUrl("");
+ setAudiences([""]);
+ setSubjectPattern("");
}
setRefType("all");
setBranch("");
@@ -255,10 +282,34 @@ function WorkloadIdentityForm({
const isFormValid = useMemo(() => {
if (!emailPrefix && !workloadIdentity?.email) return false;
+ if (isGenericOIDC) {
+ return (
+ !!issuerUrl.trim() &&
+ audiences.length > 0 &&
+ audiences.every((audience) => !!audience.trim()) &&
+ !!subjectPattern.trim()
+ );
+ }
if (!owner) return false;
if (!issuerUrl) return false;
return true;
- }, [emailPrefix, workloadIdentity?.email, owner, issuerUrl]);
+ }, [
+ emailPrefix,
+ workloadIdentity?.email,
+ isGenericOIDC,
+ issuerUrl,
+ audiences,
+ subjectPattern,
+ owner,
+ ]);
+
+ const isWorkloadIdentityConfigDirty =
+ providerType !== initialProviderType ||
+ issuerUrl !== initialIssuerUrl ||
+ jwksUrl !== initialJwksUrl ||
+ audiences.length !== initialAudiences.length ||
+ audiences.some((audience, index) => audience !== initialAudiences[index]) ||
+ subjectPattern !== initialSubjectPattern;
// Dirty tracking — compare current state to the initial values captured
// at mount. In edit mode the Update button is disabled unless something
@@ -266,38 +317,30 @@ function WorkloadIdentityForm({
const isDirty = useMemo(() => {
if (!isEditMode) return true;
if (title !== initialTitle) return true;
- if (providerType !== initialProviderType) return true;
if (owner !== initialOwner) return true;
if (repo !== initialRepo) return true;
if (branch !== initialBranch) return true;
if (refType !== initialRefType) return true;
- if (issuerUrl !== initialIssuerUrl) return true;
- if (audience !== initialAudience) return true;
- if (subjectPattern !== initialSubjectPattern) return true;
- return false;
+ return isWorkloadIdentityConfigDirty;
}, [
isEditMode,
title,
- providerType,
owner,
repo,
branch,
refType,
- issuerUrl,
- audience,
- subjectPattern,
initialTitle,
- initialProviderType,
initialOwner,
initialRepo,
initialBranch,
initialRefType,
- initialIssuerUrl,
- initialAudience,
- initialSubjectPattern,
+ isWorkloadIdentityConfigDirty,
]);
const allowConfirm = isFormValid && isDirty;
+ const allowedAudiences = audiences
+ .map((audience) => audience.trim())
+ .filter(Boolean);
const requiredPermission = isEditMode
? "bb.workloadIdentities.update"
@@ -360,7 +403,8 @@ function WorkloadIdentityForm({
workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {
providerType,
issuerUrl,
- allowedAudiences: audience ? [audience] : [],
+ jwksUrl,
+ allowedAudiences,
subjectPattern,
}),
},
@@ -404,12 +448,18 @@ function WorkloadIdentityForm({
workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {
providerType,
issuerUrl,
- allowedAudiences: audience ? [audience] : [],
+ jwksUrl,
+ allowedAudiences,
subjectPattern,
}),
}),
create(FieldMaskSchema, {
- paths: [...updateMask, "workload_identity_config"],
+ paths: [
+ ...updateMask,
+ ...(isWorkloadIdentityConfigDirty
+ ? ["workload_identity_config"]
+ : []),
+ ],
})
);
@@ -424,10 +474,64 @@ function WorkloadIdentityForm({
const isGitLab = providerType === WorkloadIdentityConfig_ProviderType.GITLAB;
const showBranchField =
- providerType === WorkloadIdentityConfig_ProviderType.GITHUB ||
- refType !== "all";
+ !isGenericOIDC &&
+ (providerType === WorkloadIdentityConfig_ProviderType.GITHUB ||
+ refType !== "all");
const isTagRefType = isGitLab && refType === "tag";
+ const audienceInputs = (
+ <div className="flex flex-col gap-y-2">
+ {audiences.map((audience, index) => (
+ <div key={index} className="flex items-center gap-x-2">
+ <Input
+ value={audience}
+ aria-label={`${t("settings.members.workload-identity-audience")} ${index + 1}`}
+ onChange={(event) => {
+ const value = event.target.value;
+ setAudiences((current) =>
+ current.map((item, itemIndex) =>
+ itemIndex === index ? value : item
+ )
+ );
+ }}
+ maxLength={500}
+ autoComplete="off"
+ />
+ {audiences.length > 1 && (
+ <Tooltip content={t("common.remove")}>
+ <Button
+ type="button"
+ appearance="outline"
+ size="md"
+ className="aspect-square p-0"
+ aria-label={t("common.remove")}
+ onClick={() =>
+ setAudiences((current) =>
+ current.filter((_, itemIndex) => itemIndex !== index)
+ )
+ }
+ >
+ <XIcon className="size-4" />
+ </Button>
+ </Tooltip>
+ )}
+ </div>
+ ))}
+ <Tooltip content={t("common.add")}>
+ <Button
+ type="button"
+ appearance="outline"
+ size="md"
+ className="aspect-square p-0"
+ aria-label={t("common.add")}
+ onClick={() => setAudiences((current) => [...current, ""])}
+ >
+ <PlusIcon className="size-4" />
+ </Button>
+ </Tooltip>
+ </div>
+ );
+
return (
<>
<SheetHeader>
@@ -490,71 +594,88 @@ function WorkloadIdentityForm({
</>
}
>
- <select
- value={providerType}
- onChange={(e) =>
+ <Select
+ value={String(providerType)}
+ onValueChange={(value) =>
handlePlatformChange(
- Number(e.target.value) as WorkloadIdentityConfig_ProviderType
+ Number(value) as WorkloadIdentityConfig_ProviderType
)
}
- className="border border-control-border rounded-xs text-sm px-2 py-2 bg-background"
>
- {[
- WorkloadIdentityConfig_ProviderType.GITHUB,
- WorkloadIdentityConfig_ProviderType.GITLAB,
- ].map((pt) => (
- <option key={pt} value={pt}>
- {getWorkloadIdentityProviderText(pt)}
- </option>
- ))}
- </select>
+ <SelectTrigger className="w-full">
+ <SelectValue>
+ {getWorkloadIdentityProviderText(
+ providerType,
+ t("settings.members.workload-identity-generic-oidc")
+ )}
+ </SelectValue>
+ </SelectTrigger>
+ <SelectContent>
+ {[
+ WorkloadIdentityConfig_ProviderType.GITHUB,
+ WorkloadIdentityConfig_ProviderType.GITLAB,
+ WorkloadIdentityConfig_ProviderType.OIDC,
+ ].map((pt) => (
+ <SelectItem key={pt} value={String(pt)}>
+ {getWorkloadIdentityProviderText(
+ pt,
+ t("settings.members.workload-identity-generic-oidc")
+ )}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
</FormField>
{/* Owner / Group */}
- <FormField
- title={
- <>
- {isGitLab
- ? t("settings.members.workload-identity-group")
- : t("settings.members.workload-identity-owner")}
- <span className="ml-0.5 text-error">*</span>
- </>
- }
- >
- <Input
- value={owner}
- onChange={(e) => setOwner(e.target.value)}
- placeholder={isGitLab ? "my-group" : "my-org"}
- maxLength={200}
- autoComplete="off"
- />
- </FormField>
+ {!isGenericOIDC && (
+ <FormField
+ title={
+ <>
+ {isGitLab
+ ? t("settings.members.workload-identity-group")
+ : t("settings.members.workload-identity-owner")}
+ <span className="ml-0.5 text-error">*</span>
+ </>
+ }
+ >
+ <Input
+ value={owner}
+ onChange={(e) => setOwner(e.target.value)}
+ placeholder={isGitLab ? "my-group" : "my-org"}
+ maxLength={200}
+ autoComplete="off"
+ />
+ </FormField>
+ )}
{/* Repository / Project */}
- <FormField
- title={
- <>
- {isGitLab
- ? t("settings.members.workload-identity-project")
- : t("settings.members.workload-identity-repo")}
- </>
- }
- description={
- <>
- {isGitLab
- ? t("settings.members.workload-identity-project-hint")
- : t("settings.members.workload-identity-repo-hint")}
- </>
- }
- >
- <Input
- value={repo}
- onChange={(e) => setRepo(e.target.value)}
- placeholder={isGitLab ? "my-project" : "my-repo"}
- maxLength={200}
- autoComplete="off"
- />
- </FormField>
+ {!isGenericOIDC && (
+ <FormField
+ title={
+ <>
+ {isGitLab
+ ? t("settings.members.workload-identity-project")
+ : t("settings.members.workload-identity-repo")}
+ </>
+ }
+ description={
+ <>
+ {isGitLab
+ ? t("settings.members.workload-identity-project-hint")
+ : t("settings.members.workload-identity-repo-hint")}
+ </>
+ }
+ >
+ <Input
+ value={repo}
+ onChange={(e) => setRepo(e.target.value)}
+ placeholder={isGitLab ? "my-project" : "my-repo"}
+ maxLength={200}
+ autoComplete="off"
+ />
+ </FormField>
+ )}
{/* Allowed Branches/Tags (GitLab only) */}
{isGitLab && (
@@ -567,21 +688,37 @@ function WorkloadIdentityForm({
</>
}
>
- <select
+ <Select
value={refType}
- onChange={(e) => setRefType(e.target.value as RefType)}
- className="border border-control-border rounded-xs text-sm px-2 py-2 bg-background"
+ onValueChange={(value) => {
+ if (value !== null) setRefType(value as RefType);
+ }}
>
- <option value="all">
- {t("settings.members.workload-identity-all-branches-tags")}
- </option>
- <option value="branch">
- {t("settings.members.workload-identity-specific-branch")}
- </option>
- <option value="tag">
- {t("settings.members.workload-identity-specific-tag")}
- </option>
- </select>
+ <SelectTrigger className="w-full">
+ <SelectValue>
+ {refType === "all"
+ ? t(
+ "settings.members.workload-identity-all-branches-tags"
+ )
+ : refType === "branch"
+ ? t(
+ "settings.members.workload-identity-specific-branch"
+ )
+ : t("settings.members.workload-identity-specific-tag")}
+ </SelectValue>
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="all">
+ {t("settings.members.workload-identity-all-branches-tags")}
+ </SelectItem>
+ <SelectItem value="branch">
+ {t("settings.members.workload-identity-specific-branch")}
+ </SelectItem>
+ <SelectItem value="tag">
+ {t("settings.members.workload-identity-specific-tag")}
+ </SelectItem>
+ </SelectContent>
+ </Select>
</FormField>
)}
@@ -613,8 +750,66 @@ function WorkloadIdentityForm({
</FormField>
)}
+ {isGenericOIDC && (
+ <>
+ <FormField
+ title={
+ <>
+ {t("settings.members.workload-identity-issuer")}
+ <span className="ml-0.5 text-error">*</span>
+ </>
+ }
+ >
+ <Input
+ value={issuerUrl}
+ onChange={(e) => setIssuerUrl(e.target.value)}
+ maxLength={500}
+ autoComplete="off"
+ />
+ </FormField>
+
+ <FormField
+ title={<>{t("settings.members.workload-identity-jwks-url")}</>}
+ >
+ <Input
+ value={jwksUrl}
+ onChange={(e) => setJwksUrl(e.target.value)}
+ maxLength={500}
+ autoComplete="off"
+ />
+ </FormField>
+
+ <FormField
+ title={
+ <>
+ {t("settings.members.workload-identity-audience")}
+ <span className="ml-0.5 text-error">*</span>
+ </>
+ }
+ >
+ {audienceInputs}
+ </FormField>
+
+ <FormField
+ title={
+ <>
+ {t("settings.members.workload-identity-subject")}
+ <span className="ml-0.5 text-error">*</span>
+ </>
+ }
+ >
+ <Input
+ value={subjectPattern}
+ onChange={(e) => setSubjectPattern(e.target.value)}
+ maxLength={500}
+ autoComplete="off"
+ />
+ </FormField>
+ </>
+ )}
+
{/* Advanced Settings */}
- {showAdvanced && (
+ {!isGenericOIDC && showAdvanced && (
<div className="flex flex-col gap-y-6 pt-6 border-t">
{/* Issuer URL / GitLab URL */}
<FormField
@@ -641,12 +836,7 @@ function WorkloadIdentityForm({
<FormField
title={<>{t("settings.members.workload-identity-audience")}</>}
>
- <Input
- value={audience}
- onChange={(e) => setAudience(e.target.value)}
- maxLength={500}
- autoComplete="off"
- />
+ {audienceInputs}
</FormField>
{/* Subject Pattern */}
@@ -664,18 +854,20 @@ function WorkloadIdentityForm({
)}
{/* Advanced Settings Toggle */}
- <button
- type="button"
- className="flex items-center gap-x-1 text-sm text-accent hover:underline w-fit"
- onClick={() => setShowAdvanced(!showAdvanced)}
- >
- {t("settings.members.workload-identity-advanced")}
- {showAdvanced ? (
- <ChevronUp className="size-4" />
- ) : (
- <ChevronDown className="size-4" />
- )}
- </button>
+ {!isGenericOIDC && (
+ <button
+ type="button"
+ className="flex items-center gap-x-1 text-sm text-accent hover:underline w-fit"
+ onClick={() => setShowAdvanced(!showAdvanced)}
+ >
+ {t("settings.members.workload-identity-advanced")}
+ {showAdvanced ? (
+ <ChevronUp className="size-4" />
+ ) : (
+ <ChevronDown className="size-4" />
+ )}
+ </button>
+ )}
</div>
</SheetBody>
diff --git a/frontend/src/components/UserCell.test.tsx b/frontend/src/components/UserCell.test.tsx
index dbe67068aa..8562ef25b1 100644
--- a/frontend/src/components/UserCell.test.tsx
+++ b/frontend/src/components/UserCell.test.tsx
@@ -131,4 +131,69 @@ describe("UserCell", () => {
expect(onRowClick).not.toHaveBeenCalled();
unmount();
});
+
+ test("renders subtitle actions beside the email without bubbling to row clicks", () => {
+ const onRowClick = vi.fn();
+ const onCopy = vi.fn();
+ const { container, unmount } = renderIntoContainer(
+ <div onClick={onRowClick}>
+ <UserCell
+ title="CI Bot"
+ subtitle="[email protected]"
+ subtitleAction={
+ <button
+ type="button"
+ aria-label="Copy email"
+ onClick={onCopy}
+ />
+ }
+ />
+ </div>
+ );
+
+ const copyButton = container.querySelector('[aria-label="Copy email"]');
+ expect(copyButton?.parentElement?.previousElementSibling?.textContent).toBe(
+ );
+
+ act(() => {
+ copyButton?.dispatchEvent(
+ new MouseEvent("click", { bubbles: true, cancelable: true })
+ );
+ });
+
+ expect(onCopy).toHaveBeenCalledTimes(1);
+ expect(onRowClick).not.toHaveBeenCalled();
+ unmount();
+ });
+
+ test.each(["Enter", " "])(
+ "keeps %j activation on subtitle actions from reaching the row",
+ (key) => {
+ const onRowKeyDown = vi.fn();
+ const { container, unmount } = renderIntoContainer(
+ <div onKeyDown={onRowKeyDown}>
+ <UserCell
+ title="CI Bot"
+ subtitle="[email protected]"
+ subtitleAction={<button type="button" aria-label="Copy email" />}
+ />
+ </div>
+ );
+
+ const copyButton = container.querySelector('[aria-label="Copy email"]');
+ act(() => {
+ copyButton?.dispatchEvent(
+ new KeyboardEvent("keydown", {
+ key,
+ bubbles: true,
+ cancelable: true,
+ })
+ );
+ });
+
+ expect(onRowKeyDown).not.toHaveBeenCalled();
+ unmount();
+ }
+ );
});
diff --git a/frontend/src/components/UserCell.tsx b/frontend/src/components/UserCell.tsx
index 610dda1918..d27920d641 100644
--- a/frontend/src/components/UserCell.tsx
+++ b/frontend/src/components/UserCell.tsx
@@ -32,6 +32,8 @@ interface UserCellProps {
hoverEmail?: string;
/** Inline badges rendered after the name. */
badges?: ReactNode;
+ /** Inline action rendered after the subtitle. */
+ subtitleAction?: ReactNode;
/** Extra className on the outer wrapper. */
className?: string;
}
@@ -46,6 +48,7 @@ export function UserCell({
nameLink,
hoverEmail,
badges,
+ subtitleAction,
className,
}: UserCellProps) {
const nameContent = title || subtitle || "?";
@@ -112,9 +115,23 @@ export function UserCell({
{badges}
</div>
{subtitle && (
- <span className="text-control-light text-xs truncate">
- {subtitle}
- </span>
+ <div className="flex items-center gap-x-1 min-w-0">
+ <span className="text-control-light text-xs truncate">
+ {subtitle}
+ </span>
+ {subtitleAction && (
+ <div
+ onClick={(event) => event.stopPropagation()}
+ onKeyDown={(event) => {
+ if (event.key === "Enter" || event.key === " ") {
+ event.stopPropagation();
+ }
+ }}
+ >
+ {subtitleAction}
+ </div>
+ )}
+ </div>
)}
</div>
</div>
diff --git a/frontend/src/components/ui/checkbox.test.tsx b/frontend/src/components/ui/checkbox.test.tsx
index 12a1f22760..59f8b6a1ad 100644
--- a/frontend/src/components/ui/checkbox.test.tsx
+++ b/frontend/src/components/ui/checkbox.test.tsx
@@ -82,6 +82,33 @@ describe("Checkbox", () => {
unmount();
});
+ test("clicking an associated label emits true", () => {
+ const onCheckedChange = vi.fn();
+ const { container, unmount } = renderIntoContainer(
+ createElement(
+ "div",
+ undefined,
+ createElement(Checkbox, {
+ checked: false,
+ id: "show-inactive",
+ onCheckedChange,
+ }),
+ createElement(
+ "label",
+ { htmlFor: "show-inactive" },
+ "Show inactive accounts"
+ )
+ )
+ );
+
+ act(() => {
+ container.querySelector("label")?.click();
+ });
+
+ expect(onCheckedChange).toHaveBeenCalledWith(true);
+ unmount();
+ });
+
test("click on checked emits false", () => {
const onCheckedChange = vi.fn();
const { container, unmount } = renderIntoContainer(
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index c7929b4c48..8026cffaed 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -2799,10 +2799,12 @@
"workload-identity-audience": "Audience",
"workload-identity-branch": "Branch",
"workload-identity-branch-hint": "Leave empty for all branches",
+ "workload-identity-generic-oidc": "Generic OIDC",
"workload-identity-gitlab-url": "GitLab URL",
"workload-identity-gitlab-url-hint": "Your GitLab instance URL",
"workload-identity-group": "Group / Username",
"workload-identity-issuer": "Issuer URL",
+ "workload-identity-jwks-url": "JWKS URL",
"workload-identity-owner": "Organization / Username",
"workload-identity-platform": "Platform",
"workload-identity-project": "Project",
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 0846412a01..0b774cce21 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -2799,10 +2799,12 @@
"workload-identity-audience": "Audiencia",
"workload-identity-branch": "Rama",
"workload-identity-branch-hint": "Dejar vacío para todas las ramas",
+ "workload-identity-generic-oidc": "OIDC genérico",
"workload-identity-gitlab-url": "GitLab URL",
"workload-identity-gitlab-url-hint": "La URL de su instancia de GitLab",
"workload-identity-group": "Grupo / Nombre de usuario",
"workload-identity-issuer": "URL del emisor",
+ "workload-identity-jwks-url": "URL de JWKS",
"workload-identity-owner": "Organización / Nombre de usuario",
"workload-identity-platform": "Plataforma",
"workload-identity-project": "Proyecto",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 3d3dd855e8..6185fabc8c 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -2799,10 +2799,12 @@
"workload-identity-audience": "Audience",
"workload-identity-branch": "ブランチ",
"workload-identity-branch-hint": "すべてのブランチを対象とする場合は空欄にしてください",
+ "workload-identity-generic-oidc": "汎用 OIDC",
"workload-identity-gitlab-url": "GitLab URL",
"workload-identity-gitlab-url-hint": "GitLab インスタンスの URL",
"workload-identity-group": "グループ / ユーザー名",
"workload-identity-issuer": "Issuer URL",
+ "workload-identity-jwks-url": "JWKS URL",
"workload-identity-owner": "組織 / ユーザー名",
"workload-identity-platform": "プラットフォーム",
"workload-identity-project": "プロジェクト",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 907750f9b4..bd0c288d6f 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -2799,10 +2799,12 @@
"workload-identity-audience": "Audience",
"workload-identity-branch": "Branch",
"workload-identity-branch-hint": "Để trống cho tất cả branch",
+ "workload-identity-generic-oidc": "OIDC chung",
"workload-identity-gitlab-url": "GitLab URL",
"workload-identity-gitlab-url-hint": "URL phiên bản GitLab của bạn",
"workload-identity-group": "Nhóm / Tên người dùng",
"workload-identity-issuer": "Issuer URL",
+ "workload-identity-jwks-url": "URL JWKS",
"workload-identity-owner": "Tổ chức / Tên người dùng",
"workload-identity-platform": "Nền tảng",
"workload-identity-project": "Dự án",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index fc0da3e69d..4e86bcae9f 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -2799,10 +2799,12 @@
"workload-identity-audience": "受众",
"workload-identity-branch": "分支",
"workload-identity-branch-hint": "留空表示允许所有分支",
+ "workload-identity-generic-oidc": "通用 OIDC",
"workload-identity-gitlab-url": "GitLab 地址",
"workload-identity-gitlab-url-hint": "您的 GitLab 实例地址",
"workload-identity-group": "Group / 用户名",
"workload-identity-issuer": "发行者 URL",
+ "workload-identity-jwks-url": "JWKS URL",
"workload-identity-owner": "组织 / 用户名",
"workload-identity-platform": "平台",
"workload-identity-project": "项目",
diff --git a/frontend/src/routes/project/ProjectGitOpsPage.tsx b/frontend/src/routes/project/ProjectGitOpsPage.tsx
index cfc301d9e1..62beb89927 100644
--- a/frontend/src/routes/project/ProjectGitOpsPage.tsx
+++ b/frontend/src/routes/project/ProjectGitOpsPage.tsx
@@ -435,7 +435,8 @@ export function ProjectGitOpsPage({ projectId }: { projectId: string }) {
className="mb-3"
description={t("gitops.workflow.provider-not-match", {
provider: getWorkloadIdentityProviderText(
- selectedConfig!.providerType
+ selectedConfig!.providerType,
+ t("settings.members.workload-identity-generic-oidc")
),
})}
/>
@@ -483,7 +484,8 @@ export function ProjectGitOpsPage({ projectId }: { projectId: string }) {
className="mb-3"
description={t("gitops.workflow.provider-not-match", {
provider: getWorkloadIdentityProviderText(
- selectedConfig!.providerType
+ selectedConfig!.providerType,
+ t("settings.members.workload-identity-generic-oidc")
),
})}
/>
diff --git a/frontend/src/routes/workspace/ServiceAccountsPage.tsx b/frontend/src/routes/workspace/ServiceAccountsPage.tsx
index 39eedd6932..bc4cd43ab7 100644
--- a/frontend/src/routes/workspace/ServiceAccountsPage.tsx
+++ b/frontend/src/routes/workspace/ServiceAccountsPage.tsx
@@ -13,6 +13,7 @@ import { UserCell } from "@/components/UserCell";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
+import { CopyButton } from "@/components/ui/copy-button";
import { FormField } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import {
@@ -274,6 +275,7 @@ function ServiceAccountTable({
<UserCell
title={sa.title}
subtitle={sa.email}
+ subtitleAction={<CopyButton content={sa.email} />}
nameClassName={
isDeleted
? "line-through !text-control-light"
@@ -806,15 +808,19 @@ export function ServiceAccountsPage({ projectId }: { projectId?: string }) {
)}
{/* Inactive toggle */}
- <label className="flex items-center gap-x-2 text-sm cursor-pointer">
+ <div className="flex items-center gap-x-2 text-sm">
<Checkbox
+ id="show-inactive-service-accounts"
checked={showInactive}
onCheckedChange={(checked) => setShowInactive(checked)}
/>
- <span className="textinfolabel">
+ <label
+ className="cursor-pointer textinfolabel"
+ htmlFor="show-inactive-service-accounts"
+ >
{t("settings.members.show-inactive")}
- </span>
- </label>
+ </label>
+ </div>
{/* Inactive list */}
{showInactive && (
diff --git a/frontend/src/routes/workspace/UsersPage.tsx b/frontend/src/routes/workspace/UsersPage.tsx
index e58055638c..5b4c074ab9 100644
--- a/frontend/src/routes/workspace/UsersPage.tsx
+++ b/frontend/src/routes/workspace/UsersPage.tsx
@@ -472,13 +472,16 @@ export function UsersPage() {
{/* Inactive users toggle (only shown with list permission) */}
{hasUserListPermission && (
- <label className="flex items-center gap-x-2 text-sm cursor-pointer">
+ <div className="flex items-center gap-x-2 text-sm">
<Checkbox
+ id="show-inactive-users"
checked={showInactiveUsers}
onCheckedChange={(checked) => setShowInactiveUsers(checked)}
/>
- {t("settings.members.show-inactive")}
- </label>
+ <label className="cursor-pointer" htmlFor="show-inactive-users">
+ {t("settings.members.show-inactive")}
+ </label>
+ </div>
)}
{showInactiveUsers && (
diff --git a/frontend/src/routes/workspace/WorkloadIdentitiesPage.tsx b/frontend/src/routes/workspace/WorkloadIdentitiesPage.tsx
index 06fa586fd9..ba0481cd77 100644
--- a/frontend/src/routes/workspace/WorkloadIdentitiesPage.tsx
+++ b/frontend/src/routes/workspace/WorkloadIdentitiesPage.tsx
@@ -10,6 +10,7 @@ import {
import { UserCell } from "@/components/UserCell";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
+import { CopyButton } from "@/components/ui/copy-button";
import { listRowStateClassName } from "@/components/ui/styles.stylex";
import {
Table,
@@ -179,6 +180,7 @@ function WorkloadIdentityTable({
<UserCell
title={user.title}
subtitle={user.email}
+ subtitleAction={<CopyButton content={user.email} />}
nameClassName={
isDeleted
? "line-through !text-control-light"
@@ -409,15 +411,19 @@ export function WorkloadIdentitiesPage({ projectId }: { projectId?: string }) {
)}
{/* Show inactive toggle */}
- <label className="flex items-center gap-x-2 text-sm cursor-pointer">
+ <div className="flex items-center gap-x-2 text-sm">
<Checkbox
+ id="show-inactive-workload-identities"
checked={showInactive}
onCheckedChange={(checked) => setShowInactive(checked)}
/>
- <span className="textinfolabel">
+ <label
+ className="cursor-pointer textinfolabel"
+ htmlFor="show-inactive-workload-identities"
+ >
{t("settings.members.show-inactive")}
- </span>
- </label>
+ </label>
+ </div>
{showInactive && (
<div className="flex flex-col gap-y-4">
diff --git a/frontend/src/routes/workspace/WorkspacePageLayout.test.ts b/frontend/src/routes/workspace/WorkspacePageLayout.test.ts
index 2009b216d4..a2d74c2a0b 100644
--- a/frontend/src/routes/workspace/WorkspacePageLayout.test.ts
+++ b/frontend/src/routes/workspace/WorkspacePageLayout.test.ts
@@ -145,6 +145,22 @@ describe("workspace list page layout", () => {
}
});
+ test("limits inactive account toggles to their checkbox and label", () => {
+ for (const file of [
+ "UsersPage.tsx",
+ "ServiceAccountsPage.tsx",
+ "WorkloadIdentitiesPage.tsx",
+ ] as const) {
+ const source = readSettingsPage(file);
+
+ expect(source, file).not.toContain(
+ '<label className="flex items-center gap-x-2 text-sm cursor-pointer">'
+ );
+ expect(source, file).toContain('htmlFor="show-inactive-');
+ expect(source, file).toContain('id="show-inactive-');
+ }
+ });
+
test("uses shared workspace info surfaces for persistent page descriptions", () => {
for (const file of workspaceInfoPages) {
const source = readSettingsPage(file);
diff --git a/frontend/src/types/proto-es/v1/workload_identity_service_pb.d.ts b/frontend/src/types/proto-es/v1/workload_identity_service_pb.d.ts
index 6c14dccad1..ad53cb27be 100644
--- a/frontend/src/types/proto-es/v1/workload_identity_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/workload_identity_service_pb.d.ts
@@ -77,7 +77,7 @@ export declare const WorkloadIdentitySchema: GenMessage<WorkloadIdentity>;
*/
export declare type WorkloadIdentityConfig = Message<"bytebase.v1.WorkloadIdentityConfig"> & {
/**
- * Platform type (currently only GITHUB is supported)
+ * Provider configuration mode.
*
* @generated from field: bytebase.v1.WorkloadIdentityConfig.ProviderType provider_type = 1;
*/
@@ -103,6 +103,13 @@ export declare type WorkloadIdentityConfig = Message<"bytebase.v1.WorkloadIdenti
* @generated from field: string subject_pattern = 4;
*/
subjectPattern: string;
+
+ /**
+ * Optional JWKS endpoint. When empty, use OIDC discovery from issuer_url.
+ *
+ * @generated from field: string jwks_url = 5;
+ */
+ jwksUrl: string;
};
/**
@@ -112,7 +119,7 @@ export declare type WorkloadIdentityConfig = Message<"bytebase.v1.WorkloadIdenti
export declare const WorkloadIdentityConfigSchema: GenMessage<WorkloadIdentityConfig>;
/**
- * ProviderType identifies the CI/CD platform.
+ * ProviderType identifies the workload identity configuration mode.
*
* @generated from enum bytebase.v1.WorkloadIdentityConfig.ProviderType
*/
@@ -131,6 +138,11 @@ export enum WorkloadIdentityConfig_ProviderType {
* @generated from enum value: GITLAB = 2;
*/
GITLAB = 2,
+
+ /**
+ * @generated from enum value: OIDC = 3;
+ */
+ OIDC = 3,
}
/**
diff --git a/frontend/src/types/proto-es/v1/workload_identity_service_pb.js b/frontend/src/types/proto-es/v1/workload_identity_service_pb.js
index 4f015a8f95..96600d669c 100644
--- a/frontend/src/types/proto-es/v1/workload_identity_service_pb.js
+++ b/frontend/src/types/proto-es/v1/workload_identity_service_pb.js
@@ -16,7 +16,7 @@ import { file_v1_common } from "./common_pb";
* Describes the file v1/workload_identity_service.proto.
*/
export const file_v1_workload_identity_service = /*@__PURE__*/
- fileDesc("CiJ2MS93b3JrbG9hZF9pZGVudGl0eV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSKyAgoQV29ya2xvYWRJZGVudGl0eRIRCgRuYW1lGAEgASgJQgPgQQMSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRISCgVlbWFpbBgDIAEoCUID4EEDEhcKBXRpdGxlGAQgASgJQgi6SAVyAxjIARI0CgtjcmVhdGVfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxJFChh3b3JrbG9hZF9pZGVudGl0eV9jb25maWcYBiABKAsyIy5ieXRlYmFzZS52MS5Xb3JrbG9hZElkZW50aXR5Q29uZmlnOj7qQTsKHWJ5dGViYXNlLmNvbS9Xb3JrbG9hZElkZW50aXR5Ehp3b3JrbG9hZElkZW50aXRpZXMve2VtYWlsfSLwAQoWV29ya2xvYWRJZGVudGl0eUNvbmZpZxJHCg1wcm92aWRlcl90eXBlGAEgASgOMjAuYnl0ZWJhc2UudjEuV29ya2xvYWRJZGVudGl0eUNvbmZpZy5Qcm92aWRlclR5cGUSEgoKaXNzdWVyX3VybBgCIAEoCRIZChFhbGxvd2VkX2F1ZGllbmNlcxgDIAMoCRIXCg9zdWJqZWN0X3BhdHRlcm4YBCABKAkiRQoMUHJvdmlkZXJUeXBlEh0KGVBST1ZJREVSX1RZUEVfVU5TUEVDSUZJRUQQABIKCgZHSVRIVUIQARIKCgZHSVRMQUIQAiKsAQodQ3JlYXRlV29ya2xvYWRJZGVudGl0eVJlcXVlc3QSKQoGcGFyZW50GAEgASgJQhn6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EiEKFHdvcmtsb2FkX2lkZW50aXR5X2lkGAIgASgJQgPgQQISPQoRd29ya2xvYWRfaWRlbnRpdHkYAyABKAsyHS5ieXRlYmFzZS52MS5Xb3JrbG9hZElkZW50aXR5QgPgQQIiUQoaR2V0V29ya2xvYWRJZGVudGl0eVJlcXVlc3QSMwoEbmFtZRgBIAEoCUIl4EEC+kEfCh1ieXRlYmFzZS5jb20vV29ya2xvYWRJZGVudGl0eSKXAQodTGlzdFdvcmtsb2FkSWRlbnRpdGllc1JlcXVlc3QSKQoGcGFyZW50GAEgASgJQhn6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJEhQKDHNob3dfZGVsZXRlZBgEIAEoCBIOCgZmaWx0ZXIYBSABKAkidQoeTGlzdFdvcmtsb2FkSWRlbnRpdGllc1Jlc3BvbnNlEjoKE3dvcmtsb2FkX2lkZW50aXRpZXMYASADKAsyHS5ieXRlYmFzZS52MS5Xb3JrbG9hZElkZW50aXR5EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSKPAQodVXBkYXRlV29ya2xvYWRJZGVudGl0eVJlcXVlc3QSPQoRd29ya2xvYWRfaWRlbnRpdHkYASABKAsyHS5ieXRlYmFzZS52MS5Xb3JrbG9hZElkZW50aXR5QgPgQQISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrIlQKHURlbGV0ZVdvcmtsb2FkSWRlbnRpdHlSZXF1ZXN0EjMKBG5hbWUYASABKAlCJeBBAvpBHwodYnl0ZWJhc2UuY29tL1dvcmtsb2FkSWRlbnRpdHkiVgofVW5kZWxldGVXb3JrbG9hZElkZW50aXR5UmVxdWVzdBIzCgRuYW1lGAEgASgJQiXgQQL6QR8KHWJ5dGViYXNlLmNvbS9Xb3JrbG9hZElkZW50aXR5MsULChdXb3JrbG9hZElkZW50aXR5U2VydmljZRLPAgoWQ3JlYXRlV29ya2xvYWRJZGVudGl0eRIqLmJ5dGViYXNlLnYxLkNyZWF0ZVdvcmtsb2FkSWRlbnRpdHlSZXF1ZXN0Gh0uYnl0ZWJhc2UudjEuV29ya2xvYWRJZGVudGl0eSLpAdpBLXBhcmVudCx3b3JrbG9hZF9pZGVudGl0eSx3b3JrbG9hZF9pZGVudGl0eV9pZIrqMBxiYi53b3JrbG9hZElkZW50aXRpZXMuY3JlYXRlkOowAZjqMAGg6jADqOowBoLT5JMCggE6EXdvcmtsb2FkX2lkZW50aXR5WkE6EXdvcmtsb2FkX2lkZW50aXR5IiwvdjEve3BhcmVudD13b3Jrc3BhY2VzLyp9L3dvcmtsb2FkSWRlbnRpdGllcyIqL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vd29ya2xvYWRJZGVudGl0aWVzErYBChNHZXRXb3JrbG9hZElkZW50aXR5EicuYnl0ZWJhc2UudjEuR2V0V29ya2xvYWRJZGVudGl0eVJlcXVlc3QaHS5ieXRlYmFzZS52MS5Xb3JrbG9hZElkZW50aXR5IlfaQQRuYW1liuowGWJiLndvcmtsb2FkSWRlbnRpdGllcy5nZXSQ6jABoOowBKjqMAmC0+STAiESHy92MS97bmFtZT13b3JrbG9hZElkZW50aXRpZXMvKn0SiQIKFkxpc3RXb3JrbG9hZElkZW50aXRpZXMSKi5ieXRlYmFzZS52MS5MaXN0V29ya2xvYWRJZGVudGl0aWVzUmVxdWVzdBorLmJ5dGViYXNlLnYxLkxpc3RXb3JrbG9hZElkZW50aXRpZXNSZXNwb25zZSKVAdpBBnBhcmVudIrqMBpiYi53b3JrbG9hZElkZW50aXRpZXMubGlzdJDqMAGg6jAEqOowCYLT5JMCXFouEiwvdjEve3BhcmVudD13b3Jrc3BhY2VzLyp9L3dvcmtsb2FkSWRlbnRpdGllcxIqL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vd29ya2xvYWRJZGVudGl0aWVzEoICChZVcGRhdGVXb3JrbG9hZElkZW50aXR5EiouYnl0ZWJhc2UudjEuVXBkYXRlV29ya2xvYWRJZGVudGl0eVJlcXVlc3QaHS5ieXRlYmFzZS52MS5Xb3JrbG9hZElkZW50aXR5IpwB2kEdd29ya2xvYWRfaWRlbnRpdHksdXBkYXRlX21hc2uK6jAcYmIud29ya2xvYWRJZGVudGl0aWVzLnVwZGF0ZZDqMAGY6jABoOowA6jqMAaC0+STAkY6EXdvcmtsb2FkX2lkZW50aXR5MjEvdjEve3dvcmtsb2FkX2lkZW50aXR5Lm5hbWU9d29ya2xvYWRJZGVudGl0aWVzLyp9ErwBChZEZWxldGVXb3JrbG9hZElkZW50aXR5EiouYnl0ZWJhc2UudjEuRGVsZXRlV29ya2xvYWRJZGVudGl0eVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiXtpBBG5hbWWK6jAcYmIud29ya2xvYWRJZGVudGl0aWVzLmRlbGV0ZZDqMAGY6jABoOowBKjqMAmC0+STAiEqHy92MS97bmFtZT13b3JrbG9hZElkZW50aXRpZXMvKn0SzgEKGFVuZGVsZXRlV29ya2xvYWRJZGVudGl0eRIsLmJ5dGViYXNlLnYxLlVuZGVsZXRlV29ya2xvYWRJZGVudGl0eVJlcXVlc3QaHS5ieXRlYmFzZS52MS5Xb3JrbG9hZElkZW50aXR5ImWK6jAeYmIud29ya2xvYWRJZGVudGl0aWVzLnVuZGVsZXRlkOowAZjqMAGg6jAEqOowCYLT5JMCLToBKiIoL3YxL3tuYW1lPXdvcmtsb2FkSWRlbnRpdGllcy8qfTp1bmRlbGV0ZUKyAQoPY29tLmJ5dGViYXNlLnYxQhxXb3JrbG9hZElkZW50aXR5U2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common]);
+ fileDesc("CiJ2MS93b3JrbG9hZF9pZGVudGl0eV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSKyAgoQV29ya2xvYWRJZGVudGl0eRIRCgRuYW1lGAEgASgJQgPgQQMSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRISCgVlbWFpbBgDIAEoCUID4EEDEhcKBXRpdGxlGAQgASgJQgi6SAVyAxjIARI0CgtjcmVhdGVfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxJFChh3b3JrbG9hZF9pZGVudGl0eV9jb25maWcYBiABKAsyIy5ieXRlYmFzZS52MS5Xb3JrbG9hZElkZW50aXR5Q29uZmlnOj7qQTsKHWJ5dGViYXNlLmNvbS9Xb3JrbG9hZElkZW50aXR5Ehp3b3JrbG9hZElkZW50aXRpZXMve2VtYWlsfSKMAgoWV29ya2xvYWRJZGVudGl0eUNvbmZpZxJHCg1wcm92aWRlcl90eXBlGAEgASgOMjAuYnl0ZWJhc2UudjEuV29ya2xvYWRJZGVudGl0eUNvbmZpZy5Qcm92aWRlclR5cGUSEgoKaXNzdWVyX3VybBgCIAEoCRIZChFhbGxvd2VkX2F1ZGllbmNlcxgDIAMoCRIXCg9zdWJqZWN0X3BhdHRlcm4YBCABKAkSEAoIandrc191cmwYBSABKAkiTwoMUHJvdmlkZXJUeXBlEh0KGVBST1ZJREVSX1RZUEVfVU5TUEVDSUZJRUQQABIKCgZHSVRIVUIQARIKCgZHSVRMQUIQAhIICgRPSURDEAMirAEKHUNyZWF0ZVdvcmtsb2FkSWRlbnRpdHlSZXF1ZXN0EikKBnBhcmVudBgBIAEoCUIZ+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIhChR3b3JrbG9hZF9pZGVudGl0eV9pZBgCIAEoCUID4EECEj0KEXdvcmtsb2FkX2lkZW50aXR5GAMgASgLMh0uYnl0ZWJhc2UudjEuV29ya2xvYWRJZGVudGl0eUID4EECIlEKGkdldFdvcmtsb2FkSWRlbnRpdHlSZXF1ZXN0EjMKBG5hbWUYASABKAlCJeBBAvpBHwodYnl0ZWJhc2UuY29tL1dvcmtsb2FkSWRlbnRpdHkilwEKHUxpc3RXb3JrbG9hZElkZW50aXRpZXNSZXF1ZXN0EikKBnBhcmVudBgBIAEoCUIZ+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIUCgxzaG93X2RlbGV0ZWQYBCABKAgSDgoGZmlsdGVyGAUgASgJInUKHkxpc3RXb3JrbG9hZElkZW50aXRpZXNSZXNwb25zZRI6ChN3b3JrbG9hZF9pZGVudGl0aWVzGAEgAygLMh0uYnl0ZWJhc2UudjEuV29ya2xvYWRJZGVudGl0eRIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkijwEKHVVwZGF0ZVdvcmtsb2FkSWRlbnRpdHlSZXF1ZXN0Ej0KEXdvcmtsb2FkX2lkZW50aXR5GAEgASgLMh0uYnl0ZWJhc2UudjEuV29ya2xvYWRJZGVudGl0eUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzayJUCh1EZWxldGVXb3JrbG9hZElkZW50aXR5UmVxdWVzdBIzCgRuYW1lGAEgASgJQiXgQQL6QR8KHWJ5dGViYXNlLmNvbS9Xb3JrbG9hZElkZW50aXR5IlYKH1VuZGVsZXRlV29ya2xvYWRJZGVudGl0eVJlcXVlc3QSMwoEbmFtZRgBIAEoCUIl4EEC+kEfCh1ieXRlYmFzZS5jb20vV29ya2xvYWRJZGVudGl0eTLFCwoXV29ya2xvYWRJZGVudGl0eVNlcnZpY2USzwIKFkNyZWF0ZVdvcmtsb2FkSWRlbnRpdHkSKi5ieXRlYmFzZS52MS5DcmVhdGVXb3JrbG9hZElkZW50aXR5UmVxdWVzdBodLmJ5dGViYXNlLnYxLldvcmtsb2FkSWRlbnRpdHki6QHaQS1wYXJlbnQsd29ya2xvYWRfaWRlbnRpdHksd29ya2xvYWRfaWRlbnRpdHlfaWSK6jAcYmIud29ya2xvYWRJZGVudGl0aWVzLmNyZWF0ZZDqMAGY6jABoOowA6jqMAaC0+STAoIBOhF3b3JrbG9hZF9pZGVudGl0eVpBOhF3b3JrbG9hZF9pZGVudGl0eSIsL3YxL3twYXJlbnQ9d29ya3NwYWNlcy8qfS93b3JrbG9hZElkZW50aXRpZXMiKi92MS97cGFyZW50PXByb2plY3RzLyp9L3dvcmtsb2FkSWRlbnRpdGllcxK2AQoTR2V0V29ya2xvYWRJZGVudGl0eRInLmJ5dGViYXNlLnYxLkdldFdvcmtsb2FkSWRlbnRpdHlSZXF1ZXN0Gh0uYnl0ZWJhc2UudjEuV29ya2xvYWRJZGVudGl0eSJX2kEEbmFtZYrqMBliYi53b3JrbG9hZElkZW50aXRpZXMuZ2V0kOowAaDqMASo6jAJgtPkkwIhEh8vdjEve25hbWU9d29ya2xvYWRJZGVudGl0aWVzLyp9EokCChZMaXN0V29ya2xvYWRJZGVudGl0aWVzEiouYnl0ZWJhc2UudjEuTGlzdFdvcmtsb2FkSWRlbnRpdGllc1JlcXVlc3QaKy5ieXRlYmFzZS52MS5MaXN0V29ya2xvYWRJZGVudGl0aWVzUmVzcG9uc2UilQHaQQZwYXJlbnSK6jAaYmIud29ya2xvYWRJZGVudGl0aWVzLmxpc3SQ6jABoOowBKjqMAmC0+STAlxaLhIsL3YxL3twYXJlbnQ9d29ya3NwYWNlcy8qfS93b3JrbG9hZElkZW50aXRpZXMSKi92MS97cGFyZW50PXByb2plY3RzLyp9L3dvcmtsb2FkSWRlbnRpdGllcxKCAgoWVXBkYXRlV29ya2xvYWRJZGVudGl0eRIqLmJ5dGViYXNlLnYxLlVwZGF0ZVdvcmtsb2FkSWRlbnRpdHlSZXF1ZXN0Gh0uYnl0ZWJhc2UudjEuV29ya2xvYWRJZGVudGl0eSKcAdpBHXdvcmtsb2FkX2lkZW50aXR5LHVwZGF0ZV9tYXNriuowHGJiLndvcmtsb2FkSWRlbnRpdGllcy51cGRhdGWQ6jABmOowAaDqMAOo6jAGgtPkkwJGOhF3b3JrbG9hZF9pZGVudGl0eTIxL3YxL3t3b3JrbG9hZF9pZGVudGl0eS5uYW1lPXdvcmtsb2FkSWRlbnRpdGllcy8qfRK8AQoWRGVsZXRlV29ya2xvYWRJZGVudGl0eRIqLmJ5dGViYXNlLnYxLkRlbGV0ZVdvcmtsb2FkSWRlbnRpdHlSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5Il7aQQRuYW1liuowHGJiLndvcmtsb2FkSWRlbnRpdGllcy5kZWxldGWQ6jABmOowAaDqMASo6jAJgtPkkwIhKh8vdjEve25hbWU9d29ya2xvYWRJZGVudGl0aWVzLyp9Es4BChhVbmRlbGV0ZVdvcmtsb2FkSWRlbnRpdHkSLC5ieXRlYmFzZS52MS5VbmRlbGV0ZVdvcmtsb2FkSWRlbnRpdHlSZXF1ZXN0Gh0uYnl0ZWJhc2UudjEuV29ya2xvYWRJZGVudGl0eSJliuowHmJiLndvcmtsb2FkSWRlbnRpdGllcy51bmRlbGV0ZZDqMAGY6jABoOowBKjqMAmC0+STAi06ASoiKC92MS97bmFtZT13b3JrbG9hZElkZW50aXRpZXMvKn06dW5kZWxldGVCsgEKD2NvbS5ieXRlYmFzZS52MUIcV29ya2xvYWRJZGVudGl0eVNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common]);
/**
* Describes the message bytebase.v1.WorkloadIdentity.
@@ -39,7 +39,7 @@ export const WorkloadIdentityConfig_ProviderTypeSchema = /*@__PURE__*/
enumDesc(file_v1_workload_identity_service, 1, 0);
/**
- * ProviderType identifies the CI/CD platform.
+ * ProviderType identifies the workload identity configuration mode.
*
* @generated from enum bytebase.v1.WorkloadIdentityConfig.ProviderType
*/
diff --git a/frontend/src/utils/workloadIdentity.ts b/frontend/src/utils/workloadIdentity.ts
index 0c525dd8fd..8b67248348 100644
--- a/frontend/src/utils/workloadIdentity.ts
+++ b/frontend/src/utils/workloadIdentity.ts
@@ -57,13 +57,16 @@ export const parseWorkloadIdentitySubjectPattern = (wi: {
};
export const getWorkloadIdentityProviderText = (
- providerType: WorkloadIdentityConfig_ProviderType
+ providerType: WorkloadIdentityConfig_ProviderType,
+ genericOIDCText = ""
) => {
switch (providerType) {
case WorkloadIdentityConfig_ProviderType.GITHUB:
return "GitHub Actions";
case WorkloadIdentityConfig_ProviderType.GITLAB:
return "GitLab CI";
+ case WorkloadIdentityConfig_ProviderType.OIDC:
+ return genericOIDCText;
default:
return "";
}
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 756e4ea2a7..35f59db9a0 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -33686,7 +33686,7 @@ components:
properties:
providerType:
title: provider_type
- description: Platform type (currently only GITHUB is supported)
+ description: Provider configuration mode.
$ref: '#/components/schemas/bytebase.v1.WorkloadIdentityConfig.ProviderType'
issuerUrl:
type: string
@@ -33702,6 +33702,10 @@ components:
type: string
title: subject_pattern
description: Subject pattern to match (e.g., "repo:owner/repo:ref:refs/heads/main")
+ jwksUrl:
+ type: string
+ title: jwks_url
+ description: Optional JWKS endpoint. When empty, use OIDC discovery from issuer_url.
title: WorkloadIdentityConfig
additionalProperties: false
description: WorkloadIdentityConfig for API layer
@@ -33712,7 +33716,8 @@ components:
- PROVIDER_TYPE_UNSPECIFIED
- GITHUB
- GITLAB
- description: ProviderType identifies the CI/CD platform.
+ - OIDC
+ description: ProviderType identifies the workload identity configuration mode.
bytebase.v1.Workspace:
type: object
properties:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index 0c5b80c753..129d7a0d08 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -5908,10 +5908,11 @@ WorkloadIdentityConfig stores OIDC configuration for workload identity.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| provider_type | [WorkloadIdentityConfig.ProviderType](#bytebase-store-WorkloadIdentityConfig-ProviderType) | | Provider type (currently only GITHUB is supported) |
+| provider_type | [WorkloadIdentityConfig.ProviderType](#bytebase-store-WorkloadIdentityConfig-ProviderType) | | Provider configuration mode. |
| issuer_url | [string](#string) | | OIDC issuer URL |
| allowed_audiences | [string](#string) | repeated | Allowed audiences for token validation |
| subject_pattern | [string](#string) | | Subject pattern to match against token subject claim |
+| jwks_url | [string](#string) | | Optional JWKS endpoint. When empty, use OIDC discovery from issuer_url. |
@@ -5937,13 +5938,14 @@ PrincipalType is the type of a principal.
<a name="bytebase-store-WorkloadIdentityConfig-ProviderType"></a>
### WorkloadIdentityConfig.ProviderType
-ProviderType identifies the CI/CD platform.
+ProviderType identifies the workload identity configuration mode.
| Name | Number | Description |
| ---- | ------ | ----------- |
| PROVIDER_TYPE_UNSPECIFIED | 0 | |
| GITHUB | 1 | |
| GITLAB | 2 | |
+| OIDC | 3 | |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 280182c1d8..6d1ce105d0 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -15660,7 +15660,7 @@ Used to auto-select workspace on next login instead of requiring a workspace pic
<td>provider_type</td>
<td><a href="#bytebase.store.WorkloadIdentityConfig.ProviderType">WorkloadIdentityConfig.ProviderType</a></td>
<td></td>
- <td><p>Provider type (currently only GITHUB is supported) </p></td>
+ <td><p>Provider configuration mode. </p></td>
</tr>
<tr>
@@ -15684,6 +15684,13 @@ Used to auto-select workspace on next login instead of requiring a workspace pic
<td><p>Subject pattern to match against token subject claim </p></td>
</tr>
+ <tr>
+ <td>jwks_url</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>Optional JWKS endpoint. When empty, use OIDC discovery from issuer_url. </p></td>
+ </tr>
+
</tbody>
</table>
@@ -15729,7 +15736,7 @@ Used to auto-select workspace on next login instead of requiring a workspace pic
</table>
<h3 id="bytebase.store.WorkloadIdentityConfig.ProviderType">WorkloadIdentityConfig.ProviderType</h3>
- <p>ProviderType identifies the CI/CD platform.</p>
+ <p>ProviderType identifies the workload identity configuration mode.</p>
<table class="enum-table">
<thead>
<tr><td>Name</td><td>Number</td><td>Description</td></tr>
@@ -15754,6 +15761,12 @@ Used to auto-select workspace on next login instead of requiring a workspace pic
<td><p></p></td>
</tr>
+ <tr>
+ <td>OIDC</td>
+ <td>3</td>
+ <td><p></p></td>
+ </tr>
+
</tbody>
</table>
@@ -16044,4 +16057,3 @@ Used to auto-select workspace on next login instead of requiring a workspace pic
</table>
</body>
</html>
-
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index cc79f55941..1824902e3d 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -12748,10 +12748,11 @@ WorkloadIdentityConfig for API layer
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| provider_type | [WorkloadIdentityConfig.ProviderType](#bytebase-v1-WorkloadIdentityConfig-ProviderType) | | Platform type (currently only GITHUB is supported) |
+| provider_type | [WorkloadIdentityConfig.ProviderType](#bytebase-v1-WorkloadIdentityConfig-ProviderType) | | Provider configuration mode. |
| issuer_url | [string](#string) | | OIDC Issuer URL (auto-filled based on provider_type, can be overridden) |
| allowed_audiences | [string](#string) | repeated | Allowed audiences for token validation |
| subject_pattern | [string](#string) | | Subject pattern to match (e.g., &#34;repo:owner/repo:ref:refs/heads/main&#34;) |
+| jwks_url | [string](#string) | | Optional JWKS endpoint. When empty, use OIDC discovery from issuer_url. |
@@ -12763,13 +12764,14 @@ WorkloadIdentityConfig for API layer
<a name="bytebase-v1-WorkloadIdentityConfig-ProviderType"></a>
### WorkloadIdentityConfig.ProviderType
-ProviderType identifies the CI/CD platform.
+ProviderType identifies the workload identity configuration mode.
| Name | Number | Description |
| ---- | ------ | ----------- |
| PROVIDER_TYPE_UNSPECIFIED | 0 | |
| GITHUB | 1 | |
| GITLAB | 2 | |
+| OIDC | 3 | |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 4a2268ce98..351b313a03 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -36270,7 +36270,7 @@ For project-level: {name}@{project-id}.workload.bytebase.com </p></td>
<td>provider_type</td>
<td><a href="#bytebase.v1.WorkloadIdentityConfig.ProviderType">WorkloadIdentityConfig.ProviderType</a></td>
<td></td>
- <td><p>Platform type (currently only GITHUB is supported) </p></td>
+ <td><p>Provider configuration mode. </p></td>
</tr>
<tr>
@@ -36294,6 +36294,13 @@ For project-level: {name}@{project-id}.workload.bytebase.com </p></td>
<td><p>Subject pattern to match (e.g., &#34;repo:owner/repo:ref:refs/heads/main&#34;) </p></td>
</tr>
+ <tr>
+ <td>jwks_url</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>Optional JWKS endpoint. When empty, use OIDC discovery from issuer_url. </p></td>
+ </tr>
+
</tbody>
</table>
@@ -36304,7 +36311,7 @@ For project-level: {name}@{project-id}.workload.bytebase.com </p></td>
<h3 id="bytebase.v1.WorkloadIdentityConfig.ProviderType">WorkloadIdentityConfig.ProviderType</h3>
- <p>ProviderType identifies the CI/CD platform.</p>
+ <p>ProviderType identifies the workload identity configuration mode.</p>
<table class="enum-table">
<thead>
<tr><td>Name</td><td>Number</td><td>Description</td></tr>
@@ -36329,6 +36336,12 @@ For project-level: {name}@{project-id}.workload.bytebase.com </p></td>
<td><p></p></td>
</tr>
+ <tr>
+ <td>OIDC</td>
+ <td>3</td>
+ <td><p></p></td>
+ </tr>
+
</tbody>
</table>
@@ -37439,4 +37452,3 @@ Permissions required: bb.workspaces.rotateDirectorySyncToken</p></td>
</table>
</body>
</html>
-
diff --git a/proto/store/store/user.proto b/proto/store/store/user.proto
index d223e91946..7b69510a0a 100644
--- a/proto/store/store/user.proto
+++ b/proto/store/store/user.proto
@@ -48,14 +48,15 @@ message UserProfile {
// WorkloadIdentityConfig stores OIDC configuration for workload identity.
message WorkloadIdentityConfig {
- // ProviderType identifies the CI/CD platform.
+ // ProviderType identifies the workload identity configuration mode.
enum ProviderType {
PROVIDER_TYPE_UNSPECIFIED = 0;
GITHUB = 1;
GITLAB = 2;
+ OIDC = 3;
}
- // Provider type (currently only GITHUB is supported)
+ // Provider configuration mode.
ProviderType provider_type = 1;
// OIDC issuer URL
string issuer_url = 2;
@@ -63,4 +64,6 @@ message WorkloadIdentityConfig {
repeated string allowed_audiences = 3;
// Subject pattern to match against token subject claim
string subject_pattern = 4;
+ // Optional JWKS endpoint. When empty, use OIDC discovery from issuer_url.
+ string jwks_url = 5;
}
diff --git a/proto/v1/v1/workload_identity_service.proto b/proto/v1/v1/workload_identity_service.proto
index 81c897adc9..2496c50677 100644
--- a/proto/v1/v1/workload_identity_service.proto
+++ b/proto/v1/v1/workload_identity_service.proto
@@ -136,14 +136,15 @@ message WorkloadIdentity {
// WorkloadIdentityConfig for API layer
message WorkloadIdentityConfig {
- // ProviderType identifies the CI/CD platform.
+ // ProviderType identifies the workload identity configuration mode.
enum ProviderType {
PROVIDER_TYPE_UNSPECIFIED = 0;
GITHUB = 1;
GITLAB = 2;
+ OIDC = 3;
}
- // Platform type (currently only GITHUB is supported)
+ // Provider configuration mode.
ProviderType provider_type = 1;
// OIDC Issuer URL (auto-filled based on provider_type, can be overridden)
string issuer_url = 2;
@@ -151,6 +152,8 @@ message WorkloadIdentityConfig {
repeated string allowed_audiences = 3;
// Subject pattern to match (e.g., "repo:owner/repo:ref:refs/heads/main")
string subject_pattern = 4;
+ // Optional JWKS endpoint. When empty, use OIDC discovery from issuer_url.
+ string jwks_url = 5;
}
// Request message for creating a workload identity.