REST file import endpoint

node/impl/client/client.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"golang.org/x/xerrors"
+	"io"
 	"os"
 
 	"github.com/ipfs/go-blockservice"
@@ -213,6 +214,30 @@ func (a *API) ClientImport(ctx context.Context, path string) (cid.Cid, error) {
 	return nd.Cid(), bufferedDS.Commit()
 }
 
+func (a *API) ClientImportLocal(ctx context.Context, f io.Reader) (cid.Cid, error) {
+	file := files.NewReaderFile(f)
+
+	bufferedDS := ipld.NewBufferedDAG(ctx, a.LocalDAG)
+
+	params := ihelper.DagBuilderParams{
+		Maxlinks:   build.UnixfsLinksPerLevel,
+		RawLeaves:  true,
+		CidBuilder: nil,
+		Dagserv:    bufferedDS,
+	}
+
+	db, err := params.New(chunker.NewSizeSplitter(file, int64(build.UnixfsChunkSize)))
+	if err != nil {
+		return cid.Undef, err
+	}
+	nd, err := balanced.Layout(db)
+	if err != nil {
+		return cid.Undef, err
+	}
+
+	return nd.Cid(), bufferedDS.Commit()
+}
+
 func (a *API) ClientListImports(ctx context.Context) ([]api.Import, error) {
 	if a.Filestore == nil {
 		return nil, errors.New("listing imports is not supported with in-memory dag yet")

node/impl/common.go

@@ -27,7 +27,7 @@ type jwtPayload struct {
 	Allow []string
 }
 
-func (a *CommonAPI) AuthVerify(ctx context.Context, token string) ([]string, error) {
+func (a *CommonAPI) AuthVerify(ctx context.Context, token string) ([]api.Permission, error) {
 	var payload jwtPayload
 	if _, err := jwt.Verify([]byte(token), (*jwt.HMACSHA)(a.APISecret), &payload); err != nil {
 		return nil, xerrors.Errorf("JWT Verification failed: %w", err)
@@ -36,7 +36,7 @@ func (a *CommonAPI) AuthVerify(ctx context.Context, token string) ([]string, err
 	return payload.Allow, nil
 }
 
-func (a *CommonAPI) AuthNew(ctx context.Context, perms []string) ([]byte, error) {
+func (a *CommonAPI) AuthNew(ctx context.Context, perms []api.Permission) ([]byte, error) {
 	p := jwtPayload{
 		Allow: perms, // TODO: consider checking validity
 	}