Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/add revoke logic to grant pr1 #207

Merged
merged 3 commits into from
Jan 13, 2025
Merged

Feature/add revoke logic to grant pr1 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f2a496
added one field for Grant resource revokePublicOnDb and one field for…
olikyr Aug 15, 2024
c77cdc7
refactored IsPrivate to RevokePublicOnSchema
olikyr Jan 10, 2025
4125a76
commit after make generate
olikyr Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apis/postgresql/v1alpha1/grant_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@ type GrantParameters struct {
// +immutable
// +optional
MemberOfSelector *xpv1.Selector `json:"memberOfSelector,omitempty"`

// RevokePublicOnDb apply the statement "REVOKE ALL ON DATABASE %s FROM PUBLIC" to make database unreachable from public
// +optional
RevokePublicOnDb *bool `json:"revokePublicOnDb,omitempty" default:"false"`
}

// A GrantStatus represents the observed state of a Grant.
Expand Down
4 changes: 4 additions & 0 deletions apis/postgresql/v1alpha1/schema_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ type SchemaParameters struct {
// +immutable
// +optional
DatabaseSelector *xpv1.Selector `json:"databaseSelector,omitempty"`

// RevokePublicOnSchema apply a "REVOKE ALL ON SCHEMA public FROM public" statement
// +optional
RevokePublicOnSchema *bool `json:"revokePublicOnSchema,omitempty" default:"false"`
}

// A SchemaStatus represents the observed state of a Schema.
Expand Down
10 changes: 10 additions & 0 deletions apis/postgresql/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions package/crds/postgresql.sql.crossplane.io_grants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,11 @@ spec:
type: string
minItems: 1
type: array
revokePublicOnDb:
description: RevokePublicOnDb apply the statement "REVOKE ALL
ON DATABASE %s FROM PUBLIC" to make database unreachable from
public
type: boolean
role:
description: Role this grant is for.
type: string
Expand Down
4 changes: 4 additions & 0 deletions package/crds/postgresql.sql.crossplane.io_schemas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ spec:
type: string
type: object
type: object
revokePublicOnSchema:
description: RevokePublicOnSchema apply a "REVOKE ALL ON SCHEMA
public FROM public" statement
type: boolean
role:
description: Role for ownership of this schema.
type: string
Expand Down
8 changes: 8 additions & 0 deletions pkg/controller/postgresql/grant/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,14 @@ func createGrantQueries(gp v1alpha1.GrantParameters, ql *[]xsql.Query) error { /
withOption(gp.WithOption),
)},
)
if gp.RevokePublicOnDb != nil && *gp.RevokePublicOnDb {
*ql = append(*ql,
// REVOKE FROM PUBLIC
xsql.Query{String: fmt.Sprintf("REVOKE ALL ON DATABASE %s FROM PUBLIC",
db,
)},
)
}
return nil
}
return errors.New(errUnknownGrant)
Expand Down
66 changes: 52 additions & 14 deletions pkg/controller/postgresql/schema/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,16 +167,14 @@ func (c *external) Create(ctx context.Context, mg resource.Managed) (managed.Ext
return managed.ExternalCreation{}, errors.New(errNotSchema)
}

var b strings.Builder
b.WriteString("CREATE SCHEMA IF NOT EXISTS ")
b.WriteString(pq.QuoteIdentifier(meta.GetExternalName(cr)))
var queries []xsql.Query

if cr.Spec.ForProvider.Role != nil {
b.WriteString(" AUTHORIZATION ")
b.WriteString(pq.QuoteIdentifier(*cr.Spec.ForProvider.Role))
}
cr.SetConditions(xpv1.Creating())

return managed.ExternalCreation{}, errors.Wrap(c.db.Exec(ctx, xsql.Query{String: b.String()}), errCreateSchema)
createSchemaQueries(cr.Spec.ForProvider, &queries, meta.GetExternalName(cr))

