sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7355 from dragonchaser/ocis-3743-show-hide-share-status

Browse Source 
bump reva & go-cs3apis
This commit is contained in:
Christian Richter
2023-09-27 08:48:03 +02:00
committed by GitHub
parent c083f598b7 b4750c4b72
commit f051b9ef7d
18 changed files with 152 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+3 -2
View File
@@ -13,7 +13,7 @@ require (
github.com/coreos/go-oidc v2.2.1+incompatible
github.com/coreos/go-oidc/v3 v3.6.0
github.com/cs3org/go-cs3apis v0.0.0-20230516150832-730ac860c71d
github.com/cs3org/reva/v2 v2.16.1-0.20230921092447-6caa589a0ae8
github.com/cs3org/reva/v2 v2.16.1-0.20230926132524-45fce234f21b
github.com/disintegration/imaging v1.6.2
github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e
github.com/egirna/icap-client v0.1.1
@@ -337,4 +337,5 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)
replace github.com/cs3org/go-cs3apis => github.com/2403905/go-cs3apis v0.0.0-20230517122726-727045414fd1
// the replacement build is based on https://github.com/dragonchaser/cs3apis/tree/master
replace github.com/cs3org/go-cs3apis => github.com/dragonchaser/go-cs3apis v0.0.0-20230918130959-ae732d4b8147
go.sum
+4 -5
View File
@@ -762,8 +762,6 @@ contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
github.com/2403905/go-cs3apis v0.0.0-20230517122726-727045414fd1 h1:dOIG9lXUo5CAZbjlegvZpeTqfAlH+zn+0uXbtlZjCPY=
github.com/2403905/go-cs3apis v0.0.0-20230517122726-727045414fd1/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck=
@@ -1013,8 +1011,8 @@ github.com/crewjam/httperr v0.2.0 h1:b2BfXR8U3AlIHwNeFFvZ+BV1LFvKLlzMjzaTnZMybNo
github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3pglZ5oH4=
github.com/crewjam/saml v0.4.13 h1:TYHggH/hwP7eArqiXSJUvtOPNzQDyQ7vwmwEqlFWhMc=
github.com/crewjam/saml v0.4.13/go.mod h1:igEejV+fihTIlHXYP8zOec3V5A8y3lws5bQBFsTm4gA=
github.com/cs3org/reva/v2 v2.16.1-0.20230921092447-6caa589a0ae8 h1:IEziHvFgy6EIGkGJb3lK/TQNCzBkd4oNe5YDBMcbS1c=
github.com/cs3org/reva/v2 v2.16.1-0.20230921092447-6caa589a0ae8/go.mod h1:RvhuweTFqzezjUFU0SIdTXakrEx9vJlMvQ7znPXSP1g=
github.com/cs3org/reva/v2 v2.16.1-0.20230926132524-45fce234f21b h1:G5lYtoDjMLPvPJk9hXEVJoVTHJZEuCWZ2Wr+n0rpJAA=
github.com/cs3org/reva/v2 v2.16.1-0.20230926132524-45fce234f21b/go.mod h1:WFSfkOQNmUggMed4lUQTF2vd9hg0acvsHI6awGwnwxQ=
github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -1046,6 +1044,8 @@ github.com/dnsimple/dnsimple-go v0.63.0/go.mod h1:O5TJ0/U6r7AfT8niYNlmohpLbCSG+c
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
github.com/dragonchaser/go-cs3apis v0.0.0-20230918130959-ae732d4b8147 h1:DIEKyIGBNDDzdwnHlbX2BFABHol6c9EEHuCDdVKgWsA=
github.com/dragonchaser/go-cs3apis v0.0.0-20230918130959-ae732d4b8147/go.mod h1:TKUgPjk4kNU0KLd9ZxoFE74Wv6PiXckF4RB3749FztA=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
@@ -2682,7 +2682,6 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
tests/acceptance/features/apiGraph/enforcePasswordPublicLink.feature
+12 -12
View File
@@ -111,7 +111,7 @@ Feature: enforce password on public link
And the OCS status code should be "400"
And the OCS status message should be:
"""
at least 13 characters are required
At least 13 characters are required
at least 3 lowercase letters are required
at least 2 uppercase letters are required
at least 2 numbers are required
@@ -175,7 +175,7 @@ Feature: enforce password on public link
And the OCS status code should be "400"
And the OCS status message should be:
"""
at least 13 characters are required
At least 13 characters are required
at least 3 lowercase letters are required
at least 2 uppercase letters are required
at least 1 numbers are required
@@ -238,10 +238,10 @@ Feature: enforce password on public link
And the OCS status message should be "<message>"
Examples:
| config | config-value | password | message |
| FRONTEND_PASSWORD_POLICY_MIN_CHARACTERS | 5 | 1234 | at least 5 characters are required |
| FRONTEND_PASSWORD_POLICY_MIN_LOWERCASE_CHARACTERS | 3 | TesT | at least 3 lowercase letters are required |
| FRONTEND_PASSWORD_POLICY_MIN_UPPERCASE_CHARACTERS | 3 | TesT | at least 3 uppercase letters are required |
| FRONTEND_PASSWORD_POLICY_MIN_DIGITS | 2 | test1 | at least 2 numbers are required |
| FRONTEND_PASSWORD_POLICY_MIN_CHARACTERS | 5 | 1234 | At least 5 characters are required |
| FRONTEND_PASSWORD_POLICY_MIN_LOWERCASE_CHARACTERS | 3 | TesT | At least 3 lowercase letters are required |
| FRONTEND_PASSWORD_POLICY_MIN_UPPERCASE_CHARACTERS | 3 | TesT | At least 3 uppercase letters are required |
| FRONTEND_PASSWORD_POLICY_MIN_DIGITS | 2 | test1 | At least 2 numbers are required |
Scenario Outline: update a public link with a password that is listed in the Banned-Password-List
@@ -260,9 +260,9 @@ Feature: enforce password on public link
And the OCS status message should be "<message>"
Examples:
| password | http-code | ocs-code | message |
| 123 | 400 | 400 | unfortunately, your password is commonly used. please pick a harder-to-guess password for your safety |
| password | 400 | 400 | unfortunately, your password is commonly used. please pick a harder-to-guess password for your safety |
| ownCloud | 400 | 400 | unfortunately, your password is commonly used. please pick a harder-to-guess password for your safety |
| 123 | 400 | 400 | Unfortunately, your password is commonly used. please pick a harder-to-guess password for your safety |
| password | 400 | 400 | Unfortunately, your password is commonly used. please pick a harder-to-guess password for your safety |
| ownCloud | 400 | 400 | Unfortunately, your password is commonly used. please pick a harder-to-guess password for your safety |
| 1234 | 200 | 200 | OK |
| OwnCloud | 200 | 200 | OK |
| p@ssword | 200 | 200 | OK |
@@ -282,9 +282,9 @@ Feature: enforce password on public link
And the OCS status message should be "<message>"
Examples:
| password | http-code | ocs-code | message |
| 123 | 400 | 400 | unfortunately, your password is commonly used. please pick a harder-to-guess password for your safety |
| password | 400 | 400 | unfortunately, your password is commonly used. please pick a harder-to-guess password for your safety |
| ownCloud | 400 | 400 | unfortunately, your password is commonly used. please pick a harder-to-guess password for your safety |
| 123 | 400 | 400 | Unfortunately, your password is commonly used. please pick a harder-to-guess password for your safety |
| password | 400 | 400 | Unfortunately, your password is commonly used. please pick a harder-to-guess password for your safety |
| ownCloud | 400 | 400 | Unfortunately, your password is commonly used. please pick a harder-to-guess password for your safety |
| 1234 | 200 | 200 | OK |
| OwnCloud | 200 | 200 | OK |
| p@ssword | 200 | 200 | OK |
vendor/github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1/resources.pb.go
Generated Vendored
+74 -63
View File
@@ -147,10 +147,13 @@ type Share struct {
Mtime *v1beta12.Timestamp `protobuf:"bytes,8,opt,name=mtime,proto3" json:"mtime,omitempty"`
// Optional.
// The expiration time of the share.
Expiration *v1beta12.Timestamp `protobuf:"bytes,9,opt,name=expiration,proto3" json:"expiration,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
Expiration *v1beta12.Timestamp `protobuf:"bytes,9,opt,name=expiration,proto3" json:"expiration,omitempty"`
// Optional.
// Hide share, default false
Hide bool `protobuf:"varint,10,opt,name=hide,proto3" json:"hide,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Share) Reset() { *m = Share{} }
@@ -241,6 +244,13 @@ func (m *Share) GetExpiration() *v1beta12.Timestamp {
return nil
}
func (m *Share) GetHide() bool {
if m != nil {
return m.Hide
}
return false
}
// The permissions for a share.
type SharePermissions struct {
Permissions *v1beta1.ResourcePermissions `protobuf:"bytes,1,opt,name=permissions,proto3" json:"permissions,omitempty"`
@@ -778,63 +788,64 @@ func init() {
}
var fileDescriptor_cb95b447da150104 = []byte{
// 921 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcd, 0x6e, 0xe3, 0x54,
0x14, 0xc7, 0xe3, 0x24, 0x4e, 0xd2, 0x93, 0x99, 0xca, 0x73, 0x29, 0xc2, 0x9a, 0x01, 0x89, 0x46,
0x1a, 0xe8, 0x0c, 0xe0, 0x28, 0xcd, 0x02, 0x01, 0x03, 0xa3, 0xc4, 0x31, 0x8d, 0x69, 0x95, 0x46,
0xd7, 0xe9, 0xf0, 0xa1, 0x4a, 0x91, 0x6b, 0x5f, 0x32, 0x16, 0x8d, 0x6d, 0xae, 0xdd, 0x42, 0xd6,
0x3c, 0x04, 0x2b, 0x36, 0x2c, 0xd9, 0xf1, 0x0a, 0x2c, 0xd9, 0xf0, 0x06, 0x2c, 0x78, 0x12, 0x74,
0xcf, 0xb5, 0xd3, 0x24, 0xd2, 0x4c, 0x3d, 0xed, 0xec, 0xe2, 0x7b, 0xfe, 0xbf, 0x73, 0xcf, 0x3d,
0x5f, 0x0a, 0x74, 0xbc, 0xa4, 0xdb, 0x4e, 0x9e, 0xbb, 0x3c, 0x08, 0x67, 0x6d, 0x2f, 0x3a, 0x3f,
0x77, 0xcf, 0x22, 0xee, 0xa6, 0x41, 0x14, 0xb6, 0x2f, 0x3b, 0x67, 0x2c, 0x75, 0x3b, 0x6d, 0xce,
0x92, 0xe8, 0x82, 0x7b, 0x2c, 0x31, 0x62, 0x1e, 0xa5, 0x11, 0xd9, 0xf5, 0x92, 0xae, 0x91, 0x21,
0xc6, 0x1a, 0x62, 0x64, 0xc8, 0xfd, 0x47, 0xc2, 0x6b, 0xe0, 0xb3, 0x30, 0x0d, 0xd2, 0x45, 0xfb,
0x22, 0x61, 0xfc, 0x45, 0xde, 0xee, 0x7f, 0x88, 0x01, 0xa4, 0x11, 0x77, 0x67, 0xac, 0x1d, 0xf3,
0xe8, 0x32, 0xf0, 0x5f, 0xa2, 0x7e, 0x47, 0xa8, 0xd3, 0x45, 0xcc, 0x92, 0xa5, 0x04, 0xbf, 0xa4,
0xb9, 0xf5, 0x57, 0x15, 0x54, 0xe7, 0xb9, 0xcb, 0x19, 0xf9, 0x14, 0xca, 0x81, 0xaf, 0x2b, 0xef,
0x2a, 0x7b, 0xcd, 0xfd, 0xc7, 0xc6, 0xb5, 0x11, 0x1b, 0x48, 0xd9, 0x3e, 0x2d, 0x07, 0x3e, 0xb1,
0xa1, 0x99, 0xdf, 0x3b, 0x0d, 0x7c, 0xbd, 0x8c, 0x4e, 0xf6, 0xa4, 0x13, 0x19, 0xa8, 0x91, 0x07,
0xba, 0xe4, 0x69, 0x06, 0xd8, 0x3e, 0x05, 0xbe, 0xfc, 0x4d, 0x4e, 0xa0, 0x19, 0x33, 0x3e, 0x0f,
0x92, 0x24, 0x88, 0xc2, 0x44, 0xaf, 0xa0, 0xab, 0x6e, 0xd1, 0x78, 0xc6, 0x57, 0x28, 0x5d, 0xf5,
0x43, 0x9e, 0x42, 0x7d, 0xc6, 0xdd, 0x30, 0x65, 0x4c, 0xaf, 0xa2, 0xcb, 0x87, 0x2f, 0x8f, 0xee,
0x40, 0x8a, 0x69, 0x4e, 0x91, 0x8f, 0x41, 0x8d, 0x7e, 0x0a, 0x19, 0xd7, 0x55, 0xc4, 0x77, 0x11,
0xcf, 0x0b, 0x66, 0x88, 0x82, 0x2d, 0xd9, 0x93, 0x84, 0x71, 0xdb, 0xa7, 0x52, 0x4f, 0x3e, 0x83,
0xba, 0xc7, 0x99, 0x9b, 0x46, 0x5c, 0xaf, 0x15, 0x45, 0x73, 0x82, 0xec, 0x83, 0xea, 0xa5, 0xc1,
0x9c, 0xe9, 0x75, 0x44, 0xdf, 0x46, 0x54, 0xd6, 0x2f, 0x47, 0x26, 0xc1, 0x9c, 0x25, 0xa9, 0x3b,
0x8f, 0xa9, 0x94, 0x0a, 0x66, 0x8e, 0x4c, 0xa3, 0x08, 0x83, 0x52, 0xf2, 0x04, 0x80, 0xfd, 0x1c,
0x07, 0x32, 0xa5, 0xfa, 0x56, 0x01, 0x70, 0x45, 0xdf, 0x9a, 0x81, 0xb6, 0x99, 0x7d, 0xe2, 0xac,
0xd7, 0x51, 0xf6, 0x55, 0xa7, 0x58, 0x4b, 0xbc, 0xa8, 0x8a, 0xad, 0x7f, 0x15, 0xb8, 0x4b, 0x99,
0xc7, 0x82, 0x4b, 0xe6, 0xcb, 0xae, 0xfd, 0x02, 0x54, 0xd1, 0x16, 0x2c, 0xbb, 0x60, 0xaf, 0x68,
0xa3, 0x50, 0x89, 0x11, 0x13, 0xd4, 0x24, 0x75, 0x53, 0x86, 0x3d, 0xbb, 0xbd, 0xff, 0x51, 0x51,
0xde, 0x11, 0x10, 0x95, 0x2c, 0x19, 0x42, 0x73, 0x1e, 0x5d, 0x84, 0xe9, 0x34, 0x8e, 0x82, 0x30,
0xcd, 0x7a, 0xf6, 0xfd, 0xeb, 0xde, 0xfa, 0x3d, 0xe3, 0x2c, 0xf4, 0x18, 0x05, 0x64, 0xc7, 0x02,
0x6d, 0xfd, 0xa3, 0x40, 0x03, 0xfd, 0x1f, 0xb2, 0xc5, 0x55, 0xcb, 0x95, 0x5f, 0xb1, 0xe5, 0x36,
0xc6, 0xb1, 0x72, 0x8b, 0x71, 0xbc, 0xed, 0xdc, 0xb4, 0xde, 0x83, 0x7a, 0xb6, 0x29, 0xc8, 0x03,
0xd8, 0x8a, 0x62, 0xf7, 0xc7, 0x8b, 0xe5, 0x8e, 0xd8, 0xa2, 0x0d, 0x79, 0x60, 0xfb, 0xad, 0x5f,
0x15, 0xd8, 0x96, 0x95, 0xc9, 0x13, 0x43, 0x9e, 0xdc, 0x6c, 0x23, 0x0d, 0x4b, 0xb8, 0x93, 0x9e,
0x42, 0xe5, 0x07, 0xb6, 0xc8, 0x72, 0xf7, 0x41, 0x51, 0xfc, 0x90, 0x2d, 0x86, 0x25, 0x2a, 0xc8,
0x7e, 0x0d, 0xaa, 0x49, 0xcc, 0xbc, 0xd6, 0x7f, 0x0a, 0x00, 0xda, 0xf0, 0x6d, 0xab, 0x19, 0x51,
0x6e, 0xb4, 0x49, 0x36, 0x36, 0x5c, 0xf9, 0x35, 0x6d, 0xb8, 0xf5, 0x11, 0xae, 0xbc, 0xe2, 0x08,
0xff, 0xa2, 0x42, 0xed, 0xcb, 0xe0, 0x3c, 0x65, 0x9c, 0xf4, 0xa1, 0x2a, 0x88, 0x6c, 0x22, 0x8c,
0x02, 0x81, 0x49, 0xd0, 0x98, 0x2c, 0x62, 0x46, 0x91, 0x25, 0x87, 0xb7, 0xea, 0xc0, 0x61, 0x69,
0xad, 0x07, 0x3f, 0xc9, 0xe7, 0xa0, 0x5a, 0x70, 0x0e, 0x86, 0xa5, 0x7c, 0x12, 0x3e, 0xbf, 0x5a,
0xbe, 0x6a, 0x71, 0x78, 0xb9, 0x7e, 0x47, 0x70, 0x27, 0xab, 0xda, 0x14, 0x53, 0x52, 0xc3, 0x94,
0x3c, 0x2a, 0x54, 0x70, 0x91, 0x8d, 0x61, 0x89, 0x36, 0x67, 0x57, 0x9f, 0xe4, 0x01, 0x34, 0x92,
0xd8, 0x95, 0x39, 0x11, 0x1b, 0x7d, 0x4b, 0x5c, 0x86, 0x27, 0xb6, 0x4f, 0xac, 0x7c, 0x15, 0x35,
0x6e, 0xb0, 0x8a, 0xc4, 0x93, 0x91, 0x6e, 0xfd, 0xa9, 0x40, 0x15, 0x2f, 0xd3, 0xe0, 0xce, 0xe4,
0xdb, 0xb1, 0x35, 0xb5, 0x47, 0xcf, 0x7a, 0x47, 0xf6, 0x40, 0x2b, 0x91, 0x26, 0xd4, 0xf1, 0x64,
0x74, 0xac, 0x29, 0x64, 0x07, 0x34, 0xfc, 0xa0, 0x96, 0x73, 0x7c, 0x42, 0x4d, 0x6b, 0x6a, 0x0f,
0xb4, 0x32, 0xd9, 0x06, 0xc0, 0xd3, 0xe3, 0xaf, 0x47, 0x16, 0xd5, 0x2a, 0x4b, 0x27, 0x26, 0xb5,
0x7a, 0x93, 0x63, 0xaa, 0x55, 0xc9, 0x9b, 0x70, 0x0f, 0x4f, 0x0e, 0x68, 0x6f, 0x34, 0xb1, 0xac,
0xa9, 0xf8, 0xd0, 0x54, 0xa2, 0xc3, 0x0e, 0x1e, 0x5b, 0xdf, 0x98, 0x47, 0x27, 0x03, 0x6b, 0x3a,
0xb0, 0x46, 0x76, 0xef, 0xc8, 0xd1, 0x6a, 0xe4, 0x1e, 0xdc, 0x45, 0x8b, 0x33, 0xee, 0xc9, 0x5b,
0xea, 0xcb, 0x5b, 0x9c, 0x49, 0x6f, 0x62, 0x69, 0x0d, 0x31, 0x6a, 0x29, 0xe3, 0xf3, 0xc7, 0x3c,
0x9b, 0x34, 0x7c, 0x12, 0x79, 0x0b, 0xde, 0x70, 0x86, 0x3d, 0x9a, 0xc9, 0x56, 0xde, 0xb1, 0x61,
0x18, 0x5b, 0xa3, 0x81, 0x3d, 0x3a, 0xd0, 0x14, 0x11, 0xc4, 0xaa, 0xa1, 0x67, 0x9a, 0xd6, 0x78,
0x62, 0x89, 0x77, 0x6d, 0x58, 0xa8, 0xf5, 0x95, 0x65, 0x0a, 0x4b, 0xa5, 0xff, 0x9b, 0x02, 0x0f,
0xbd, 0x68, 0x7e, 0x7d, 0xb6, 0xfb, 0xdb, 0x79, 0x87, 0x26, 0x63, 0xf1, 0xdf, 0x69, 0xac, 0x7c,
0xb7, 0xb3, 0x26, 0xcc, 0x74, 0xbf, 0x97, 0x2b, 0xa6, 0x63, 0xfe, 0x51, 0xde, 0x35, 0x93, 0x2e,
0x56, 0x48, 0x78, 0x34, 0xd7, 0x3c, 0x3e, 0xeb, 0xf4, 0x85, 0xf2, 0x6f, 0xd4, 0x9c, 0x66, 0x9a,
0xd3, 0x35, 0xcd, 0x69, 0xa6, 0x39, 0xab, 0xe1, 0x1f, 0xb5, 0xee, 0xff, 0x01, 0x00, 0x00, 0xff,
0xff, 0xcf, 0x24, 0xc6, 0x10, 0x78, 0x0a, 0x00, 0x00,
// 933 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4d, 0x6f, 0xe3, 0x44,
0x18, 0xc7, 0xe3, 0x24, 0x4e, 0xd2, 0x27, 0xbb, 0x95, 0x77, 0x28, 0xc2, 0xda, 0x05, 0x69, 0x6b,
0x69, 0xa1, 0xbb, 0x80, 0xa3, 0x34, 0x07, 0x04, 0x2c, 0xac, 0x12, 0xc7, 0x34, 0xa6, 0x55, 0x1a,
0x8d, 0xd3, 0xe5, 0x45, 0x95, 0x22, 0xd7, 0x1e, 0x52, 0x8b, 0xc6, 0x36, 0x63, 0xb7, 0x90, 0x33,
0x1f, 0x82, 0x13, 0x17, 0x8e, 0xdc, 0xf8, 0x1a, 0x5c, 0xb8, 0x71, 0xe4, 0xc0, 0x27, 0x41, 0xf3,
0xd8, 0xce, 0x9b, 0xb4, 0x5b, 0xb7, 0xe5, 0xe6, 0x99, 0xf9, 0xff, 0x9e, 0x79, 0xe6, 0x79, 0x93,
0xa1, 0xed, 0xc6, 0x9d, 0x56, 0x7c, 0xee, 0x70, 0x3f, 0x98, 0xb6, 0xdc, 0xf0, 0xe2, 0xc2, 0x39,
0x0b, 0xb9, 0x93, 0xf8, 0x61, 0xd0, 0xba, 0x6a, 0x9f, 0xb1, 0xc4, 0x69, 0xb7, 0x38, 0x8b, 0xc3,
0x4b, 0xee, 0xb2, 0x58, 0x8f, 0x78, 0x98, 0x84, 0x64, 0xd7, 0x8d, 0x3b, 0x7a, 0x86, 0xe8, 0x6b,
0x88, 0x9e, 0x21, 0x0f, 0x9f, 0x0a, 0xab, 0xbe, 0xc7, 0x82, 0xc4, 0x4f, 0xe6, 0xad, 0xcb, 0x98,
0xf1, 0x57, 0x59, 0x7b, 0xf8, 0x01, 0x3a, 0x90, 0x84, 0xdc, 0x99, 0xb2, 0x56, 0xc4, 0xc3, 0x2b,
0xdf, 0x7b, 0x8d, 0xfa, 0x1d, 0xa1, 0x4e, 0xe6, 0x11, 0x8b, 0x17, 0x12, 0x5c, 0xa5, 0xc7, 0xda,
0xdf, 0x55, 0x90, 0xed, 0x73, 0x87, 0x33, 0xf2, 0x09, 0x94, 0x7d, 0x4f, 0x95, 0x1e, 0x4b, 0x7b,
0xcd, 0xfd, 0x67, 0xfa, 0xb5, 0x1e, 0xeb, 0x48, 0x59, 0x1e, 0x2d, 0xfb, 0x1e, 0xb1, 0xa0, 0x99,
0xdf, 0x3b, 0xf1, 0x3d, 0xb5, 0x8c, 0x46, 0xf6, 0x52, 0x23, 0xa9, 0xa3, 0x7a, 0xee, 0xe8, 0x82,
0xa7, 0x19, 0x60, 0x79, 0x14, 0xf8, 0xe2, 0x9b, 0x9c, 0x40, 0x33, 0x62, 0x7c, 0xe6, 0xc7, 0xb1,
0x1f, 0x06, 0xb1, 0x5a, 0x41, 0x53, 0x9d, 0xa2, 0xfe, 0x8c, 0x96, 0x28, 0x5d, 0xb5, 0x43, 0x5e,
0x40, 0x7d, 0xca, 0x9d, 0x20, 0x61, 0x4c, 0xad, 0xa2, 0xc9, 0x27, 0xaf, 0xf7, 0xee, 0x20, 0x15,
0xd3, 0x9c, 0x22, 0x1f, 0x81, 0x1c, 0xfe, 0x18, 0x30, 0xae, 0xca, 0x88, 0xef, 0x22, 0x9e, 0x27,
0x4c, 0x17, 0x09, 0x5b, 0xb0, 0x27, 0x31, 0xe3, 0x96, 0x47, 0x53, 0x3d, 0xf9, 0x14, 0xea, 0x2e,
0x67, 0x4e, 0x12, 0x72, 0xb5, 0x56, 0x14, 0xcd, 0x09, 0xb2, 0x0f, 0xb2, 0x9b, 0xf8, 0x33, 0xa6,
0xd6, 0x11, 0x7d, 0x1b, 0xd1, 0x34, 0x7f, 0x39, 0x32, 0xf6, 0x67, 0x2c, 0x4e, 0x9c, 0x59, 0x44,
0x53, 0xa9, 0x60, 0x66, 0xc8, 0x34, 0x8a, 0x30, 0x28, 0x25, 0xcf, 0x01, 0xd8, 0x4f, 0x91, 0x9f,
0x86, 0x54, 0xdd, 0x2a, 0x00, 0xae, 0xe8, 0x09, 0x81, 0xea, 0xb9, 0xef, 0x31, 0x15, 0x1e, 0x4b,
0x7b, 0x0d, 0x8a, 0xdf, 0xda, 0x14, 0x94, 0xcd, 0x8c, 0x10, 0x7b, 0x3d, 0xb7, 0x69, 0xad, 0xb5,
0x8b, 0x95, 0xc9, 0xab, 0x32, 0xab, 0xfd, 0x23, 0xc1, 0x7d, 0xca, 0x5c, 0xe6, 0x5f, 0x31, 0x2f,
0xad, 0xe4, 0xcf, 0x41, 0x16, 0xa5, 0xc2, 0xb2, 0x0b, 0xf6, 0x8a, 0x16, 0x0f, 0x4d, 0x31, 0x62,
0x80, 0x1c, 0x27, 0x4e, 0xc2, 0xb0, 0x8e, 0xb7, 0xf7, 0x3f, 0x2c, 0xca, 0xdb, 0x02, 0xa2, 0x29,
0x4b, 0x06, 0xd0, 0x9c, 0x85, 0x97, 0x41, 0x32, 0x89, 0x42, 0x3f, 0x48, 0xb2, 0x3a, 0x7e, 0xef,
0xba, 0xb7, 0x7e, 0xc7, 0x38, 0x0b, 0x5c, 0x46, 0x01, 0xd9, 0x91, 0x40, 0xb5, 0xbf, 0x24, 0x68,
0xa0, 0xfd, 0x43, 0x36, 0x5f, 0x96, 0x61, 0xf9, 0x86, 0x65, 0xb8, 0xd1, 0xa2, 0x95, 0x3b, 0xb4,
0xe8, 0x5d, 0x7b, 0x49, 0x7b, 0x17, 0xea, 0xd9, 0xf4, 0x20, 0x8f, 0x60, 0x2b, 0x8c, 0x9c, 0x1f,
0x2e, 0x17, 0x73, 0x63, 0x8b, 0x36, 0xd2, 0x0d, 0xcb, 0xd3, 0x7e, 0x91, 0x60, 0x3b, 0xcd, 0x4c,
0x1e, 0x18, 0xf2, 0xfc, 0x76, 0x53, 0x6a, 0x50, 0xc2, 0x39, 0xf5, 0x02, 0x2a, 0xdf, 0xb3, 0x79,
0x16, 0xbb, 0xf7, 0x8b, 0xe2, 0x87, 0x6c, 0x3e, 0x28, 0x51, 0x41, 0xf6, 0x6a, 0x50, 0x8d, 0x23,
0xe6, 0x6a, 0xff, 0x4a, 0x00, 0x78, 0x86, 0x6f, 0x5b, 0x8d, 0x88, 0x74, 0xab, 0xe9, 0xb2, 0x31,
0xf5, 0xca, 0xff, 0xd3, 0xd4, 0x5b, 0x6f, 0xeb, 0xca, 0xcd, 0xda, 0x5a, 0xfb, 0x59, 0x86, 0xda,
0x17, 0xfe, 0x45, 0xc2, 0x38, 0xe9, 0x41, 0x55, 0x10, 0x59, 0x47, 0xe8, 0x05, 0x1c, 0x4b, 0x41,
0x7d, 0x3c, 0x8f, 0x18, 0x45, 0x96, 0x1c, 0xde, 0xa9, 0x02, 0x07, 0xa5, 0xb5, 0x1a, 0xfc, 0x38,
0xef, 0x83, 0x6a, 0xc1, 0x3e, 0x18, 0x94, 0xf2, 0x4e, 0xf8, 0x6c, 0x39, 0x90, 0xe5, 0xe2, 0xf0,
0x62, 0x24, 0x0f, 0xe1, 0x5e, 0x96, 0xb5, 0x09, 0x86, 0xa4, 0x86, 0x21, 0x79, 0x5a, 0x28, 0xe1,
0x22, 0x1a, 0x83, 0x12, 0x6d, 0x4e, 0x97, 0x4b, 0xf2, 0x08, 0x1a, 0x71, 0xe4, 0xa4, 0x31, 0x11,
0x53, 0x7e, 0x4b, 0x5c, 0x86, 0x3b, 0x96, 0x47, 0xcc, 0x7c, 0x14, 0x35, 0x6e, 0x31, 0x8a, 0xc4,
0x93, 0x91, 0xd6, 0xfe, 0x90, 0xa0, 0x8a, 0x97, 0x29, 0x70, 0x6f, 0xfc, 0xcd, 0xc8, 0x9c, 0x58,
0xc3, 0x97, 0xdd, 0x23, 0xab, 0xaf, 0x94, 0x48, 0x13, 0xea, 0xb8, 0x33, 0x3c, 0x56, 0x24, 0xb2,
0x03, 0x0a, 0x2e, 0xa8, 0x69, 0x1f, 0x9f, 0x50, 0xc3, 0x9c, 0x58, 0x7d, 0xa5, 0x4c, 0xb6, 0x01,
0x70, 0xf7, 0xf8, 0xab, 0xa1, 0x49, 0x95, 0xca, 0xc2, 0x88, 0x41, 0xcd, 0xee, 0xf8, 0x98, 0x2a,
0x55, 0xf2, 0x26, 0x3c, 0xc0, 0x9d, 0x03, 0xda, 0x1d, 0x8e, 0x4d, 0x73, 0x22, 0x16, 0x8a, 0x4c,
0x54, 0xd8, 0xc1, 0x6d, 0xf3, 0x6b, 0xe3, 0xe8, 0xa4, 0x6f, 0x4e, 0xfa, 0xe6, 0xd0, 0xea, 0x1e,
0xd9, 0x4a, 0x8d, 0x3c, 0x80, 0xfb, 0x78, 0x62, 0x8f, 0xba, 0xe9, 0x2d, 0xf5, 0xc5, 0x2d, 0xf6,
0xb8, 0x3b, 0x36, 0x95, 0x86, 0x68, 0xb5, 0x84, 0xf1, 0xd9, 0x33, 0x9e, 0x75, 0x1a, 0x3e, 0x89,
0xbc, 0x05, 0x6f, 0xd8, 0x83, 0x2e, 0xcd, 0x64, 0x2b, 0xef, 0xd8, 0x38, 0x18, 0x99, 0xc3, 0xbe,
0x35, 0x3c, 0x50, 0x24, 0xe1, 0xc4, 0xea, 0x41, 0xd7, 0x30, 0xcc, 0xd1, 0xd8, 0x14, 0xef, 0xda,
0x38, 0xa1, 0xe6, 0x97, 0xa6, 0x21, 0x4e, 0x2a, 0xbd, 0x5f, 0x25, 0x78, 0xe2, 0x86, 0xb3, 0xeb,
0xa3, 0xdd, 0xdb, 0xce, 0x2b, 0x34, 0x1e, 0x89, 0xff, 0xa9, 0x91, 0xf4, 0xed, 0xce, 0x9a, 0x30,
0xd3, 0xfd, 0x56, 0xae, 0x18, 0xb6, 0xf1, 0x7b, 0x79, 0xd7, 0x88, 0x3b, 0x98, 0x21, 0x61, 0xd1,
0x58, 0xb3, 0xf8, 0xb2, 0xdd, 0x13, 0xca, 0x3f, 0x51, 0x73, 0x9a, 0x69, 0x4e, 0xd7, 0x34, 0xa7,
0x99, 0xe6, 0xac, 0x86, 0x3f, 0x6f, 0x9d, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf9, 0xc4, 0x6e,
0x2c, 0x8c, 0x0a, 0x00, 0x00,
}
vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions/main.go
Generated Vendored
+2
View File
@@ -169,6 +169,7 @@ type ShareData struct {
Quicklink bool `json:"quicklink,omitempty" xml:"quicklink,omitempty"`
// PasswordProtected represents a public share is password protected
// PasswordProtected bool `json:"password_protected,omitempty" xml:"password_protected,omitempty"`
Hide bool `json:"hide" xml:"hide"`
}
// ShareeData holds share recipient search results
@@ -229,6 +230,7 @@ func CS3Share2ShareData(ctx context.Context, share *collaboration.Share) (*Share
// Displaynames are added later
UIDOwner: LocalUserIDToString(share.GetCreator()),
UIDFileOwner: LocalUserIDToString(share.GetOwner()),
Hide: share.Hide,
}
if share.Grantee.Type == provider.GranteeType_GRANTEE_TYPE_USER {
vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/pending.go
Generated Vendored
+7 -2
View File
@@ -151,15 +151,20 @@ func (h *Handler) updateReceivedShare(w http.ResponseWriter, r *http.Request, sh
return nil
}
hideFlag, _ := strconv.ParseBool(r.URL.Query().Get("hide"))
// we need to add a path to the share
shareRequest := &collaboration.UpdateReceivedShareRequest{
Share: &collaboration.ReceivedShare{
Share: &collaboration.Share{Id: &collaboration.ShareId{OpaqueId: shareID}},
Share: &collaboration.Share{
Id: &collaboration.ShareId{OpaqueId: shareID},
Hide: hideFlag,
},
MountPoint: &provider.Reference{
Path: mountPoint,
},
},
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"state"}},
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"state", "hide"}},
}
if rejectShare {
shareRequest.Share.State = collaboration.ShareState_SHARE_STATE_REJECTED
vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go
Generated Vendored
+3 -2
View File
@@ -30,6 +30,7 @@ import (
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/huandu/xstrings"
"github.com/rs/zerolog/log"
"github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions"
@@ -153,7 +154,7 @@ func (h *Handler) createPublicLinkShare(w http.ResponseWriter, r *http.Request,
if err := h.passwordValidator.Validate(password); err != nil {
return nil, &ocsError{
Code: response.MetaBadRequest.StatusCode,
Message: err.Error(),
Message: xstrings.FirstRuneToUpper(err.Error()),
Error: fmt.Errorf("password validation failed: %w", err),
}
}
@@ -479,7 +480,7 @@ func (h *Handler) updatePublicShare(w http.ResponseWriter, r *http.Request, shar
// skip validation if the clear password scenario
if len(newPassword[0]) > 0 {
if err := h.passwordValidator.Validate(newPassword[0]); err != nil {
response.WriteOCSError(w, r, response.MetaBadRequest.StatusCode, err.Error(), err)
response.WriteOCSError(w, r, response.MetaBadRequest.StatusCode, xstrings.FirstRuneToUpper(err.Error()), err)
return
}
}
vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go
Generated Vendored
+6 -1
View File
@@ -734,7 +734,7 @@ func (h *Handler) updateShare(w http.ResponseWriter, r *http.Request, share *col
share.Permissions = &collaboration.SharePermissions{Permissions: role.CS3ResourcePermissions()}
var fieldMaskPaths = []string{"permissions"}
var fieldMaskPaths = []string{"permissions", "hide"}
expireDate := r.PostFormValue("expireDate")
var expirationTs *types.Timestamp
@@ -863,6 +863,8 @@ func (h *Handler) listSharesWithMe(w http.ResponseWriter, r *http.Request) {
// which pending state to list
stateFilter := getStateFilter(r.FormValue("state"))
showHidden, _ := strconv.ParseBool(r.URL.Query().Get("show_hidden"))
ctx := r.Context()
p := r.URL.Query().Get("path")
shareRef := r.URL.Query().Get("share_ref")
@@ -950,6 +952,9 @@ func (h *Handler) listSharesWithMe(w http.ResponseWriter, r *http.Request) {
// TODO(refs) filter out "invalid" shares
for _, rs := range lrsRes.GetShares() {
if rs.Share.Hide && !showHidden {
continue
}
if stateFilter != ocsStateUnknown && rs.GetState() != stateFilter {
continue
}
vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/user.go
Generated Vendored
-1
View File
@@ -244,7 +244,6 @@ func (h *Handler) listUserShares(r *http.Request, filters []*collaboration.Filte
h.addFileInfo(ctx, data, info)
h.mapUserIds(ctx, client, data)
// Filter out a share if ShareWith is not found because the user or group already deleted
if data.ShareWith == "" {
continue
vendor/github.com/cs3org/reva/v2/pkg/appctx/ctxmap.go
Generated Vendored
+17 -13
View File
@@ -41,20 +41,24 @@ func GetKeyValuesFromCtx(ctx context.Context) map[interface{}]interface{} {
}
func getKeyValue(ctx interface{}, m map[interface{}]interface{}) {
ctxVals := reflect.ValueOf(ctx).Elem()
ctxType := reflect.TypeOf(ctx).Elem()
// This is a dirty hack to run with go 1.21.x
reflectCtxValues := reflect.ValueOf(ctx)
if reflectCtxValues.Kind() != reflect.Struct {
ctxVals := reflectCtxValues.Elem()
ctxType := reflect.TypeOf(ctx).Elem()
if ctxType.Kind() == reflect.Struct {
for i := 0; i < ctxVals.NumField(); i++ {
currField, currIf := extractField(ctxVals, ctxType, i)
switch currField {
case "Context":
getKeyValue(currIf, m)
case "key":
nextField, nextIf := extractField(ctxVals, ctxType, i+1)
if nextField == "val" {
m[currIf] = nextIf
i++
if ctxType.Kind() == reflect.Struct {
for i := 0; i < ctxVals.NumField(); i++ {
currField, currIf := extractField(ctxVals, ctxType, i)
switch currField {
case "Context":
getKeyValue(currIf, m)
case "key":
nextField, nextIf := extractField(ctxVals, ctxType, i+1)
if nextField == "val" {
m[currIf] = nextIf
i++
}
}
}
}
vendor/github.com/cs3org/reva/v2/pkg/share/manager/cs3/cs3.go
Generated Vendored
+2
View File
@@ -638,6 +638,8 @@ func (m *Manager) UpdateReceivedShare(ctx context.Context, rshare *collaboration
rs.State = rshare.State
case "mount_point":
rs.MountPoint = rshare.MountPoint
case "hide":
continue
default:
return nil, errtypes.NotSupported("updating " + fieldMask.Paths[i] + " is not supported")
}
vendor/github.com/cs3org/reva/v2/pkg/share/manager/json/json.go
Generated Vendored
+2
View File
@@ -403,6 +403,8 @@ func (m *mgr) UpdateShare(ctx context.Context, ref *collaboration.ShareReference
m.model.Shares[idx].Permissions = updated.Permissions
case "expiration":
m.model.Shares[idx].Expiration = updated.Expiration
case "hide":
continue
default:
return nil, errtypes.NotSupported("updating " + fieldMask.Paths[i] + " is not supported")
}
vendor/github.com/cs3org/reva/v2/pkg/share/manager/jsoncs3/jsoncs3.go
Generated Vendored
+6
View File
@@ -511,6 +511,8 @@ func (m *Manager) UpdateShare(ctx context.Context, ref *collaboration.ShareRefer
toUpdate.Permissions = updated.Permissions
case "expiration":
toUpdate.Expiration = updated.Expiration
case "hide":
toUpdate.Hide = updated.Hide
default:
return nil, errtypes.NotSupported("updating " + fieldMask.Paths[i] + " is not supported")
}
@@ -878,6 +880,7 @@ func (m *Manager) ListReceivedShares(ctx context.Context, filters []*collaborati
if share.IsGrantedToUser(s, user) {
if share.MatchesFiltersWithState(s, state.State, filters) {
s.Hide = state.Hide
rs := &collaboration.ReceivedShare{
Share: s,
State: state.State,
@@ -933,6 +936,7 @@ func (m *Manager) convert(ctx context.Context, userID string, s *collaboration.S
if err == nil && state != nil {
rs.State = state.State
rs.MountPoint = state.MountPoint
rs.Share.Hide = state.Hide
}
return rs
}
@@ -997,6 +1001,8 @@ func (m *Manager) UpdateReceivedShare(ctx context.Context, receivedShare *collab
rs.State = receivedShare.State
case "mount_point":
rs.MountPoint = receivedShare.MountPoint
case "hide":
rs.Share.Hide = receivedShare.Share.Hide
default:
return nil, errtypes.NotSupported("updating " + fieldMask.Paths[i] + " is not supported")
}
vendor/github.com/cs3org/reva/v2/pkg/share/manager/jsoncs3/receivedsharecache/receivedsharecache.go
Generated Vendored
+2
View File
@@ -68,6 +68,7 @@ type Space struct {
type State struct {
State collaboration.ShareState
MountPoint *provider.Reference
Hide bool
}
// New returns a new Cache instance
@@ -117,6 +118,7 @@ func (c *Cache) Add(ctx context.Context, userID, spaceID string, rs *collaborati
receivedSpace.States[rs.Share.Id.GetOpaqueId()] = &State{
State: rs.State,
MountPoint: rs.MountPoint,
Hide: rs.Share.Hide,
}
return c.persist(ctx, userID)
vendor/github.com/cs3org/reva/v2/pkg/share/manager/memory/memory.go
Generated Vendored
+4
View File
@@ -242,6 +242,8 @@ func (m *manager) UpdateShare(ctx context.Context, ref *collaboration.ShareRefer
m.shares[i].Permissions = updated.Permissions
case "expiration":
m.shares[i].Expiration = updated.Expiration
case "hide":
m.shares[i].Hide = updated.Hide
default:
return nil, errtypes.NotSupported("updating " + path + " is not supported")
}
@@ -359,6 +361,8 @@ func (m *manager) UpdateReceivedShare(ctx context.Context, receivedShare *collab
rs.State = receivedShare.State
case "mount_point":
rs.MountPoint = receivedShare.MountPoint
case "hide":
continue
default:
return nil, errtypes.NotSupported("updating " + fieldMask.Paths[i] + " is not supported")
}
vendor/github.com/cs3org/reva/v2/pkg/share/manager/owncloudsql/owncloudsql.go
Generated Vendored
+2
View File
@@ -447,6 +447,8 @@ func (m *mgr) UpdateReceivedShare(ctx context.Context, receivedShare *collaborat
fields = append(fields, "file_target=?")
rs.MountPoint = receivedShare.MountPoint
params = append(params, rs.MountPoint.Path)
case "hide":
continue
default:
return nil, errtypes.NotSupported("updating " + fieldMask.Paths[i] + " is not supported")
}
vendor/github.com/cs3org/reva/v2/pkg/store/store.go
Generated Vendored
+3 -1
View File
@@ -119,9 +119,11 @@ func Create(opts ...microstore.Option) microstore.Store {
// TODO nats needs a DefaultTTL option as it does not support per Write TTL ...
// FIXME nats has restrictions on the key, we cannot use slashes AFAICT
// host, port, clusterid
natsOptions := nats.GetDefaultOptions()
natsOptions.Name = "TODO" // we can pass in the service name to allow identifying the client, but that requires adding a custom context option
return natsjs.NewStore(
append(opts,
natsjs.NatsOptions(nats.Options{Name: "TODO"}),
natsjs.NatsOptions(natsOptions), // always pass in properly initialized default nats options
natsjs.DefaultTTL(ttl))...,
) // TODO test with ocis nats
case TypeMemory, "mem", "": // allow existing short form and use as default
vendor/modules.txt
Vendored
+3 -3
View File
@@ -333,7 +333,7 @@ github.com/crewjam/saml
github.com/crewjam/saml/logger
github.com/crewjam/saml/samlsp
github.com/crewjam/saml/xmlenc
# github.com/cs3org/go-cs3apis v0.0.0-20230516150832-730ac860c71d => github.com/2403905/go-cs3apis v0.0.0-20230517122726-727045414fd1
# github.com/cs3org/go-cs3apis v0.0.0-20230516150832-730ac860c71d => github.com/dragonchaser/go-cs3apis v0.0.0-20230918130959-ae732d4b8147
## explicit; go 1.13
github.com/cs3org/go-cs3apis/cs3/app/provider/v1beta1
github.com/cs3org/go-cs3apis/cs3/app/registry/v1beta1
@@ -356,7 +356,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1
github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1
github.com/cs3org/go-cs3apis/cs3/tx/v1beta1
github.com/cs3org/go-cs3apis/cs3/types/v1beta1
# github.com/cs3org/reva/v2 v2.16.1-0.20230921092447-6caa589a0ae8
# github.com/cs3org/reva/v2 v2.16.1-0.20230926132524-45fce234f21b
## explicit; go 1.20
github.com/cs3org/reva/v2/cmd/revad/internal/grace
github.com/cs3org/reva/v2/cmd/revad/runtime
@@ -2233,4 +2233,4 @@ stash.kopano.io/kgol/oidc-go
# stash.kopano.io/kgol/rndm v1.1.2
## explicit; go 1.13
stash.kopano.io/kgol/rndm
# github.com/cs3org/go-cs3apis => github.com/2403905/go-cs3apis v0.0.0-20230517122726-727045414fd1
# github.com/cs3org/go-cs3apis => github.com/dragonchaser/go-cs3apis v0.0.0-20230918130959-ae732d4b8147