public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auth: Attach external session info to Grafana session (#93849)

Browse Source 
* initial from poc changes

* wip

* Remove public external session service

* Update swagger

* Fix merge

* Cleanup

* Add backgroud service for cleanup

* Add auth_module to user_external_session

* Add tests for token revocation functions

* Add secret migration capabilities for user_external_session fields

* Cleanup, refactor to address feedback

* Fix test
This commit is contained in:
Misi
2024-10-08 11:03:29 +02:00
committed by GitHub
parent 9eea0e99fc
commit bd7850853e
26 changed files with 1419 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/migrations/externalsession/migrations.go
+31
View File
@@ -0,0 +1,31 @@
package externalsession
import "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
func AddMigration(mg *migrator.Migrator) {
externalSessionV1 := migrator.Table{
Name: "user_external_session",
Columns: []*migrator.Column{
{Name: "id", Type: migrator.DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
{Name: "user_auth_id", Type: migrator.DB_BigInt, Nullable: false},
{Name: "user_id", Type: migrator.DB_BigInt, Nullable: false},
{Name: "auth_module", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
{Name: "access_token", Type: migrator.DB_Text, Nullable: true},
{Name: "id_token", Type: migrator.DB_Text, Nullable: true},
{Name: "refresh_token", Type: migrator.DB_Text, Nullable: true},
{Name: "session_id", Type: migrator.DB_NVarchar, Length: 255, Nullable: true},
{Name: "session_id_hash", Type: migrator.DB_Char, Length: 44, Nullable: true},
{Name: "name_id", Type: migrator.DB_NVarchar, Length: 255, Nullable: true},
{Name: "name_id_hash", Type: migrator.DB_Char, Length: 44, Nullable: true},
{Name: "expires_at", Type: migrator.DB_DateTime, Nullable: true},
{Name: "created_at", Type: migrator.DB_DateTime, Nullable: false},
},
Indices: []*migrator.Index{
{Cols: []string{"user_id"}},
{Cols: []string{"session_id_hash"}},
{Cols: []string{"name_id_hash"}},
},
}
mg.AddMigration("create user_external_session table", migrator.NewAddTableMigration(externalSessionV1))
}
pkg/services/sqlstore/migrations/migrations.go
+3
View File
@@ -5,6 +5,7 @@ import (
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations/accesscontrol"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations/anonservice"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations/externalsession"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations/signingkeys"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations/ssosettings"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations/ualert"
@@ -135,6 +136,8 @@ func (oss *OSSMigrations) AddMigration(mg *Migrator) {
accesscontrol.AddOrphanedMigrations(mg)
accesscontrol.AddActionSetPermissionsMigrator(mg)
externalsession.AddMigration(mg)
}
func addStarMigrations(mg *Migrator) {
pkg/services/sqlstore/migrations/user_auth_token_mig.go
+4
View File
@@ -48,4 +48,8 @@ func addUserAuthTokenMigrations(mg *Migrator) {
mg.AddMigration("add index user_auth_token.revoked_at", NewAddIndexMigration(userAuthTokenV1, &Index{
Cols: []string{"revoked_at"},
}))
mg.AddMigration("add external_session_id to user_auth_token", NewAddColumnMigration(userAuthTokenV1, &Column{
Name: "external_session_id", Type: DB_BigInt, Nullable: true,
}))
}