ziggi/mstore
1
0
Fork 0
Code Pull Requests Actions Packages Projects Releases Wiki Activity

working commit

Browse Source
This commit is contained in:
Олег Бородин
2026-02-14 22:09:19 +02:00
parent 3b6be8033e
commit 1e03fa349f
7 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/handler/blob.go
+1 -1
View File
@@ -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,
app/handler/version.go
+2 -1
View File
@@ -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"`)
app/maindb/init.go
+32 -4
View File
@@ -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,
app/server/server.go
+1 -1
View File
@@ -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")
test/account_test.go
+9 -7
View File
@@ -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)
test/file_test.go
+1 -1
View File
@@ -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)
test/image_test.go
+1 -1
View File
@@ -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)