[v11.3.x] MigrationAssistant: Restrict dashboards, folders and datasources by the org id of the signed in user (#96345)
apply security patch: v11.3.x/194-202410181505.patch
This commit is contained in:
@@ -21,6 +21,7 @@ var (
|
||||
// CloudMigrationSession represents a configured migration token
|
||||
type CloudMigrationSession struct {
|
||||
ID int64 `xorm:"pk autoincr 'id'"`
|
||||
OrgID int64 `xorm:"org_id"`
|
||||
UID string `xorm:"uid"`
|
||||
AuthToken string
|
||||
Slug string
|
||||
@@ -126,6 +127,8 @@ type CloudMigrationRunList struct {
|
||||
|
||||
type CloudMigrationSessionRequest struct {
|
||||
AuthToken string
|
||||
// OrgId in the on prem instance
|
||||
OrgID int64
|
||||
}
|
||||
|
||||
type CloudMigrationSessionResponse struct {
|
||||
@@ -141,6 +144,7 @@ type CloudMigrationSessionListResponse struct {
|
||||
|
||||
type GetSnapshotsQuery struct {
|
||||
SnapshotUID string
|
||||
OrgID int64
|
||||
SessionUID string
|
||||
ResultPage int
|
||||
ResultLimit int
|
||||
@@ -148,6 +152,7 @@ type GetSnapshotsQuery struct {
|
||||
|
||||
type ListSnapshotsQuery struct {
|
||||
SessionUID string
|
||||
OrgID int64
|
||||
Page int
|
||||
Limit int
|
||||
Sort string
|
||||
@@ -171,13 +176,14 @@ type Base64EncodedTokenPayload struct {
|
||||
Instance Base64HGInstance
|
||||
}
|
||||
|
||||
func (p Base64EncodedTokenPayload) ToMigration() CloudMigrationSession {
|
||||
func (p Base64EncodedTokenPayload) ToMigration(orgID int64) CloudMigrationSession {
|
||||
return CloudMigrationSession{
|
||||
AuthToken: p.Token,
|
||||
Slug: p.Instance.Slug,
|
||||
StackID: p.Instance.StackID,
|
||||
RegionSlug: p.Instance.RegionSlug,
|
||||
ClusterSlug: p.Instance.ClusterSlug,
|
||||
OrgID: orgID,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user