Browse Source

format

pull/7160/head
chrislu 1 month ago
parent
commit
8af7596ab1
  1. 2
      weed/iam/oidc/mock_provider.go
  2. 12
      weed/s3api/s3_multipart_iam.go
  3. 10
      weed/s3api/s3_policy_templates.go
  4. 4
      weed/s3api/s3_policy_templates_test.go

2
weed/iam/oidc/mock_provider.go

@ -148,7 +148,7 @@ func (m *MockOIDCProvider) SetupDefaultTestData() {
// Add multiple token variants for compatibility
m.AddTestToken("valid_token", defaultClaims)
m.AddTestToken("valid-oidc-token", defaultClaims) // For integration tests
m.AddTestToken("valid-oidc-token", defaultClaims) // For integration tests
m.AddTestToken("valid_test_token", defaultClaims) // For STS tests
// Add default test users

12
weed/s3api/s3_multipart_iam.go

@ -51,12 +51,12 @@ type MultipartUploadPolicy struct {
type MultipartOperation string
const (
MultipartOpInitiate MultipartOperation = "initiate"
MultipartOpUploadPart MultipartOperation = "upload_part"
MultipartOpComplete MultipartOperation = "complete"
MultipartOpAbort MultipartOperation = "abort"
MultipartOpList MultipartOperation = "list"
MultipartOpListParts MultipartOperation = "list_parts"
MultipartOpInitiate MultipartOperation = "initiate"
MultipartOpUploadPart MultipartOperation = "upload_part"
MultipartOpComplete MultipartOperation = "complete"
MultipartOpAbort MultipartOperation = "abort"
MultipartOpList MultipartOperation = "list"
MultipartOpListParts MultipartOperation = "list_parts"
)
// ValidateMultipartOperationWithIAM validates multipart operations using IAM policies

10
weed/s3api/s3_policy_templates.go

@ -416,11 +416,11 @@ func formatHour(hour int) string {
// PolicyTemplateDefinition represents metadata about a policy template
type PolicyTemplateDefinition struct {
Name string `json:"name"`
Description string `json:"description"`
Category string `json:"category"`
UseCase string `json:"use_case"`
Parameters []PolicyTemplateParam `json:"parameters,omitempty"`
Name string `json:"name"`
Description string `json:"description"`
Category string `json:"category"`
UseCase string `json:"use_case"`
Parameters []PolicyTemplateParam `json:"parameters,omitempty"`
Policy *policy.PolicyDocument `json:"policy"`
}

4
weed/s3api/s3_policy_templates_test.go

@ -170,8 +170,8 @@ func TestIPRestrictedPolicy(t *testing.T) {
func TestTimeBasedAccessPolicy(t *testing.T) {
templates := NewS3PolicyTemplates()
startHour := 9 // 9 AM
endHour := 17 // 5 PM
startHour := 9 // 9 AM
endHour := 17 // 5 PM
policy := templates.GetTimeBasedAccessPolicy(startHour, endHour)

Loading…
Cancel
Save