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

[enc] remember original fopen access type in pre-proxy #7454

Merged
merged 1 commit into from
Feb 28, 2014

Conversation

schiessle
Copy link
Contributor

remember original fopen access type in pre-proxy because sometimes they change during the fopen call, e.g. 'r' becomes 'r+' if we open an URL.

This fixes failing downloads of unencrypted files while encryption is enabled from a ftp mount.

@PVince81 this could also solve the webdav problems we discussed yesterday, but at the moment I don't have a webdav to test. Will try it tomorrow.

@ser72 This could also solve the S3 issue you reported #7428. Maybe you can give it a try...

@PVince81
Copy link
Contributor

So you eventually decided to try out that route 😄

@PVince81
Copy link
Contributor

@schiesbn you can test this with the FTP storage which also messes up the file mode.
I'll try that later.

@schiessle
Copy link
Contributor Author

@PVince81 Yes, I already tested it with FTP, works fine here.

@PVince81
Copy link
Contributor

Nice. Here is the issue for reference: #5950

…ey change

during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
@scrutinizer-notifier
Copy link

A new inspection was created.

@karlitschek
Copy link
Contributor

makes sense. But can't test at the moment. 👍

@ser72
Copy link

ser72 commented Feb 27, 2014

@schiesbn

Tried to test this -- still have issues:

  1. Files page is all messed uo:

files

  1. When I configure S3, I never get any light -- green or red. So the mount doesn't occur so I can't test this build either.

@schiessle
Copy link
Contributor Author

@ser72 I created a branch with the same fixes based on stable6 and some additional fixes which aren't backported yet. On stable6 S3 works for you if I understand you correctly... Can you try this branch https://github.com/owncloud/core/tree/enc_remember_fopen_mode_stable6 with respect to #7428

@ser72
Copy link

ser72 commented Feb 27, 2014

👍 Thanks @schiesbn . Sorry you had to "fix" so many times for me to test. Looks like master needs some work. :) But this fix is good.

@schiessle
Copy link
Contributor Author

@ser72 great that this fixes the issue at least for stable6. Can you make one final test for me? Can you try it once more with this branch: https://github.com/owncloud/core/tree/enc_isolated_fixes

The other branch you tested first contains some additional fixes. I would like to know if we need them or if it also works with the single fix proposed here. Thanks!

@ser72
Copy link

ser72 commented Feb 27, 2014

👍 This branch works as well.

@schiessle
Copy link
Contributor Author

Great, thanks for testing!

@ser72
Copy link

ser72 commented Feb 27, 2014

No worries! Thanks for fixing :)

@PVince81
Copy link
Contributor

Code makes sense 👍
Tested with FTP and discovered other issues that I will report, unrelated to this.
Tested with OC backend, worked.

@schiessle
Copy link
Contributor Author

still waiting for Jenkins before I merge it

@karlitschek backport after Jenkins finished?

@karlitschek
Copy link
Contributor

Another Last Minute backport. :-/ But I guess we have to.

@ghost
Copy link

ghost commented Feb 27, 2014

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/3410/

@ghost
Copy link

ghost commented Feb 28, 2014

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/3411/

schiessle pushed a commit that referenced this pull request Feb 28, 2014
[enc] remember original fopen access type in pre-proxy
@schiessle schiessle merged commit 61bc76f into master Feb 28, 2014
@schiessle
Copy link
Contributor Author

backported to stable6: 9661001

@schiessle schiessle deleted the enc_remember_fopen_mode branch February 28, 2014 09:41
@lock lock bot locked as resolved and limited conversation to collaborators Aug 20, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants