Proxy D2L files using python #845
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marcospri
force-pushed
the
d2l-proxing
branch
from
4539d1a to
19b719d
Compare
marcospri
commented
Dec 21, 2022
| """Add headers for 3rd party providers which we access data from.""" | ||
|
|
||
| # Pass our abuse policy in request headers for third-party site admins. | ||
| headers["X-Abuse-Policy"] = "https://web.hypothes.is/abuse-policy/" | ||
| headers["X-Complaints-To"] = "https://web.hypothes.is/report-abuse/" | ||
|
|
||
| if request and "via.secret.headers" in request.params: |
There was a problem hiding this comment.
Adding this here so every request benefits from it (at least the python ones).
| def _is_d2l_url(cls, url): | ||
| return any(regexp.match(url) for regexp in cls._D2L_URL) | ||
|
|
||
| def _proxy_python_pdf(self, url, route="proxy_python_pdf"): |
There was a problem hiding this comment.
Making this method a bit generic instead of copy/paste a similar version.
| ) | ||
| config.add_route("proxy_d2l_pdf", "/d2l/proxied.pdf", factory=QueryURLResource) | ||
| config.add_route("proxy_python_pdf", "proxied.pdf", factory=QueryURLResource) |
There was a problem hiding this comment.
This last route is a bit extra and not used but I reckon it leads to a nice "just proxy these with python" feature in the future without too much noise.
| url = context.url_from_query() | ||
|
|
||
| content_iterable = request.find_service(HTTPService).stream( | ||
| url, headers=add_request_headers({}) | ||
| url, headers=add_request_headers({}, request=request) |
There was a problem hiding this comment.
Passing the request here get the original headers.
marcospri
commented
Dec 21, 2022
| return self._proxy_onedrive_pdf(url) | ||
| return self._proxy_python_pdf(url, route="proxy_onedrive_pdf") | ||
|
|
||
| if self._is_d2l_url(url): |
There was a problem hiding this comment.
I briefly tried the nginx approach but not sure if it was possible to:
- Pass the headers to nginx in a secure way
- Do that in a way that involved sane code.
seanh
approved these changes
Dec 22, 2022
marcospri
force-pushed
the
d2l-proxing
branch
from
19b719d to
fc4f5f1
Compare
Decrypt and proxy the contents of `via.secret.headers` as headers to the downstream server.
Use the python proxying infrastructure to proxy D2L files. Note that the actual proxying process is the same as for MS OneDrive files but we keep multiple url/routes in case we need reporting in both or different proxying requirements at another level (eg CloudFlare).
marcospri
force-pushed
the
d2l-proxing
branch
from
fc4f5f1 to
bd540b9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Needs hypothesis/h-vialib#42 merged and published before CI is green.
For
Testing
Follow the instructions over: hypothesis/lms#4792