Skip to content

Commit b16626e

Browse files
authored
Merge pull request #11808 from owncloud/chore/bump-reva
[full-ci] chore: [OCISDEV-483] bump reva
2 parents 20b94b0 + 664726c commit b16626e

File tree

8 files changed

+83
-52
lines changed

8 files changed

+83
-52
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Enhancement: Bump Reva
2+
3+
This updates the ownCloud Reva dependency to commit `a122a9538794530267743edfd5dc67b48aa90325`.
4+
Changelog: https://github.com/owncloud/reva/compare/751223b32d4852c73a43388f6f55308c2065afeb...a122a9538794530267743edfd5dc67b48aa90325
5+
6+
https://github.com/owncloud/ocis/pull/11808

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ require (
6666
github.com/open-policy-agent/opa v1.6.0
6767
github.com/orcaman/concurrent-map v1.0.0
6868
github.com/owncloud/libre-graph-api-go v1.0.5-0.20251107084958-31937a4ea3f1
69-
github.com/owncloud/reva/v2 v2.0.0-20251106102926-751223b32d48
69+
github.com/owncloud/reva/v2 v2.0.0-20251107154850-a122a9538794
7070
github.com/pkg/errors v0.9.1
7171
github.com/pkg/xattr v0.4.12
7272
github.com/prometheus/client_golang v1.23.2
@@ -154,7 +154,7 @@ require (
154154
github.com/bluele/gcache v0.0.2 // indirect
155155
github.com/bombsimon/logrusr/v3 v3.1.0 // indirect
156156
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
157-
github.com/ceph/go-ceph v0.35.0 // indirect
157+
github.com/ceph/go-ceph v0.36.0 // indirect
158158
github.com/cespare/xxhash/v2 v2.3.0 // indirect
159159
github.com/cevaris/ordered_map v0.0.0-20190319150403-3adeae072e73 // indirect
160160
github.com/cloudflare/circl v1.6.1 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH
170170
github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
171171
github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
172172
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
173-
github.com/ceph/go-ceph v0.35.0 h1:wcDUbsjeNJ7OfbWCE7I5prqUL794uXchopw3IvrGQkk=
174-
github.com/ceph/go-ceph v0.35.0/go.mod h1:ILF8WKhQQ2p2YuX1oWigkmsfT39U8T/HS2NrqxExq2s=
173+
github.com/ceph/go-ceph v0.36.0 h1:IDE4vEF+4fmjve+CPjD1WStgfQ+Lh6vD+9PMUI712KI=
174+
github.com/ceph/go-ceph v0.36.0/go.mod h1:fGCbndVDLuHW7q2954d6y+tgPFOBnRLqJRe2YXyngw4=
175175
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
176176
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
177177
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -717,8 +717,8 @@ github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HD
717717
github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
718718
github.com/owncloud/libre-graph-api-go v1.0.5-0.20251107084958-31937a4ea3f1 h1:uW3BUPdaAhti2aP8x3Vb79vzmqAgDaWZ0yrW+4ujjU8=
719719
github.com/owncloud/libre-graph-api-go v1.0.5-0.20251107084958-31937a4ea3f1/go.mod h1:z61VMGAJRtR1nbgXWiNoCkxUXP1B3Je9rMuJbnGd+Og=
720-
github.com/owncloud/reva/v2 v2.0.0-20251106102926-751223b32d48 h1:RGnvbZNOE1ss3b0BOM8J+bPrk6prfXB0paKnWaDA/Xg=
721-
github.com/owncloud/reva/v2 v2.0.0-20251106102926-751223b32d48/go.mod h1:XenQR69s8JQ5Q4/+/vQbSg6B4+0iM6inYjNxB7SJAhI=
720+
github.com/owncloud/reva/v2 v2.0.0-20251107154850-a122a9538794 h1:j5IbfxSCcnMaIi8yei//NsXyHTEsJRz5tJSPnNcCERA=
721+
github.com/owncloud/reva/v2 v2.0.0-20251107154850-a122a9538794/go.mod h1:3PTzYZopTiFJ6DWdZ19HP3iHh2I3Gav0cDNFQ1gMT6g=
722722
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
723723
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
724724
github.com/pablodz/inotifywaitgo v0.0.9 h1:njquRbBU7fuwIe5rEvtaniVBjwWzcpdUVptSgzFqZsw=

tests/acceptance/features/apiCollaboration/wopi.feature

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -97,26 +97,43 @@ Feature: collaboration (wopi)
9797
}
9898
"""
9999

100-
@issue-9928
100+
101101
Scenario: user tries to open text file without app name in url query (MIME type not registered in app-registry)
102102
Given user "Alice" has uploaded file "filesForUpload/lorem.txt" to "lorem.txt"
103103
And we save it into "FILEID"
104104
When user "Alice" tries to send HTTP method "POST" to URL "/app/open?file_id=<<FILEID>>"
105-
Then the HTTP status code should be "500"
105+
Then the HTTP status code should be "200"
106106
And the JSON data of the response should match
107107
"""
108108
{
109109
"type": "object",
110110
"required": [
111-
"code",
112-
"message"
111+
"app_url",
112+
"method",
113+
"form_parameters"
113114
],
114115
"properties": {
115-
"code": {
116-
"const": "SERVER_ERROR"
116+
"app_url": {
117+
"type": "string",
118+
"pattern": "^.*\\?WOPISrc=.*wopi%2Ffiles%2F[a-fA-F0-9]{64}$"
117119
},
118-
"message": {
119-
"const": "Error contacting the requested application, please use a different one or try again later"
120+
"method": {
121+
"const": "POST"
122+
},
123+
"form_parameters": {
124+
"type": "object",
125+
"required": [
126+
"access_token",
127+
"access_token_ttl"
128+
],
129+
"properties": {
130+
"access_token": {
131+
"type": "string"
132+
},
133+
"access_token_ttl": {
134+
"type": "string"
135+
}
136+
}
120137
}
121138
}
122139
}
@@ -229,7 +246,7 @@ Feature: collaboration (wopi)
229246
Scenario Outline: user tries to open unsupported file format
230247
Given user "Alice" has uploaded file "filesForUpload/simple.pdf" to "simple.pdf"
231248
And we save it into "FILEID"
232-
When user "Alice" tries to send HTTP method "POST" to URL "<app-endpoint>"
249+
When user "Alice" tries to send HTTP method "POST" to URL "/app/open?file_id=<<FILEID>>&app_name=FakeOffice"
233250
Then the HTTP status code should be "500"
234251
And the JSON data of the response should match
235252
"""
@@ -249,10 +266,6 @@ Feature: collaboration (wopi)
249266
}
250267
}
251268
"""
252-
Examples:
253-
| app-endpoint |
254-
| /app/open?file_id=<<FILEID>>&app_name=FakeOffice |
255-
| /app/open?file_id=<<FILEID>> |
256269

257270

258271
Scenario Outline: user tries to open deleted file
@@ -355,7 +368,7 @@ Feature: collaboration (wopi)
355368
Examples:
356369
| app-endpoint | url-query |
357370
| /app/open-with-web?file_id=<<FILEID>>&app_name=FakeOffice | app=FakeOffice& |
358-
| /app/open-with-web?file_id=<<FILEID>> | |
371+
| /app/open-with-web?file_id=<<FILEID>> | app=FakeOffice& |
359372

360373

361374
Scenario: open text file using open-with-web with app name in url query (MIME type not registered in app-registry)
@@ -379,26 +392,23 @@ Feature: collaboration (wopi)
379392
}
380393
"""
381394

382-
@issue-9928
395+
383396
Scenario: user tries to open text file using open-with-web without app name in url query (MIME type not registered in app-registry)
384397
Given user "Alice" has uploaded file "filesForUpload/lorem.txt" to "lorem.txt"
385398
And we save it into "FILEID"
386399
When user "Alice" tries to send HTTP method "POST" to URL "/app/open-with-web?file_id=<<FILEID>>"
387-
Then the HTTP status code should be "500"
400+
Then the HTTP status code should be "200"
388401
And the JSON data of the response should match
389402
"""
390403
{
391404
"type": "object",
392405
"required": [
393-
"code",
394-
"message"
406+
"uri"
395407
],
396408
"properties": {
397-
"code": {
398-
"const": "SERVER_ERROR"
399-
},
400-
"message": {
401-
"const": "Error contacting the requested application, please use a different one or try again later"
409+
"uri": {
410+
"type": "string",
411+
"pattern": "%base_url%/external\\?app=FakeOffice&contextRouteName=files-spaces-personal&fileId=%uuidv4_pattern%%24%uuidv4_pattern%%21%uuidv4_pattern%$"
402412
}
403413
}
404414
}
@@ -433,7 +443,7 @@ Feature: collaboration (wopi)
433443
Examples:
434444
| app-endpoint | url-query |
435445
| /app/open-with-web?file_id=<<FILEID>>&app_name=FakeOffice | app=FakeOffice& |
436-
| /app/open-with-web?file_id=<<FILEID>> | |
446+
| /app/open-with-web?file_id=<<FILEID>> | app=FakeOffice& |
437447

438448

439449
Scenario Outline: sharee open file with .odt extension (open-with-web)
@@ -465,7 +475,7 @@ Feature: collaboration (wopi)
465475
Examples:
466476
| app-endpoint | url-query |
467477
| /app/open-with-web?file_id=<<FILEID>>&app_name=FakeOffice | app=FakeOffice& |
468-
| /app/open-with-web?file_id=<<FILEID>> | |
478+
| /app/open-with-web?file_id=<<FILEID>> | app=FakeOffice& |
469479

470480

471481
Scenario Outline: open file with .odt extension with different view mode (open-with-web)
@@ -498,7 +508,7 @@ Feature: collaboration (wopi)
498508
Scenario Outline: user tries to open unsupported file format (open-with-web)
499509
Given user "Alice" has uploaded file "filesForUpload/simple.pdf" to "simple.pdf"
500510
And we save it into "FILEID"
501-
When user "Alice" tries to send HTTP method "POST" to URL "<app-endpoint>"
511+
When user "Alice" tries to send HTTP method "POST" to URL "/app/open-with-web?file_id=<<FILEID>>&app_name=FakeOffice"
502512
Then the HTTP status code should be "500"
503513
And the JSON data of the response should match
504514
"""
@@ -518,10 +528,6 @@ Feature: collaboration (wopi)
518528
}
519529
}
520530
"""
521-
Examples:
522-
| app-endpoint |
523-
| /app/open-with-web?file_id=<<FILEID>>&app_name=FakeOffice |
524-
| /app/open-with-web?file_id=<<FILEID>> |
525531

526532

527533
Scenario Outline: user tries to open deleted file (open-with-web)

vendor/github.com/ceph/go-ceph/cephfs/admin/subvolume_snapshot_path.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/owncloud/reva/v2/internal/http/services/appprovider/appprovider.go

Lines changed: 29 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/owncloud/reva/v2/internal/http/services/appprovider/errors.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ github.com/cenkalti/backoff
283283
# github.com/cenkalti/backoff/v5 v5.0.3
284284
## explicit; go 1.23
285285
github.com/cenkalti/backoff/v5
286-
# github.com/ceph/go-ceph v0.35.0
287-
## explicit; go 1.23.0
286+
# github.com/ceph/go-ceph v0.36.0
287+
## explicit; go 1.24.0
288288
github.com/ceph/go-ceph/cephfs
289289
github.com/ceph/go-ceph/cephfs/admin
290290
github.com/ceph/go-ceph/common/admin/manager
@@ -1247,7 +1247,7 @@ github.com/orcaman/concurrent-map
12471247
# github.com/owncloud/libre-graph-api-go v1.0.5-0.20251107084958-31937a4ea3f1
12481248
## explicit; go 1.18
12491249
github.com/owncloud/libre-graph-api-go
1250-
# github.com/owncloud/reva/v2 v2.0.0-20251106102926-751223b32d48
1250+
# github.com/owncloud/reva/v2 v2.0.0-20251107154850-a122a9538794
12511251
## explicit; go 1.24.0
12521252
github.com/owncloud/reva/v2/cmd/revad/internal/grace
12531253
github.com/owncloud/reva/v2/cmd/revad/runtime

0 commit comments

Comments
 (0)