Merge lp:~adeuring/launchpad/librarian-filealiases into lp:launchpad
Status: | Merged |
---|---|
Approved by: | Graham Binns |
Approved revision: | no longer in the source branch. |
Merged at revision: | 12041 |
Proposed branch: | lp:~adeuring/launchpad/librarian-filealiases |
Merge into: | lp:launchpad |
Diff against target: |
280 lines (+16/-109) 6 files modified
lib/canonical/launchpad/browser/librarian.py (+13/-14) lib/canonical/launchpad/rest/bytestorage.py (+0/-28) lib/canonical/launchpad/zcml/webservice.zcml (+0/-13) lib/lp/bugs/interfaces/bugattachment.py (+2/-2) lib/lp/bugs/stories/webservice/xx-bug.txt (+1/-41) lib/lp/services/fields/__init__.py (+0/-11) |
To merge this branch: | bzr merge lp:~adeuring/launchpad/librarian-filealiases |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Graham Binns (community) | code | Approve | |
Review via email: mp+42942@code.launchpad.net |
Commit message
[bug=620458,629804] [r=gmb][ui=none][bug=629804] Back out hack to serve restricted files directly from the internal restricted librarian port.
Description of the change
This branch removes a temporary workaround which we needed to give certain webservice clients access to restricted Librarian files.
The core of the workaround was to point webservice clients to an HTTP (not HHTPS) URL having a non-public hostname. This was necessary because we wanted to avoid serving the data via app servers, as done in loder variants of ProxiedLibraryF
The workaround was implemented by the class RestrictedLibra
And there is a bit of lint cleanup.
There are not special tests for this branch; the full test suite passed an EC2 run.
This is great stuff Abel. Once its landed, QA'd and deployed, I wonder
if you'd have the time to follow on and remove the proxying support
completely? It would be good to have the code simplifications that
that should bring.