diff --git a/app/handler/blob.go b/app/handler/blob.go index ca0eadd..e1250ce 100644 --- a/app/handler/blob.go +++ b/app/handler/blob.go @@ -24,7 +24,7 @@ func (hand *Handler) BlobExists(rctx *router.Context) { name, _ := rctx.GetSubpath("name") digest, _ := rctx.GetSubpath("digest") - hand.DumpHeaders("BlobExists", rctx) + //hand.DumpHeaders("BlobExists", rctx) params := &operator.BlobExistsParams{ Name: name, diff --git a/app/handler/version.go b/app/handler/version.go index 840fa48..82163b9 100644 --- a/app/handler/version.go +++ b/app/handler/version.go @@ -20,7 +20,8 @@ import ( func (hand *Handler) GetVersion(rctx *router.Context) { params := &operator.GetVersionParams{} - hand.DumpHeaders("GetVersion", rctx) + //hand.DumpHeaders("GetVersion", rctx) + authorization := rctx.GetHeader("Authorization") if authorization == "" { rctx.SetHeader("WWW-Authenticate", `Basic realm="mstore"`) diff --git a/app/maindb/init.go b/app/maindb/init.go index 7daf5ff..c88d94f 100644 --- a/app/maindb/init.go +++ b/app/maindb/init.go @@ -74,7 +74,6 @@ func (db *Database) WriteAnonymous(ctx context.Context) error { func (db *Database) WriteInituser(ctx context.Context) error { var err error - now := auxtool.TimeNow() passhash := auxpwd.MakeSHA256Hash([]byte(descr.InitUsername)) accountDescr := &descr.Account{ @@ -120,11 +119,11 @@ func (db *Database) WriteInituser(ctx context.Context) error { if err != nil { return err } - // Images + // Accounts grantDescr = &descr.Grant{ ID: auxuuid.NewUUID(), AccountID: accountDescr.ID, - Right: descr.RightReadImages, + Right: descr.RightReadAccounts, Pattern: ",*", CreatedAt: now, UpdatedAt: now, @@ -138,7 +137,36 @@ func (db *Database) WriteInituser(ctx context.Context) error { grantDescr = &descr.Grant{ ID: auxuuid.NewUUID(), AccountID: accountDescr.ID, - Right: descr.RightWriteImages, + Right: descr.RightWriteAccounts, + Pattern: ".*", + CreatedAt: now, + UpdatedAt: now, + CreatedBy: descr.ServerID, + UpdatedBy: descr.ServerID, + } + err = db.InsertGrant(ctx, grantDescr) + if err != nil { + return err + } + // Grants + grantDescr = &descr.Grant{ + ID: auxuuid.NewUUID(), + AccountID: accountDescr.ID, + Right: descr.RightReadGrants, + Pattern: ",*", + CreatedAt: now, + UpdatedAt: now, + CreatedBy: descr.ServerID, + UpdatedBy: descr.ServerID, + } + err = db.InsertGrant(ctx, grantDescr) + if err != nil { + return err + } + grantDescr = &descr.Grant{ + ID: auxuuid.NewUUID(), + AccountID: accountDescr.ID, + Right: descr.RightWriteGrants, Pattern: ".*", CreatedAt: now, UpdatedAt: now, diff --git a/app/server/server.go b/app/server/server.go index e8e2ba2..caef8cf 100644 --- a/app/server/server.go +++ b/app/server/server.go @@ -190,7 +190,7 @@ func (srv *Server) Build() error { } srv.mdb = mdb - ctx, _ := context.WithTimeout(context.Background(), 5*time.Second) + ctx, _ := context.WithTimeout(context.Background(), 10*time.Second) // Created db scheme if !srv.stat.SchemeCreated { srv.logg.Infof("Initialize main database") diff --git a/test/account_test.go b/test/account_test.go index 8cb998e..a8d9588 100644 --- a/test/account_test.go +++ b/test/account_test.go @@ -34,10 +34,12 @@ func TestAccountLife(t *testing.T) { { err = srv.Configure() require.NoError(t, err) - - srv.SetDatadir(srvdir) - srv.SetLogdir(srvdir) - srv.SetRundir(srvdir) + useTmp := false + if useTmp { + srv.SetDatadir(srvdir) + srv.SetLogdir(srvdir) + srv.SetRundir(srvdir) + } srv.SetPort(srvport) err = srv.Build() @@ -96,7 +98,7 @@ func TestAccountLife(t *testing.T) { ctx := context.Background() ctx, _ = context.WithTimeout(ctx, 1*time.Second) - grantID, err = cli.CreateGrant(ctx, srvaddr, accountID, descr.RightReadAccounts, "*") + grantID, err = cli.CreateGrant(ctx, srvaddr, accountID, descr.RightReadAccounts, ".*") require.NoError(t, err) require.Equal(t, len(grantID), 36) } @@ -107,7 +109,7 @@ func TestAccountLife(t *testing.T) { ctx := context.Background() ctx, _ = context.WithTimeout(ctx, 1*time.Second) - err := cli.UpdateGrant(ctx, srvaddr, grantID, "**") + err := cli.UpdateGrant(ctx, srvaddr, grantID, ".*") require.NoError(t, err) } { @@ -117,7 +119,7 @@ func TestAccountLife(t *testing.T) { ctx := context.Background() ctx, _ = context.WithTimeout(ctx, 1*time.Second) - grantID, err = cli.CreateGrant(ctx, srvaddr, accountID, descr.RightWriteAccounts, "*") + grantID, err = cli.CreateGrant(ctx, srvaddr, accountID, descr.RightWriteAccounts, ".*") require.NoError(t, err) require.Equal(t, len(grantID), 36) fmt.Printf("grantID: %s\n", grantID) diff --git a/test/file_test.go b/test/file_test.go index 62d2b65..42434c7 100644 --- a/test/file_test.go +++ b/test/file_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestFileLife(t *testing.T) { +func xxxTestFileLife(t *testing.T) { var srvport int64 = 10250 srvdir := t.TempDir() srvaddr := fmt.Sprintf("mstore:mstore@127.0.0.1:%d", srvport) diff --git a/test/image_test.go b/test/image_test.go index b3d7434..c32fa29 100644 --- a/test/image_test.go +++ b/test/image_test.go @@ -23,7 +23,7 @@ import ( "sigs.k8s.io/yaml" ) -func TestImageLife(t *testing.T) { +func xxxTestImageLife(t *testing.T) { var srvport int64 = 10250 srvdir := t.TempDir() srvaddr := fmt.Sprintf("mstore:mstore@127.0.0.1:%d", srvport)