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

Merge pull request #7564 from aduffeck/ocm2

Browse Source 
[full-ci] Wire ocm services
This commit is contained in:
Andre Duffeck
2023-10-24 14:12:09 +02:00
committed by GitHub
parent 21a061ab6c 61fe240cb3
commit e474e7bf05
47 changed files with 1102 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1/resources.pb.go
Generated Vendored
+77 -77
View File
@@ -147,13 +147,10 @@ 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"`
// 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:"-"`
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:"-"`
}
func (m *Share) Reset() { *m = Share{} }
@@ -244,13 +241,6 @@ 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"`
@@ -304,10 +294,13 @@ type ReceivedShare struct {
State ShareState `protobuf:"varint,2,opt,name=state,proto3,enum=cs3.sharing.collaboration.v1beta1.ShareState" json:"state,omitempty"`
// REQUIRED.
// The mount point of the share.
MountPoint *v1beta1.Reference `protobuf:"bytes,3,opt,name=mount_point,json=mountPoint,proto3" json:"mount_point,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
MountPoint *v1beta1.Reference `protobuf:"bytes,3,opt,name=mount_point,json=mountPoint,proto3" json:"mount_point,omitempty"`
// Optional.
// Hide share, default false
Hidden bool `protobuf:"varint,4,opt,name=hidden,proto3" json:"hidden,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReceivedShare) Reset() { *m = ReceivedShare{} }
@@ -356,6 +349,13 @@ func (m *ReceivedShare) GetMountPoint() *v1beta1.Reference {
return nil
}
func (m *ReceivedShare) GetHidden() bool {
if m != nil {
return m.Hidden
}
return false
}
// Uniquely identifies a share in the share provider.
// A share MUST be uniquely identify by four (4) elements:
// 1) The share provider id
@@ -788,64 +788,64 @@ func init() {
}
var fileDescriptor_cb95b447da150104 = []byte{
// 933 bytes of a gzipped FileDescriptorProto
// 934 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,
0x18, 0xc7, 0xe3, 0x24, 0x4e, 0xd2, 0x27, 0xbb, 0x95, 0x77, 0x58, 0xc0, 0xda, 0x05, 0x89, 0x46,
0x5a, 0xe8, 0x2e, 0xe0, 0x28, 0xcd, 0x01, 0x01, 0x0b, 0xab, 0xc4, 0x31, 0x8d, 0x69, 0x95, 0x46,
0xe3, 0x74, 0x79, 0x51, 0xa5, 0xc8, 0xb5, 0x87, 0xd4, 0xa2, 0xb1, 0xcd, 0xd8, 0x2d, 0xe4, 0xcc,
0x87, 0xe0, 0xc4, 0x85, 0x23, 0x37, 0xbe, 0x02, 0x47, 0x2e, 0x7c, 0x07, 0x3e, 0x04, 0x67, 0x34,
0xcf, 0xd8, 0x69, 0x12, 0x69, 0xb7, 0xde, 0x96, 0x9b, 0x67, 0xe6, 0xff, 0x7b, 0xe6, 0x99, 0xe7,
0x4d, 0x86, 0x8e, 0x97, 0x74, 0xdb, 0xc9, 0x99, 0xcb, 0x83, 0x70, 0xd6, 0xf6, 0xa2, 0xf3, 0x73,
0xf7, 0x34, 0xe2, 0x6e, 0x1a, 0x44, 0x61, 0xfb, 0xb2, 0x73, 0xca, 0x52, 0xb7, 0xd3, 0xe6, 0x2c,
0x89, 0x2e, 0xb8, 0xc7, 0x12, 0x23, 0xe6, 0x51, 0x1a, 0x91, 0x1d, 0x2f, 0xe9, 0x1a, 0x19, 0x62,
0xac, 0x21, 0x46, 0x86, 0x3c, 0x78, 0x2c, 0xac, 0x06, 0x3e, 0x0b, 0xd3, 0x20, 0x5d, 0xb4, 0x2f,
0x12, 0xc6, 0x5f, 0x64, 0xed, 0xc1, 0x07, 0xe8, 0x40, 0x1a, 0x71, 0x77, 0xc6, 0xda, 0x31, 0x8f,
0x2e, 0x03, 0xff, 0x25, 0xea, 0xb7, 0x85, 0x3a, 0x5d, 0xc4, 0x2c, 0x59, 0x4a, 0x70, 0x25, 0x8f,
0x5b, 0x7f, 0x56, 0x41, 0x75, 0xce, 0x5c, 0xce, 0xc8, 0x27, 0x50, 0x0e, 0x7c, 0x5d, 0x79, 0x47,
0xd9, 0x6d, 0xee, 0x3d, 0x31, 0xae, 0xf5, 0xd8, 0x40, 0xca, 0xf6, 0x69, 0x39, 0xf0, 0x89, 0x0d,
0xcd, 0xfc, 0xde, 0x69, 0xe0, 0xeb, 0x65, 0x34, 0xb2, 0x2b, 0x8d, 0x48, 0x47, 0x8d, 0xdc, 0xd1,
0x25, 0x4f, 0x33, 0xc0, 0xf6, 0x29, 0xf0, 0xe5, 0x37, 0x39, 0x86, 0x66, 0xcc, 0xf8, 0x3c, 0x48,
0x92, 0x20, 0x0a, 0x13, 0xbd, 0x82, 0xa6, 0xba, 0x45, 0xfd, 0x19, 0x5f, 0xa1, 0x74, 0xd5, 0x0e,
0x79, 0x06, 0xf5, 0x19, 0x77, 0xc3, 0x94, 0x31, 0xbd, 0x8a, 0x26, 0x1f, 0xbd, 0xdc, 0xbb, 0x7d,
0x29, 0xa6, 0x39, 0x45, 0x3e, 0x02, 0x35, 0xfa, 0x31, 0x64, 0x5c, 0x57, 0x11, 0xdf, 0x41, 0x3c,
0x4f, 0x98, 0x21, 0x12, 0xb6, 0x64, 0x8f, 0x13, 0xc6, 0x6d, 0x9f, 0x4a, 0x3d, 0xf9, 0x14, 0xea,
0x1e, 0x67, 0x6e, 0x1a, 0x71, 0xbd, 0x56, 0x14, 0xcd, 0x09, 0xb2, 0x07, 0xaa, 0x97, 0x06, 0x73,
0xa6, 0xd7, 0x11, 0x7d, 0x0b, 0x51, 0x99, 0xbf, 0x1c, 0x99, 0x04, 0x73, 0x96, 0xa4, 0xee, 0x3c,
0xa6, 0x52, 0x2a, 0x98, 0x39, 0x32, 0x8d, 0x22, 0x0c, 0x4a, 0xc9, 0x53, 0x00, 0xf6, 0x53, 0x1c,
0xc8, 0x90, 0xea, 0x5b, 0x05, 0xc0, 0x15, 0x7d, 0x6b, 0x06, 0xda, 0x66, 0xf4, 0x89, 0xb3, 0x9e,
0x47, 0x59, 0x57, 0x9d, 0x62, 0x25, 0xf1, 0xa2, 0x2c, 0xb6, 0xfe, 0x55, 0xe0, 0x2e, 0x65, 0x1e,
0x0b, 0x2e, 0x99, 0x2f, 0xab, 0xf6, 0x73, 0x50, 0x45, 0x59, 0xb0, 0xec, 0x82, 0xdd, 0xa2, 0x85,
0x42, 0x25, 0x46, 0x4c, 0x50, 0x93, 0xd4, 0x4d, 0x19, 0xd6, 0xec, 0xf6, 0xde, 0x87, 0x45, 0x79,
0x47, 0x40, 0x54, 0xb2, 0x64, 0x08, 0xcd, 0x79, 0x74, 0x11, 0xa6, 0xd3, 0x38, 0x0a, 0xc2, 0x34,
0xab, 0xd9, 0xf7, 0xae, 0x7b, 0xeb, 0x77, 0x8c, 0xb3, 0xd0, 0x63, 0x14, 0x90, 0x1d, 0x0b, 0x94,
0xbc, 0x01, 0xb5, 0xb3, 0xc0, 0xf7, 0x59, 0x88, 0x55, 0xda, 0xa0, 0xd9, 0xaa, 0xf5, 0xb7, 0x02,
0x0d, 0xbc, 0xf7, 0x80, 0x2d, 0xae, 0x4a, 0xb1, 0xfc, 0x8a, 0xa5, 0xb8, 0xd1, 0xa6, 0x95, 0x5b,
0xb4, 0xe9, 0x6d, 0xfb, 0xa9, 0xf5, 0x2e, 0xd4, 0xb3, 0x09, 0x42, 0x1e, 0xc2, 0x56, 0x14, 0xbb,
0x3f, 0x5c, 0x2c, 0x67, 0xc7, 0x16, 0x6d, 0xc8, 0x0d, 0xdb, 0x6f, 0xfd, 0xa2, 0xc0, 0xb6, 0xcc,
0x58, 0x1e, 0x30, 0xf2, 0xf4, 0x66, 0x93, 0x6a, 0x58, 0xc2, 0x59, 0xf5, 0x0c, 0x2a, 0xdf, 0xb3,
0x45, 0x16, 0xbb, 0xf7, 0x8b, 0xe2, 0x07, 0x6c, 0x31, 0x2c, 0x51, 0x41, 0xf6, 0x6b, 0x50, 0x4d,
0x62, 0xe6, 0xb5, 0xfe, 0x51, 0x00, 0xf0, 0x0c, 0xdf, 0xb6, 0x1a, 0x11, 0xe5, 0x46, 0x13, 0x66,
0x63, 0xf2, 0x95, 0xff, 0xa7, 0xc9, 0xb7, 0xde, 0xda, 0x95, 0x57, 0x6c, 0xed, 0x9f, 0x55, 0xa8,
0x7d, 0x11, 0x9c, 0xa7, 0x8c, 0x93, 0x3e, 0x54, 0x05, 0x91, 0x75, 0x8a, 0x51, 0xc0, 0x31, 0x09,
0x1a, 0x93, 0x45, 0xcc, 0x28, 0xb2, 0xe4, 0xe0, 0x56, 0x15, 0x38, 0x2c, 0xad, 0xd5, 0xe0, 0xc7,
0x79, 0x1f, 0x54, 0x0b, 0xf6, 0xc1, 0xb0, 0x94, 0x77, 0xc2, 0x67, 0x57, 0x43, 0x59, 0x2d, 0x0e,
0x2f, 0xc7, 0xf2, 0x08, 0xee, 0x64, 0x59, 0x9b, 0x62, 0x48, 0x6a, 0x18, 0x92, 0xc7, 0x85, 0x12,
0x2e, 0xa2, 0x31, 0x2c, 0xd1, 0xe6, 0xec, 0x6a, 0x49, 0x1e, 0x42, 0x23, 0x89, 0x5d, 0x19, 0x13,
0x31, 0xe9, 0xb7, 0xc4, 0x65, 0xb8, 0x63, 0xfb, 0xc4, 0xca, 0x47, 0x54, 0xe3, 0x06, 0x23, 0x4a,
0x3c, 0x19, 0xe9, 0xd6, 0x1f, 0x0a, 0x54, 0xf1, 0x32, 0x0d, 0xee, 0x4c, 0xbe, 0x19, 0x5b, 0x53,
0x7b, 0xf4, 0xbc, 0x77, 0x68, 0x0f, 0xb4, 0x12, 0x69, 0x42, 0x1d, 0x77, 0x46, 0x47, 0x9a, 0x42,
0xee, 0x83, 0x86, 0x0b, 0x6a, 0x39, 0x47, 0xc7, 0xd4, 0xb4, 0xa6, 0xf6, 0x40, 0x2b, 0x93, 0x6d,
0x00, 0xdc, 0x3d, 0xfa, 0x6a, 0x64, 0x51, 0xad, 0xb2, 0x34, 0x62, 0x52, 0xab, 0x37, 0x39, 0xa2,
0x5a, 0x95, 0xbc, 0x0e, 0xf7, 0x70, 0x67, 0x9f, 0xf6, 0x46, 0x13, 0xcb, 0x9a, 0x8a, 0x85, 0xa6,
0x12, 0x1d, 0xee, 0xe3, 0xb6, 0xf5, 0xb5, 0x79, 0x78, 0x3c, 0xb0, 0xa6, 0x03, 0x6b, 0x64, 0xf7,
0x0e, 0x1d, 0xad, 0x46, 0xee, 0xc1, 0x5d, 0x3c, 0x71, 0xc6, 0x3d, 0x79, 0x4b, 0x7d, 0x79, 0x8b,
0x33, 0xe9, 0x4d, 0x2c, 0xad, 0x21, 0x5a, 0x2d, 0x65, 0x7c, 0xfe, 0x84, 0x67, 0x9d, 0x86, 0x4f,
0x22, 0x6f, 0xc2, 0x6b, 0xce, 0xb0, 0x47, 0x33, 0xd9, 0xca, 0x3b, 0x36, 0x0e, 0xc6, 0xd6, 0x68,
0x60, 0x8f, 0xf6, 0x35, 0x45, 0x38, 0xb1, 0x7a, 0xd0, 0x33, 0x4d, 0x6b, 0x3c, 0xb1, 0xc4, 0xbb,
0x36, 0x4e, 0xa8, 0xf5, 0xa5, 0x65, 0x8a, 0x93, 0x4a, 0xff, 0x57, 0x05, 0x1e, 0x79, 0xd1, 0xfc,
0xfa, 0x68, 0xf7, 0xb7, 0xf3, 0x0a, 0x4d, 0xc6, 0xe2, 0x9f, 0x6a, 0xac, 0x7c, 0x7b, 0x7f, 0x4d,
0x98, 0xe9, 0x7e, 0x2b, 0x57, 0x4c, 0xc7, 0xfc, 0xbd, 0xbc, 0x63, 0x26, 0x5d, 0xcc, 0x90, 0xb0,
0x68, 0xae, 0x59, 0x7c, 0xde, 0xe9, 0x0b, 0xe5, 0x5f, 0xa8, 0x39, 0xc9, 0x34, 0x27, 0x6b, 0x9a,
0x93, 0x4c, 0x73, 0x5a, 0xc3, 0x1f, 0xb8, 0xee, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x41, 0x35,
0x12, 0xf0, 0x90, 0x0a, 0x00, 0x00,
}
vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/pending.go
Generated Vendored
+62 -26
View File
@@ -122,9 +122,20 @@ func (h *Handler) AcceptReceivedShare(w http.ResponseWriter, r *http.Request) {
// TODO we could delete shares here if the stat returns code NOT FOUND ... but listening for file deletes would be better
}
}
// we need to add a path to the share
receivedShare := &collaboration.ReceivedShare{
Share: &collaboration.Share{
Id: &collaboration.ShareId{OpaqueId: shareID},
},
State: collaboration.ShareState_SHARE_STATE_ACCEPTED,
MountPoint: &provider.Reference{
Path: mount,
},
}
updateMask := &fieldmaskpb.FieldMask{Paths: []string{"state", "hidden", "mount_point"}}
for id := range sharesToAccept {
data := h.updateReceivedShare(w, r, id, false, mount)
data := h.updateReceivedShare(w, r, receivedShare, updateMask)
// only render the data for the changed share
if id == shareID && data != nil {
response.WriteOCSSuccess(w, r, []*conversions.ShareData{data})
@@ -135,45 +146,69 @@ func (h *Handler) AcceptReceivedShare(w http.ResponseWriter, r *http.Request) {
// RejectReceivedShare handles DELETE Requests on /apps/files_sharing/api/v1/shares/{shareid}
func (h *Handler) RejectReceivedShare(w http.ResponseWriter, r *http.Request) {
shareID := chi.URLParam(r, "shareid")
data := h.updateReceivedShare(w, r, shareID, true, "")
// we need to add a path to the share
receivedShare := &collaboration.ReceivedShare{
Share: &collaboration.Share{
Id: &collaboration.ShareId{OpaqueId: shareID},
},
State: collaboration.ShareState_SHARE_STATE_REJECTED,
}
updateMask := &fieldmaskpb.FieldMask{Paths: []string{"state", "hidden"}}
data := h.updateReceivedShare(w, r, receivedShare, updateMask)
if data != nil {
response.WriteOCSSuccess(w, r, []*conversions.ShareData{data})
}
}
func (h *Handler) updateReceivedShare(w http.ResponseWriter, r *http.Request, shareID string, rejectShare bool, mountPoint string) *conversions.ShareData {
func (h *Handler) UpdateReceivedShare(w http.ResponseWriter, r *http.Request) {
shareID := chi.URLParam(r, "shareid")
hideFlag, _ := strconv.ParseBool(r.URL.Query().Get("hidden"))
// unfortunately we need to get the share first to read the state
client, err := h.getClient()
if err != nil {
response.WriteOCSError(w, r, response.MetaServerError.StatusCode, "error getting grpc gateway client", err)
return
}
// we need to add a path to the share
receivedShare := &collaboration.ReceivedShare{
Share: &collaboration.Share{
Id: &collaboration.ShareId{OpaqueId: shareID},
},
Hidden: hideFlag,
}
updateMask := &fieldmaskpb.FieldMask{Paths: []string{"state", "hidden"}}
rs, _ := getReceivedShareFromID(r.Context(), client, shareID)
if rs != nil && rs.Share != nil {
receivedShare.State = rs.Share.State
}
data := h.updateReceivedShare(w, r, receivedShare, updateMask)
if data != nil {
response.WriteOCSSuccess(w, r, []*conversions.ShareData{data})
}
// TODO: do we need error handling here?
}
func (h *Handler) updateReceivedShare(w http.ResponseWriter, r *http.Request, receivedShare *collaboration.ReceivedShare, fieldMask *fieldmaskpb.FieldMask) *conversions.ShareData {
ctx := r.Context()
logger := appctx.GetLogger(ctx)
updateShareRequest := &collaboration.UpdateReceivedShareRequest{
Share: receivedShare,
UpdateMask: fieldMask,
}
client, err := h.getClient()
if err != nil {
response.WriteOCSError(w, r, response.MetaServerError.StatusCode, "error getting grpc gateway client", err)
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},
Hide: hideFlag,
},
MountPoint: &provider.Reference{
Path: mountPoint,
},
},
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"state", "hide"}},
}
if rejectShare {
shareRequest.Share.State = collaboration.ShareState_SHARE_STATE_REJECTED
} else {
shareRequest.UpdateMask.Paths = append(shareRequest.UpdateMask.Paths, "mount_point")
shareRequest.Share.State = collaboration.ShareState_SHARE_STATE_ACCEPTED
}
shareRes, err := client.UpdateReceivedShare(ctx, shareRequest)
shareRes, err := client.UpdateReceivedShare(ctx, updateShareRequest)
if err != nil {
response.WriteOCSError(w, r, response.MetaServerError.StatusCode, "grpc update received share request failed", err)
return nil
@@ -203,6 +238,7 @@ func (h *Handler) updateReceivedShare(w http.ResponseWriter, r *http.Request, sh
}
data.State = mapState(rs.GetState())
data.Hidden = rs.Hidden
h.addFileInfo(ctx, data, info)
h.mapUserIds(r.Context(), client, data)
vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go
Generated Vendored
+3 -3
View File
@@ -580,9 +580,9 @@ func (h *Handler) GetShare(w http.ResponseWriter, r *http.Request) {
},
})
if err == nil && uRes.GetShare() != nil {
receivedshare = uRes.Share
resourceID = uRes.Share.Share.ResourceId
share, err = conversions.CS3Share2ShareData(ctx, uRes.Share.Share)
share.Hidden = uRes.Share.Hidden
if err != nil {
response.WriteOCSError(w, r, response.MetaServerError.StatusCode, "error mapping share data", err)
return
@@ -739,7 +739,7 @@ func (h *Handler) updateShare(w http.ResponseWriter, r *http.Request, share *col
share.Permissions = &collaboration.SharePermissions{Permissions: role.CS3ResourcePermissions()}
var fieldMaskPaths = []string{"permissions", "hide"}
var fieldMaskPaths = []string{"permissions"}
expireDate := r.PostFormValue("expireDate")
var expirationTs *types.Timestamp
@@ -958,7 +958,7 @@ 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 {
if rs.Hidden && !showHidden {
continue
}
if stateFilter != ocsStateUnknown && rs.GetState() != stateFilter {
vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/ocs.go
Generated Vendored
+1
View File
@@ -122,6 +122,7 @@ func (s *svc) routerInit(log *zerolog.Logger) error {
r.Route("/pending/{shareid}", func(r chi.Router) {
r.Post("/", sharesHandler.AcceptReceivedShare)
r.Delete("/", sharesHandler.RejectReceivedShare)
r.Put("/", sharesHandler.UpdateReceivedShare)
})
r.Route("/remote_shares", func(r chi.Router) {
r.Get("/", sharesHandler.ListFederatedShares)
vendor/github.com/cs3org/reva/v2/pkg/conversions/main.go
Generated Vendored
+1 -2
View File
@@ -172,7 +172,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"`
Hidden bool `json:"hidden" xml:"hidden"`
}
// ShareeData holds share recipient search results
@@ -233,7 +233,6 @@ 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/pkg/ocm/share/repository/json/json.go
Generated Vendored
+4
View File
@@ -23,6 +23,7 @@ import (
"encoding/json"
"io"
"os"
"path/filepath"
"sync"
"time"
@@ -69,6 +70,9 @@ func New(m map[string]interface{}) (share.Repository, error) {
func loadOrCreate(file string) (*shareModel, error) {
_, err := os.Stat(file)
if os.IsNotExist(err) {
if err := os.MkdirAll(filepath.Dir(file), 0700); err != nil {
return nil, errors.Wrap(err, "error creating the base directory: "+filepath.Dir(file))
}
if err := os.WriteFile(file, []byte("{}"), 0700); err != nil {
return nil, errors.Wrap(err, "error creating the file: "+file)
}
vendor/github.com/cs3org/reva/v2/pkg/share/manager/cs3/cs3.go
Generated Vendored
+1 -1
View File
@@ -647,7 +647,7 @@ func (m *Manager) UpdateReceivedShare(ctx context.Context, rshare *collaboration
rs.State = rshare.State
case "mount_point":
rs.MountPoint = rshare.MountPoint
case "hide":
case "hidden":
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
+1 -1
View File
@@ -403,7 +403,7 @@ 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":
case "hidden":
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
+4 -6
View File
@@ -511,8 +511,6 @@ 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")
}
@@ -886,11 +884,11 @@ 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,
MountPoint: state.MountPoint,
Hidden: state.Hidden,
}
select {
case results <- rs:
@@ -942,7 +940,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
rs.Hidden = state.Hidden
}
return rs
}
@@ -1007,8 +1005,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
case "hidden":
rs.Hidden = receivedShare.Hidden
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
+3 -3
View File
@@ -68,7 +68,7 @@ type Space struct {
type State struct {
State collaboration.ShareState
MountPoint *provider.Reference
Hide bool
Hidden bool
}
// New returns a new Cache instance
@@ -118,7 +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,
Hidden: rs.Hidden,
}
return c.persist(ctx, userID)
@@ -200,7 +200,7 @@ func (c *Cache) List(ctx context.Context, userID string) (map[string]*Space, err
spaceCopy.States[shareID] = &State{
State: state.State,
MountPoint: state.MountPoint,
Hide: state.Hide,
Hidden: state.Hidden,
}
}
spaces[spaceID] = spaceCopy
vendor/github.com/cs3org/reva/v2/pkg/share/manager/memory/memory.go
Generated Vendored
+1 -3
View File
@@ -243,8 +243,6 @@ 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")
}
@@ -366,7 +364,7 @@ func (m *manager) UpdateReceivedShare(ctx context.Context, receivedShare *collab
rs.State = receivedShare.State
case "mount_point":
rs.MountPoint = receivedShare.MountPoint
case "hide":
case "hidden":
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
+1 -1
View File
@@ -454,7 +454,7 @@ 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":
case "hidden":
continue
default:
return nil, errtypes.NotSupported("updating " + fieldMask.Paths[i] + " is not supported")