0ct0pu5/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Oidc: Improve config internals & adapt tests #782

Browse source
This commit is contained in:
Timo Volkmann 2021-11-03 20:28:37 +01:00
parent 16eb023d89
commit 2ae440d1d1
7 changed files with 38 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
internal/api/api_test.go
View file

@ -26,6 +26,15 @@ func NewApiTest() (app *gin.Engine, router *gin.RouterGroup, conf *config.Config
return app, router, service.Config()
}
// NewApiTestWithOIDC returns new API test helper configured for OIDC.
func NewApiTestWithOIDC() (app *gin.Engine, router *gin.RouterGroup, conf *config.Config) {
app, router, conf = NewApiTest()
conf.Options().OidcIssuerUrl = "http://dummy-oidc:9998"
conf.Options().OidcClientID = "native"
conf.Options().OidcClientSecret = "random"
return app, router, conf
}
// AuthenticateAdmin Register session routes and returns valid SessionId.
// Call this func after registering other routes and before performing other requests.
func AuthenticateAdmin(app *gin.Engine, router *gin.RouterGroup) (sessId string) {

2
internal/api/auth.go
View file

@ -14,7 +14,7 @@ import (
// GET /api/v1/auth/
func AuthEndpoints(router *gin.RouterGroup) {
conf := service.Config()
if conf.OidcIssuerUrl() == nil || conf.OidcClientId() == "" || conf.OidcClientSecret() == "" {
if conf.OidcIssuerUrl().String() == "" || conf.OidcClientId() == "" || conf.OidcClientSecret() == "" {
log.Debugf("no oidc provider configured. skip mounting endpoints")
return
}

4
internal/api/auth_test.go
View file

@ -12,7 +12,7 @@ import (
func TestAuthEndpoints(t *testing.T) {
t.Run("successful oidc authentication", func(t *testing.T) {
app, router, _ := NewApiTest()
app, router, _ := NewApiTestWithOIDC()
AuthEndpoints(router)
// Step 1a: Request AuthURL
@ -55,7 +55,7 @@ func TestAuthEndpoints(t *testing.T) {
})
t.Run("oidc authentication: missing cookie", func(t *testing.T) {
app, router, _ := NewApiTest()
app, router, _ := NewApiTestWithOIDC()
AuthEndpoints(router)
// Step 1a: Request AuthURL

2
internal/api/session.go
View file

@ -66,7 +66,7 @@ func CreateSession(router *gin.RouterGroup) {
return
}
oidcEnabled := conf.OidcIssuerUrl() != nil && conf.OidcClientId() != "" && conf.OidcClientSecret() != ""
oidcEnabled := conf.OidcIssuerUrl().String() == "" && conf.OidcClientId() != "" && conf.OidcClientSecret() != ""
if user.ID != entity.Admin.ID && oidcEnabled && !user.External() {
log.Warn("Internal users are disabled when using OpenID Connect")
c.AbortWithStatusJSON(400, gin.H{"error": i18n.Msg(i18n.ErrInvalidCredentials)})

2
internal/commands/users.go
View file

@ -288,7 +288,7 @@ func usersUpdateAction(ctx *cli.Context) error {
func callWithDependencies(ctx *cli.Context, f func(conf *config.Config) error) error {
conf := config.NewConfig(ctx)
if conf.OidcIssuerUrl() != nil && conf.OidcClientId() != "" && conf.OidcClientSecret() != "" {
if conf.OidcIssuerUrl().String() == "" && conf.OidcClientId() != "" && conf.OidcClientSecret() != "" {
log.Warn("Internal users are disabled when using OpenID Connect")
}

4
internal/config/oidc.go
View file

@ -4,12 +4,12 @@ import "net/url"
func (c *Config) OidcIssuerUrl() *url.URL {
if c.Options().OidcIssuerUrl == "" {
return nil
return new(url.URL)
}
res, err := url.Parse(c.Options().OidcIssuerUrl)
if err != nil {
log.Debugf("error parsing oidc issuer url: %q", err)
return nil
return new(url.URL)
}
return res
}

47
internal/config/test.go
View file

@ -52,31 +52,28 @@ func NewTestOptions() *Options {
}
c := &Options{
Name: "PhotoPrism",
Version: "0.0.0",
Copyright: "(c) 2018-2021 Michael Mayer",
Debug: true,
Public: true,
Experimental: true,
ReadOnly: false,
DetectNSFW: true,
UploadNSFW: false,
AssetsPath: assetsPath,
AutoIndex: -1,
AutoImport: 7200,
StoragePath: testDataPath,
CachePath: testDataPath + "/cache",
OriginalsPath: testDataPath + "/originals",
ImportPath: testDataPath + "/import",
TempPath: testDataPath + "/temp",
ConfigPath: testDataPath + "/config",
SidecarPath: testDataPath + "/sidecar",
DatabaseDriver: dbDriver,
DatabaseDsn: dbDsn,
AdminPassword: "photoprism",
OidcIssuerUrl: "http://dummy-oidc:9998",
OidcClientID: "native",
OidcClientSecret: "random",
Name: "PhotoPrism",
Version: "0.0.0",
Copyright: "(c) 2018-2021 Michael Mayer",
Debug: true,
Public: true,
Experimental: true,
ReadOnly: false,
DetectNSFW: true,
UploadNSFW: false,
AssetsPath: assetsPath,
AutoIndex: -1,
AutoImport: 7200,
StoragePath: testDataPath,
CachePath: testDataPath + "/cache",
OriginalsPath: testDataPath + "/originals",
ImportPath: testDataPath + "/import",
TempPath: testDataPath + "/temp",
ConfigPath: testDataPath + "/config",
SidecarPath: testDataPath + "/sidecar",
DatabaseDriver: dbDriver,
DatabaseDsn: dbDsn,
AdminPassword: "photoprism",
}
return c