fix: minor bugfixes (#371)

cmd/migrate/root.go

@@ -0,0 +1,13 @@
+package migrate
+
+import "github.com/spf13/cobra"
+
+var migrateCmd = &cobra.Command{
+	Use: "migrate",
+}
+
+func RegisterCommandRecursive(parent *cobra.Command) {
+	migrateCmd.AddCommand(newStatusCmd(), newUpCmd())
+
+	parent.AddCommand(migrateCmd)
+}

cmd/migrate/status.go

@@ -0,0 +1,30 @@
+package migrate
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/ory/x/cmdx"
+	"github.com/ory/x/logrusx"
+	"github.com/spf13/cobra"
+
+	"github.com/ory/keto/internal/driver"
+)
+
+func newStatusCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use: "status",
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			ctx, cancel := context.WithCancel(context.Background())
+			defer cancel()
+
+			reg := driver.NewDefaultRegistry(ctx, logrusx.New("keto", "test"), cmd.Flags(), "test", "adf", "today")
+			if err := reg.Migrator().MigrationStatus(ctx, cmd.OutOrStdout()); err != nil {
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Could not get migration status: %+v\n", err)
+				return cmdx.FailSilently(cmd)
+			}
+			return nil
+		},
+	}
+	return cmd
+}

cmd/migrate/up.go

@@ -0,0 +1,30 @@
+package migrate
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/ory/x/cmdx"
+	"github.com/ory/x/logrusx"
+	"github.com/spf13/cobra"
+
+	"github.com/ory/keto/internal/driver"
+)
+
+func newUpCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use: "up",
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			ctx, cancel := context.WithCancel(context.Background())
+			defer cancel()
+
+			reg := driver.NewDefaultRegistry(ctx, logrusx.New("keto", "test"), cmd.Flags(), "test", "adf", "today")
+			if err := reg.Migrator().MigrateUp(ctx); err != nil {
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Could not apply migrations: %+v\n", err)
+				return cmdx.FailSilently(cmd)
+			}
+			return nil
+		},
+	}
+	return cmd
+}

cmd/root.go

@@ -22,6 +22,8 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/ory/keto/cmd/migrate"
+
 	"github.com/ory/x/cmdx"
 
 	"github.com/ory/keto/cmd/namespace"
@@ -67,7 +69,7 @@ func init() {
 	// Here you will define your flags and configuration settings.
 	// Cobra supports Persistent Flags, which, if defined here,
 	// will be global for your application.
-	RootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "Config file (default is $HOME/.keto.yaml)")
+	RootCmd.PersistentFlags().StringSlice("config", []string{}, "Config file (default is $HOME/.keto.yaml)")
 
 	// Cobra also supports local flags, which will only run
 	// when this action is called directly.
@@ -76,6 +78,8 @@ func init() {
 	relationtuple.RegisterCommandRecursive(RootCmd)
 
 	namespace.RegisterCommandsRecursive(RootCmd)
+
+	migrate.RegisterCommandRecursive(RootCmd)
 }
 
 // initConfig reads in config file and ENV variables if set.

internal/check/engine.go

@@ -34,6 +34,10 @@ func (e *Engine) subjectIsAllowed(ctx context.Context, requested *relationtuple.
 
 	var res bool
 	for _, sr := range rels {
+		// TODO move this to input validation
+		if requested.Subject == nil {
+			return false, fmt.Errorf("subject is unexpectedly nil for %+v", requested)
+		}
 		// we only have to check Subject here as we know that sr was reached from requested.ObjectID, requested.Relation through 0...n indirections
 		if requested.Subject.Equals(sr.Subject) {
 			// found the requested relation

internal/driver/config/provider.go

@@ -20,4 +20,4 @@ type Provider interface {
 	Set(key string, v interface{})
 }
 
-const DSNMemory = "memory"
+const DSNMemory = "sqlite://:memory:?_fk=true"

internal/driver/config/provider_koanf.go

@@ -118,7 +118,11 @@ func (k *KoanfProvider) CORS() (cors.Options, bool) {
 }
 
 func (k *KoanfProvider) DSN() string {
-	return k.p.StringF(KeyDSN, "memory")
+	dsn := k.p.StringF(KeyDSN, DSNMemory)
+	if dsn == "memory" {
+		return DSNMemory
+	}
+	return dsn
 }
 
 func (k *KoanfProvider) TracingServiceName() string {

internal/driver/registry.go

@@ -10,6 +10,7 @@ import (
 	"github.com/ory/keto/internal/check"
 	"github.com/ory/keto/internal/expand"
 	"github.com/ory/keto/internal/namespace"
+	"github.com/ory/keto/internal/persistence"
 	"github.com/ory/keto/internal/relationtuple"
 
 	"github.com/ory/keto/internal/x"
@@ -29,6 +30,8 @@ type Registry interface {
 	namespace.MigratorProvider
 	expand.EngineProvider
 	check.EngineProvider
+	persistence.MigratorProvider
+	persistence.Provider
 
 	HealthHandler() *healthx.Handler
 	Tracer() *tracing.Tracer

internal/driver/registry_default.go

@@ -112,13 +112,13 @@ func (r *RegistryDefault) Persister() persistence.Persister {
 	return r.p
 }
 
-func (r *RegistryDefault) Migrator() (persistence.Migrator, error) {
-	return r.p.(persistence.Migrator), nil
+func (r *RegistryDefault) Migrator() persistence.Migrator {
+	return r.p.(persistence.Migrator)
 }
 
 func (r *RegistryDefault) Init(ctx context.Context) error {
 	c, err := pop.NewConnection(&pop.ConnectionDetails{
-		URL: "sqlite://:memory:?_fk=true",
+		URL: r.c.DSN(),
 	})
 	if err != nil {
 		return errors.WithStack(err)
@@ -139,12 +139,11 @@ func (r *RegistryDefault) Init(ctx context.Context) error {
 		return err
 	}
 
-	m, err := r.Migrator()
-	if err != nil {
-		return err
-	}
-	if err := m.MigrateUp(context.Background()); err != nil {
-		return err
+	m := r.Migrator()
+	if r.c.DSN() == config.DSNMemory {
+		if err := m.MigrateUp(context.Background()); err != nil {
+			return err
+		}
 	}
 
 	namespaceConfigs, err := nm.Namespaces(ctx)

internal/persistence/definitions.go

@@ -3,20 +3,29 @@ package persistence
 import (
 	"context"
 	"errors"
+	"io"
 
 	"github.com/ory/keto/internal/namespace"
 
 	"github.com/ory/keto/internal/relationtuple"
 )
 
-type Persister interface {
-	relationtuple.Manager
-	namespace.Migrator
-}
-
-type Migrator interface {
-	MigrateUp(ctx context.Context) error
-}
+type (
+	Persister interface {
+		relationtuple.Manager
+		namespace.Migrator
+	}
+	Migrator interface {
+		MigrateUp(context.Context) error
+		MigrationStatus(context.Context, io.Writer) error
+	}
+	MigratorProvider interface {
+		Migrator() Migrator
+	}
+	Provider interface {
+		Persister() Persister
+	}
+)
 
 var (
 	ErrNamespaceUnknown   = errors.New("namespace unknown")

internal/persistence/sql/namespace.go

@@ -2,13 +2,15 @@ package sql
 
 import (
 	"context"
+	"database/sql"
 	"fmt"
 
 	"github.com/pkg/errors"
 
 	"github.com/gobuffalo/pop/v5"
 
 	"github.com/ory/keto/internal/namespace"
+	"github.com/ory/keto/internal/persistence"
 )
 
 type (
@@ -54,7 +56,8 @@ func (p *Persister) MigrateNamespaceUp(ctx context.Context, n *namespace.Namespa
 			ID:      n.ID,
 			Version: mostRecentSchemaVersion,
 		}
-		if err := c.Create(&nr); err != nil {
+
+		if err := c.RawQuery(fmt.Sprintf("INSERT INTO %s (id, schema_version) VALUES (?, ?)", nr.TableName()), nr.ID, nr.Version).Exec(); err != nil {
 			return errors.WithStack(err)
 		}
 
@@ -70,6 +73,10 @@ func (p *Persister) NamespaceFromName(ctx context.Context, name string) (*namesp
 func (p *Persister) NamespaceStatus(ctx context.Context, id int) (*namespace.Status, error) {
 	var n namespaceRow
 	if err := p.connection(ctx).Find(&n, id); err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return nil, persistence.ErrNamespaceUnknown
+		}
+
 		return nil, err
 	}
 

internal/persistence/sql/persister.go

@@ -3,6 +3,7 @@ package sql
 import (
 	"context"
 	"fmt"
+	"io"
 	"strconv"
 
 	"github.com/ory/keto/internal/namespace"
@@ -59,6 +60,10 @@ func (p *Persister) MigrateUp(_ context.Context) error {
 	return p.mb.Up()
 }
 
+func (p *Persister) MigrationStatus(_ context.Context, w io.Writer) error {
+	return p.mb.Status(w)
+}
+
 func (p *Persister) connection(ctx context.Context) *pop.Connection {
 	tx := ctx.Value(transactionContextKey)
 	if tx == nil {

internal/persistence/sql/relationtuples.go

@@ -63,10 +63,6 @@ func (r *relationTuple) toInternal() (*relationtuple.InternalRelationTuple, erro
 }
 
 func (p *Persister) GetRelationTuples(ctx context.Context, query *relationtuple.RelationQuery, options ...x.PaginationOptionSetter) ([]*relationtuple.InternalRelationTuple, string, error) {
-	pop.Debug = true
-	defer func() {
-		pop.Debug = false
-	}()
 	const (
 		whereRelation = "relation = ?"
 		whereObject   = "object = ?"

internal/relationtuple/definitions.go

@@ -213,10 +213,6 @@ func (r *InternalRelationTuple) ToGRPC() *acl.RelationTuple {
 }
 
 func (r *InternalRelationTuple) FromURLQuery(query url.Values) (*InternalRelationTuple, error) {
-	if r == nil {
-		r = &InternalRelationTuple{}
-	}
-
 	if s := query.Get("subject"); s != "" {
 		var err error
 		r.Subject, err = SubjectFromString(s)

internal/relationtuple/handler.go

@@ -77,6 +77,7 @@ func (h *handler) createRelation(w http.ResponseWriter, r *http.Request, _ httpr
 	}
 
 	if err := h.d.RelationTupleManager().WriteRelationTuples(r.Context(), &rel); err != nil {
+		h.d.Logger().WithError(err).WithField("relationtuple", rel).Errorf("got an error while creating the relation tuple")
 		h.d.Writer().WriteError(w, r, errors.WithStack(herodot.ErrInternalServerError))
 		return
 	}