Skip to content

Commit 2cf6e37

Browse files
jessegeensjessegeens
committed
Fixed bugs, implemented unit tests for sharing
1 parent 7eca62e commit 2cf6e37

File tree

5 files changed

+805
-113
lines changed

5 files changed

+805
-113
lines changed

‎go.mod

+9-7
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,19 @@ require (
1414
github.com/juliangruber/go-intersect v1.1.0
1515
github.com/mitchellh/mapstructure v1.5.0
1616
github.com/pkg/errors v0.9.1
17-
github.com/rs/zerolog v1.32.0
17+
github.com/rs/zerolog v1.33.0
1818
google.golang.org/genproto v0.0.0-20240314234333-6e1732d8331c
1919
google.golang.org/grpc v1.65.0
2020
gorm.io/datatypes v1.2.4
2121
gorm.io/driver/mysql v1.5.7
22+
gorm.io/driver/sqlite v1.5.7
2223
gorm.io/gorm v1.25.12
2324
)
2425

2526
require (
2627
filippo.io/edwards25519 v1.1.0 // indirect
2728
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
28-
github.com/BurntSushi/toml v1.3.2 // indirect
29+
github.com/BurntSushi/toml v1.4.0 // indirect
2930
github.com/Masterminds/goutils v1.1.1 // indirect
3031
github.com/Masterminds/semver v1.5.0 // indirect
3132
github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect
@@ -50,19 +51,20 @@ require (
5051
github.com/leodido/go-urn v1.4.0 // indirect
5152
github.com/mattn/go-colorable v0.1.13 // indirect
5253
github.com/mattn/go-isatty v0.0.20 // indirect
54+
github.com/mattn/go-sqlite3 v1.14.24 // indirect
5355
github.com/mileusna/useragent v1.3.4 // indirect
5456
github.com/mitchellh/copystructure v1.2.0 // indirect
5557
github.com/mitchellh/reflectwalk v1.0.2 // indirect
5658
github.com/rogpeppe/go-internal v1.11.0 // indirect
5759
go.step.sm/crypto v0.43.1 // indirect
58-
golang.org/x/crypto v0.23.0 // indirect
60+
golang.org/x/crypto v0.31.0 // indirect
5961
golang.org/x/image v0.13.0 // indirect
6062
golang.org/x/net v0.25.0 // indirect
61-
golang.org/x/sync v0.9.0 // indirect
62-
golang.org/x/sys v0.27.0 // indirect
63-
golang.org/x/text v0.20.0 // indirect
63+
golang.org/x/sync v0.10.0 // indirect
64+
golang.org/x/sys v0.28.0 // indirect
65+
golang.org/x/text v0.21.0 // indirect
6466
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
65-
google.golang.org/protobuf v1.34.1 // indirect
67+
google.golang.org/protobuf v1.35.2 // indirect
6668
)
6769

6870
replace github.com/cs3org/reva => ../reva

‎go.sum

+16-16
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
22
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
33
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
44
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
5-
github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
6-
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
5+
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
6+
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
77
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
88
github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
99
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
@@ -125,8 +125,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
125125
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
126126
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
127127
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
128-
github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
129-
github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
128+
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
129+
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
130130
github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262 h1:unQFBIznI+VYD1/1fApl1A+9VcBk+9dcqGfnePY87LY=
131131
github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262/go.mod h1:MyOHs9Po2fbM1LHej6sBUT8ozbxmMOFG+E+rx/GSGuc=
132132
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -150,8 +150,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
150150
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
151151
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
152152
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
153-
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
154-
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
153+
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
154+
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
155155
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
156156
golang.org/x/image v0.13.0 h1:3cge/F/QTkNLauhf2QoE9zp+7sr+ZcL4HnoZmdwg9sg=
157157
golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk=
@@ -177,8 +177,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
177177
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
178178
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
179179
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
180-
golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
181-
golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
180+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
181+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
182182
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
183183
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
184184
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -191,8 +191,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
191191
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
192192
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
193193
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
194-
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
195-
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
194+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
195+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
196196
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
197197
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
198198
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -204,8 +204,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
204204
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
205205
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
206206
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
207-
golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
208-
golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
207+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
208+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
209209
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
210210
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
211211
golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -225,8 +225,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:
225225
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
226226
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
227227
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
228-
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
229-
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
228+
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
229+
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
230230
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
231231
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
232232
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -239,8 +239,8 @@ gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo=
239239
gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
240240
gorm.io/driver/postgres v1.5.0 h1:u2FXTy14l45qc3UeCJ7QaAXZmZfDDv0YrthvmRq1l0U=
241241
gorm.io/driver/postgres v1.5.0/go.mod h1:FUZXzO+5Uqg5zzwzv4KK49R8lvGIyscBOqYrtI1Ce9A=
242-
gorm.io/driver/sqlite v1.4.3 h1:HBBcZSDnWi5BW3B3rwvVTc510KGkBkexlOg0QrmLUuU=
243-
gorm.io/driver/sqlite v1.4.3/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI=
242+
gorm.io/driver/sqlite v1.5.7 h1:8NvsrhP0ifM7LX9G4zPB97NwovUakUxc+2V2uuf3Z1I=
243+
gorm.io/driver/sqlite v1.5.7/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDah4=
244244
gorm.io/driver/sqlserver v1.4.1 h1:t4r4r6Jam5E6ejqP7N82qAJIJAht27EGT41HyPfXRw0=
245245
gorm.io/driver/sqlserver v1.4.1/go.mod h1:DJ4P+MeZbc5rvY58PnmN1Lnyvb5gw5NPzGshHDnJLig=
246246
gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=

‎share/model.go

+23-34
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import (
4747
// | notify_uploads_extra_recipients | varchar(2048) | YES | | NULL | |
4848
// +---------------------------------+-----------------+------+-----+---------+----------------+
4949

50-
type protoShare struct {
50+
type ProtoShare struct {
5151
// Including gorm.Model will embed a number of gorm-default fields
5252
// such as creation_time, id etc
5353
gorm.Model
@@ -66,13 +66,16 @@ type protoShare struct {
6666
}
6767

6868
type Share struct {
69-
protoShare
69+
// Including gorm.Model will embed a number of gorm-default fields
70+
// such as creation_time, id etc
71+
72+
ProtoShare
7073
ShareWith string
7174
SharedWithIsGroup bool
7275
}
7376

7477
type PublicLink struct {
75-
protoShare
78+
ProtoShare
7679
Token string
7780
// Enforce uniqueness in db re: Itemsource
7881
Quicklink bool
@@ -86,7 +89,7 @@ type PublicLink struct {
8689
// Unique index on combo of (shareid, user)
8790
type ShareState struct {
8891
gorm.Model
89-
ShareId uint //foreign key to share
92+
ShareID uint //foreign key to share
9093
// Can not be uid because of lw accs
9194
User string
9295
Synced bool
@@ -99,7 +102,7 @@ func (s *Share) AsCS3Share(granteeType userpb.UserType) *collaboration.Share {
99102
}
100103
return &collaboration.Share{
101104
Id: &collaboration.ShareId{
102-
OpaqueId: strconv.Itoa(int(s.ID)),
105+
OpaqueId: strconv.FormatUint(uint64(s.ID), 10),
103106
},
104107
//ResourceId: &provider.Reference{StorageId: s.Prefix, NodeId: s.ItemSource},
105108
ResourceId: &provider.ResourceId{
@@ -116,9 +119,18 @@ func (s *Share) AsCS3Share(granteeType userpb.UserType) *collaboration.Share {
116119
}
117120

118121
func (s *Share) AsCS3ReceivedShare(state *ShareState, granteeType userpb.UserType) *collaboration.ReceivedShare {
122+
// Currently, some implementations still rely on the ShareState to determine whether a file is hidden
123+
// instead of using the field
124+
var rsharestate resourcespb.ShareState
125+
if state.Hidden {
126+
rsharestate = resourcespb.ShareState_SHARE_STATE_REJECTED
127+
} else {
128+
rsharestate = resourcespb.ShareState_SHARE_STATE_ACCEPTED
129+
}
130+
119131
return &collaboration.ReceivedShare{
120132
Share: s.AsCS3Share(granteeType),
121-
State: resourcespb.ShareState_SHARE_STATE_ACCEPTED,
133+
State: rsharestate,
122134
Hidden: state.Hidden,
123135
}
124136
}
@@ -166,44 +178,21 @@ func (p *PublicLink) AsCS3PublicShare() *link.PublicShare {
166178
}
167179
}
168180

169-
// The package 'conversions' is currently internal in Reva
170-
// It should become public so we can use it here
171-
// Since it generates CS3ResourcePermissions I'm not sure why it would be private
172-
173-
// IntTosharePerm retrieves read/write permissions from an integer.
174-
func intTosharePerm(p int, itemType string) *provider.ResourcePermissions {
175-
switch p {
176-
case 1:
177-
return conversions.NewViewerRole().CS3ResourcePermissions()
178-
case 15:
179-
if itemType == "folder" {
180-
return conversions.NewEditorRole().CS3ResourcePermissions()
181-
}
182-
return conversions.NewFileEditorRole().CS3ResourcePermissions()
183-
case 4:
184-
return conversions.NewUploaderRole().CS3ResourcePermissions()
185-
default:
186-
// TODO we may have other options, for now this is a denial
187-
return &provider.ResourcePermissions{}
188-
}
189-
}
190-
191181
// ExtractGrantee retrieves the CS3API Grantee from a grantee type and username/groupname.
192182
// The grantee userType is relevant only for users.
193183
func extractGrantee(sharedWithIsGroup bool, g string, gtype userpb.UserType) *provider.Grantee {
194184
var grantee provider.Grantee
195185
if sharedWithIsGroup {
196-
grantee.Type = provider.GranteeType_GRANTEE_TYPE_USER
197-
grantee.Id = &provider.Grantee_UserId{UserId: &userpb.UserId{
186+
grantee.Type = provider.GranteeType_GRANTEE_TYPE_GROUP
187+
grantee.Id = &provider.Grantee_GroupId{GroupId: &grouppb.GroupId{
198188
OpaqueId: g,
199-
Type: gtype,
200189
}}
201190
} else {
202-
grantee.Type = provider.GranteeType_GRANTEE_TYPE_GROUP
203-
grantee.Id = &provider.Grantee_GroupId{GroupId: &grouppb.GroupId{
191+
grantee.Type = provider.GranteeType_GRANTEE_TYPE_USER
192+
grantee.Id = &provider.Grantee_UserId{UserId: &userpb.UserId{
204193
OpaqueId: g,
194+
Type: gtype,
205195
}}
206196
}
207-
208197
return &grantee
209198
}

0 commit comments

Comments
 (0)