From 83f0d5597d2d2f69f08c162cd3e38d45db262eef Mon Sep 17 00:00:00 2001 From: Eugene K Date: Wed, 15 Sep 2021 15:52:53 -0400 Subject: [PATCH 1/2] add wildcard domain to intercept addresses configuration --- controller/persistence/migration_initialize.go | 5 +++++ controller/persistence/migrations.go | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/controller/persistence/migration_initialize.go b/controller/persistence/migration_initialize.go index 72091e48e..e5dfb1114 100644 --- a/controller/persistence/migration_initialize.go +++ b/controller/persistence/migration_initialize.go @@ -276,6 +276,10 @@ var tunnelDefinitions = map[string]interface{}{ "format": "hostname", "not": map[string]interface{}{"$ref": "#/definitions/ipAddressFormat"}, }, + "wildcardDomain": map[string]interface{}{ + "type": "string", + "pattern": "^\\*\\.(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$", + }, "cidr": map[string]interface{}{ "type": "string", "oneOf": []interface{}{ @@ -297,6 +301,7 @@ var tunnelDefinitions = map[string]interface{}{ "oneOf": []interface{}{ map[string]interface{}{"$ref": "#/definitions/ipAddress"}, map[string]interface{}{"$ref": "#/definitions/hostname"}, + map[string]interface{}{"$ref": "#/definitions/wildcardDomain"}, map[string]interface{}{"$ref": "#/definitions/cidr"}, }, }, diff --git a/controller/persistence/migrations.go b/controller/persistence/migrations.go index 7d5c87281..a0b67a7bf 100644 --- a/controller/persistence/migrations.go +++ b/controller/persistence/migrations.go @@ -22,7 +22,7 @@ import ( ) const ( - CurrentDbVersion = 24 + CurrentDbVersion = 25 FieldVersion = "version" ) @@ -96,14 +96,18 @@ func (m *Migrations) migrate(step *boltz.MigrationStep) int { step.SetError(m.stores.ConfigType.Update(step.Ctx, hostV2ConfigType, nil)) } - if step.CurrentVersion < 23 { + if step.CurrentVersion < 23 { m.addProcessMultiPostureCheck(step) - } + } if step.CurrentVersion < 24 { m.addIdentityIdToSessions(step) } + if step.CurrentVersion < 25 { + step.SetError(m.stores.ConfigType.Update(step.Ctx, interceptV1ConfigType, nil)) + } + // current version if step.CurrentVersion <= CurrentDbVersion { return CurrentDbVersion From c9e7d2f4c72238ba901aa878122f1c7dd23fff8a Mon Sep 17 00:00:00 2001 From: Eugene K Date: Wed, 15 Sep 2021 15:57:39 -0400 Subject: [PATCH 2/2] update host configs as well to pickup wildcardDomain addition --- controller/persistence/migrations.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/controller/persistence/migrations.go b/controller/persistence/migrations.go index a0b67a7bf..234ef92bb 100644 --- a/controller/persistence/migrations.go +++ b/controller/persistence/migrations.go @@ -106,6 +106,9 @@ func (m *Migrations) migrate(step *boltz.MigrationStep) int { if step.CurrentVersion < 25 { step.SetError(m.stores.ConfigType.Update(step.Ctx, interceptV1ConfigType, nil)) + step.SetError(m.stores.ConfigType.Update(step.Ctx, hostV1ConfigType, nil)) + step.SetError(m.stores.ConfigType.Update(step.Ctx, hostV2ConfigType, nil)) + } // current version