err := c.db.ExecTx(ctx, queries)
return managed.ExternalCreation{}, errors.Wrap(err, errCreateSchema)
}

func (c *external) Update(ctx context.Context, mg resource.Managed) (managed.ExternalUpdate, error) { //nolint:gocyclo
Expand All @@ -189,13 +187,10 @@ func (c *external) Update(ctx context.Context, mg resource.Managed) (managed.Ext
return managed.ExternalUpdate{}, nil
}

var b strings.Builder
b.WriteString("ALTER SCHEMA ")
b.WriteString(pq.QuoteIdentifier(meta.GetExternalName(mg)))
b.WriteString(" OWNER TO ")
b.WriteString(pq.QuoteIdentifier(*cr.Spec.ForProvider.Role))
var queries []xsql.Query
updateSchemaQueries(cr.Spec.ForProvider, &queries, meta.GetExternalName(cr))

err := c.db.Exec(ctx, xsql.Query{String: b.String()})
err := c.db.ExecTx(ctx, queries)
return managed.ExternalUpdate{}, errors.Wrap(err, errAlterSchema)
}

Expand Down Expand Up @@ -226,3 +221,46 @@ func lateInit(observed v1alpha1.SchemaParameters, desired *v1alpha1.SchemaParame

return li
}

func createSchemaQueries(sp v1alpha1.SchemaParameters, ql *[]xsql.Query, en string) { // nolint: gocyclo

var b strings.Builder
b.WriteString("CREATE SCHEMA IF NOT EXISTS ")
b.WriteString(pq.QuoteIdentifier(en))

if sp.Role != nil {
b.WriteString(" AUTHORIZATION ")
b.WriteString(pq.QuoteIdentifier(*sp.Role))
b.WriteString(";")
}

*ql = append(*ql,
xsql.Query{String: b.String()},
)

if sp.RevokePublicOnSchema != nil && *sp.RevokePublicOnSchema {
*ql = append(*ql,
xsql.Query{String: "REVOKE ALL ON SCHEMA PUBLIC FROM PUBLIC;"},
)
}

}

func updateSchemaQueries(sp v1alpha1.SchemaParameters, ql *[]xsql.Query, en string) { // nolint: gocyclo

var b strings.Builder
b.WriteString("ALTER SCHEMA ")
b.WriteString(pq.QuoteIdentifier(en))
b.WriteString(" OWNER TO ")
b.WriteString(pq.QuoteIdentifier(*sp.Role))

*ql = append(*ql,
xsql.Query{String: b.String()},
)

if sp.RevokePublicOnSchema != nil && *sp.RevokePublicOnSchema {
*ql = append(*ql,
xsql.Query{String: "REVOKE ALL ON SCHEMA PUBLIC FROM PUBLIC;"},
)
}
}
6 changes: 3 additions & 3 deletions pkg/controller/postgresql/schema/reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ func TestCreate(t *testing.T) {
reason: "Any errors encountered while creating the schema should be returned",
fields: fields{
db: &mockDB{
MockExec: func(ctx context.Context, q xsql.Query) error { return errBoom },
MockExecTx: func(ctx context.Context, ql []xsql.Query) error { return errBoom },
},
},
args: args{
Expand All @@ -387,7 +387,7 @@ func TestCreate(t *testing.T) {
reason: "No error should be returned when we successfully create a extension",
fields: fields{
db: &mockDB{
MockExec: func(ctx context.Context, q xsql.Query) error { return nil },
MockExecTx: func(ctx context.Context, ql []xsql.Query) error { return nil },
},
},
args: args{
Expand Down Expand Up @@ -457,7 +457,7 @@ func TestUpdate(t *testing.T) {
reason: "No error should be returned when we successfully update a schema",
fields: fields{
db: &mockDB{
MockExec: func(ctx context.Context, q xsql.Query) error { return nil },
MockExecTx: func(ctx context.Context, ql []xsql.Query) error { return nil },
},
},
args: args{
Expand Down
Loading