Skip to content

Fix/public share issue #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 5, 2022
Merged

Fix/public share issue #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28eb8f7
Fix expiration issue, add default 90 days to public share
lpoli Feb 5, 2022
19e1fd0
Remove redundant and erroneous checking
lpoli Feb 5, 2022
693672e
Modify . import issue
lpoli Feb 5, 2022
7f89934
Remove redundant allocationID retrieval
lpoli Feb 5, 2022
1569458
Move condition checking
lpoli Feb 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 11 additions & 20 deletions code/go/0chain.net/blobbercore/handler/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,8 @@ func RevokeShare(ctx context.Context, r *http.Request) (interface{}, error) {
}

sign := r.Header.Get(common.ClientSignatureHeader)
allocation, ok := mux.Vars(r)["allocation"]
if !ok {
return false, common.NewError("invalid_params", "Missing allocation tx")
}
valid, err := verifySignatureFromRequest(allocation, sign, allocationObj.OwnerPublicKey)

valid, err := verifySignatureFromRequest(allocationID, sign, allocationObj.OwnerPublicKey)
if !valid || err != nil {
return nil, common.NewError("invalid_signature", "Invalid signature")
}
Expand All @@ -421,10 +418,12 @@ func RevokeShare(ctx context.Context, r *http.Request) (interface{}, error) {
if err != nil {
return nil, common.NewError("invalid_parameters", "Invalid file path. "+err.Error())
}

clientID := ctx.Value(constants.ContextKeyClient).(string)
if clientID != allocationObj.OwnerID {
return nil, common.NewError("invalid_operation", "Operation needs to be performed by the owner of the allocation")
}

err = reference.DeleteShareInfo(ctx, &reference.ShareInfo{
ClientID: refereeClientID,
FilePathHash: filePathHash,
Expand All @@ -436,9 +435,11 @@ func RevokeShare(ctx context.Context, r *http.Request) (interface{}, error) {
}
return resp, nil
}

if err != nil {
return nil, err
}

resp := map[string]interface{}{
"status": http.StatusNoContent,
"message": "Path successfully removed from allocation",
Expand All @@ -456,11 +457,8 @@ func InsertShare(ctx context.Context, r *http.Request) (interface{}, error) {
}

sign := r.Header.Get(common.ClientSignatureHeader)
allocation, ok := mux.Vars(r)["allocation"]
if !ok {
return false, common.NewError("invalid_params", "Missing allocation tx")
}
valid, err := verifySignatureFromRequest(allocation, sign, allocationObj.OwnerPublicKey)

valid, err := verifySignatureFromRequest(allocationID, sign, allocationObj.OwnerPublicKey)
if !valid || err != nil {
return nil, common.NewError("invalid_signature", "Invalid signature")
}
Expand Down Expand Up @@ -488,11 +486,6 @@ func InsertShare(ctx context.Context, r *http.Request) (interface{}, error) {
return nil, err
}

// dummy, to avoid input and sql error
if len(authTicket.ClientID) != 64 || len(authTicket.OwnerID) != 64 {
return nil, common.NewError("share_info_insert", "Wrong ownerID or clientID")
}

shareInfo := reference.ShareInfo{
OwnerID: authTicket.OwnerID,
ClientID: authTicket.ClientID,
Expand All @@ -509,15 +502,13 @@ func InsertShare(ctx context.Context, r *http.Request) (interface{}, error) {
} else {
err = reference.AddShareInfo(ctx, shareInfo)
}

if err != nil {
Logger.Info(err.Error())
Copy link
Contributor

@Kishan-Dhakan Kishan-Dhakan Feb 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should use Logger.Error instead of Info level

return nil, common.NewError("share_info_insert", "Unable to save share info")
}

resp := map[string]interface{}{
"message": "Share info added successfully",
}

return resp, nil
return map[string]interface{}{"message": "Share info added successfully"}, nil
}

func MarketPlaceShareInfoHandler(ctx context.Context, r *http.Request) (interface{}, error) {
Expand Down
24 changes: 18 additions & 6 deletions code/go/0chain.net/blobbercore/readmarker/entity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,20 @@ import (
"context"
"encoding/json"
"fmt"
"time"

"github.com/0chain/blobber/code/go/0chain.net/blobbercore/allocation"
"github.com/0chain/blobber/code/go/0chain.net/blobbercore/datastore"
"github.com/0chain/blobber/code/go/0chain.net/core/common"
"github.com/0chain/blobber/code/go/0chain.net/core/encryption"
zLogger "github.com/0chain/blobber/code/go/0chain.net/core/logging"

"go.uber.org/zap"
"gorm.io/datatypes"
)

. "github.com/0chain/blobber/code/go/0chain.net/core/logging"
"go.uber.org/zap"
const (
NinetyDays = common.Timestamp(90 * 24 * time.Hour)
)

type AuthTicket struct {
Expand All @@ -40,11 +44,18 @@ func (authToken *AuthTicket) Verify(allocationObj *allocation.Allocation, client
if authToken.AllocationID != allocationObj.ID {
return common.NewError("invalid_parameters", "Invalid auth ticket. Allocation id mismatch")
}
if authToken.ClientID != clientID && len(authToken.ClientID) > 0 {
if authToken.ClientID != "" && authToken.ClientID != clientID {
return common.NewError("invalid_parameters", "Invalid auth ticket. Client ID mismatch")
}
if authToken.Expiration > 0 && (authToken.Expiration < authToken.Timestamp || authToken.Expiration < common.Now()) {
return common.NewError("invalid_parameters", "Invalid auth ticket. Expired ticket")

if authToken.Expiration > 0 {
if authToken.Expiration < authToken.Timestamp || authToken.Expiration <= common.Now() {
return common.NewError("invalid_parameters", "Invalid auth ticket. Expired ticket")
}
} else { // check for default 90 days expiration time
if authToken.Timestamp+NinetyDays <= common.Now() {
return common.NewError("invalid_parameters", "Authticket expired")
}
}

if authToken.OwnerID != allocationObj.OwnerID {
Expand All @@ -60,6 +71,7 @@ func (authToken *AuthTicket) Verify(allocationObj *allocation.Allocation, client
if err != nil || !sigOK {
return common.NewError("invalid_parameters", "Invalid auth ticket. Signature verification failed")
}

return nil
}

Expand Down Expand Up @@ -169,7 +181,7 @@ func (rm *ReadMarkerEntity) Sync(ctx context.Context) (err error) {
func (rm *ReadMarkerEntity) UpdateStatus(ctx context.Context, rps []*allocation.ReadPool, txOutput, redeemTxn string) (err error) {
var redeems []allocation.ReadPoolRedeem
if err = json.Unmarshal([]byte(txOutput), &redeems); err != nil {
Logger.Error("update read redeeming status: can't decode transaction"+
zLogger.Logger.Error("update read redeeming status: can't decode transaction"+
" output", zap.Error(err))
return common.NewErrorf("rme_update_status",
"can't decode transaction output: %v", err)
Expand Down