Skip to content
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

Jump to bottom

Remove Expired Link on Access #1361

Merged
merged 5 commits into from
Dec 9, 2020
Merged

Remove Expired Link on Access #1361

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
ed3f1b2
publicshareManagerJson: delete expired shares on list
refs Dec 8, 2020
ea1c68e
publicshareManagerJson: refactor revoke public share
refs Dec 8, 2020
c2b98ee
add changelog
refs Dec 8, 2020
1054b88
publicshareManagerJson: fix gocritic offense
refs Dec 8, 2020
3e671c9
publicshareManagerJson: use error return value
refs Dec 8, 2020
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
5 changes: 5 additions & 0 deletions changelog/unreleased/remove-public-shares-on-list.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Enhancement: Remove expired Link on Access

Since there is no background jobs scheduled to wipe out expired resources, for the time being public links are going to be removed on a "on demand" basis, meaning whenever there is an API call that access the list of shares for a given resource, we will check whether the share is expired and delete it if so.

https://github.com/cs3org/reva/pull/1361
74 changes: 46 additions & 28 deletions pkg/publicshare/manager/json/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ import (
"sync"
"time"

"github.com/rs/zerolog/log"

user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
Expand All @@ -41,6 +43,7 @@ import (
"github.com/cs3org/reva/pkg/publicshare/manager/registry"
"github.com/golang/protobuf/jsonpb"
"github.com/mitchellh/mapstructure"
"go.opencensus.io/trace"
)

func init() {
Expand Down Expand Up @@ -279,10 +282,7 @@ func (m *manager) GetPublicShare(ctx context.Context, u *user.User, ref *link.Pu
return nil, err
}

// compare ref opaque id with share opaqueid
for _, v := range db {
// db[ref.GetId().GetOpaqueId()].(map[string]interface{})["share"]
// fmt.Printf("\nHERE\n%v\n\n", v.(map[string]interface{})["share"])
d := v.(map[string]interface{})["share"]

ps := &link.PublicShare{}
Expand All @@ -297,26 +297,11 @@ func (m *manager) GetPublicShare(ctx context.Context, u *user.User, ref *link.Pu

}
return nil, errors.New("no shares found by id:" + ref.GetId().String())

// found, ok := db[ref.GetId().GetOpaqueId()].(map[string]interface{})["share"]
// if !ok {
// return nil, errors.New("no shares found by id:" + ref.GetId().String())
// }

// ps := publicShare{}
// r := bytes.NewBuffer([]byte(found.(string)))
// if err := m.unmarshaler.Unmarshal(r, &ps); err != nil {
// return nil, err
// }

// return &ps.PublicShare, nil

}

// ListPublicShares retrieves all the shares on the manager that are valid.
func (m *manager) ListPublicShares(ctx context.Context, u *user.User, filters []*link.ListPublicSharesRequest_Filter, md *provider.ResourceInfo) ([]*link.PublicShare, error) {
shares := []*link.PublicShare{}
now := time.Now()
var shares []*link.PublicShare

m.mutex.Lock()
defer m.mutex.Unlock()
Expand All @@ -333,25 +318,24 @@ func (m *manager) ListPublicShares(ctx context.Context, u *user.User, filters []
return nil, err
}

// Skip if the share isn't created by the current user
// skip if the share isn't created by the current user.
if local.Creator.GetOpaqueId() != u.Id.OpaqueId || (local.Creator.GetIdp() != "" && u.Id.Idp != local.Creator.GetIdp()) {
continue
}

if len(filters) == 0 {
shares = append(shares, &local.PublicShare)
} else {
for _, f := range filters {
if f.Type == link.ListPublicSharesRequest_Filter_TYPE_RESOURCE_ID {
t := time.Unix(int64(local.Expiration.GetSeconds()), int64(local.Expiration.GetNanos()))
if err != nil {
return nil, err
}
if local.ResourceId.StorageId == f.GetResourceId().StorageId && local.ResourceId.OpaqueId == f.GetResourceId().OpaqueId {
if (local.Expiration != nil && t.After(now)) || local.Expiration == nil {
for i := range filters {
if filters[i].Type == link.ListPublicSharesRequest_Filter_TYPE_RESOURCE_ID {
if local.ResourceId.StorageId == filters[i].GetResourceId().StorageId && local.ResourceId.OpaqueId == filters[i].GetResourceId().OpaqueId {
if notExpired(&local.PublicShare) {
shares = append(shares, &local.PublicShare)
} else if err := m.revokeExpiredPublicShare(ctx, &local.PublicShare, u); err != nil {
return nil, err
}
}

}
}
}
Expand All @@ -360,6 +344,40 @@ func (m *manager) ListPublicShares(ctx context.Context, u *user.User, filters []
return shares, nil
}

// notExpired tests whether a public share is expired
func notExpired(s *link.PublicShare) bool {
t := time.Unix(int64(s.Expiration.GetSeconds()), int64(s.Expiration.GetNanos()))
if (s.Expiration != nil && t.After(time.Now())) || s.Expiration == nil {
return true
}
return false
}

func (m *manager) revokeExpiredPublicShare(ctx context.Context, s *link.PublicShare, u *user.User) error {
m.mutex.Unlock()
defer m.mutex.Lock()

span := trace.FromContext(ctx)
span.AddAttributes(
trace.StringAttribute("operation", "delete expired share"),
trace.StringAttribute("opaqueId", s.Id.OpaqueId),
)

err := m.RevokePublicShare(ctx, u, &link.PublicShareReference{
Spec: &link.PublicShareReference_Id{
Id: &link.PublicShareId{
OpaqueId: s.Id.OpaqueId,
},
},
})
if err != nil {
log.Err(err).Msg(fmt.Sprintf("publicShareJSONManager: error deleting public share with opaqueId: %s", s.Id.OpaqueId))
return err
}

return nil
}

// RevokePublicShare undocumented.
func (m *manager) RevokePublicShare(ctx context.Context, u *user.User, ref *link.PublicShareReference) error {
m.mutex.Lock()
Expand Down