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.

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

tus for ocdav #674

Merged
merged 14 commits into from
Apr 30, 2020
Merged

tus for ocdav #674

merged 14 commits into from
Apr 30, 2020

Conversation

butonic
Copy link
Contributor

@butonic butonic commented Apr 21, 2020

This PR / branch will serve as the basis for further ocis-web development

includes #669
based on #661

@butonic butonic requested a review from labkode as a code owner April 21, 2020 21:10
@butonic
Copy link
Contributor Author

butonic commented Apr 21, 2020

cc @PVince81 @@LukasHirt pleaase try phoenix on top of this

@butonic
Copy link
Contributor Author

butonic commented Apr 22, 2020

@labkode @PVince81 I think I addressed all comments or raised specific issues to track them.

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
@PVince81
Copy link
Contributor

PVince81 commented Apr 23, 2020

  • BUG: getting a 500 internal server error for non-TUS upload with PUT (works fine on reva master). Please note that non-TUS upload with PUT works fine on the butonic:tus-dataprovider branch.

@PVince81
Copy link
Contributor

  • BUG: on this branch I still get a CORS error:

image

it wasn't present on the butonic:tus-dataprovider branch and works fine there when testing with owncloud/web#3345 (had to hack it to bypass capability check)

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
@butonic
Copy link
Contributor Author

butonic commented Apr 23, 2020

ok, the cors issues are fixed but require changes to the Makefile as well. but we now run into the funny namespacing again: owncloud/ocis#219

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
@butonic
Copy link
Contributor Author

butonic commented Apr 24, 2020

Ok, with the last commit I can now configure

  • remote.php/webdav to use /home and
  • remote.php/dav/files to use /eos/users/{{substr 0 1 .Username}}/ (instead of just /eos)

Which allows the home storage to return references to the /eos dataprovider (which is configured not to use user_layouts because it is NOT a home storage)

The remote.php/dav/files endpoint will as the first argument always get a username which we must 'layout' the same way as in eos. I am currently relying on the requests to always use the user that is logged in ... but we could change that to layout the first path parameter, becaluse we know in the dav/files/ endpoint always is the username.

Also ... it seems to become more clear that a global endpoint should get its own endpoint, eg. /dav/global

@butonic
Copy link
Contributor Author

butonic commented Apr 27, 2020

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
newRef, err := s.unwrap(ctx, req.Ref)
if err != nil {
return &provider.InitiateFileUploadResponse{
Status: status.NewInternal(ctx, err, "error unwrapping path"),
}, nil
}
url.Path = path.Join("/", url.Path, newRef.GetPath())
var uploadLength int64
if req.Opaque != nil && req.Opaque.Map != nil && req.Opaque.Map["Upload-Length"] != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should come from the CS3 Req

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tracked in cs3org/cs3apis#71

@labkode labkode merged commit 09edd2b into cs3org:master Apr 30, 2020
C0rby pushed a commit to owncloud/reva that referenced this pull request May 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants