lp:~frankban/charms/precise/juju-gui/clickjacking

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~juju-gui/charms/precise/juju-gui/trunk at revision 182

charmers: Pending requested 2014-04-17

Diff: 59 lines (+23/-1)

4 files modified

config/apache-site.template (+2/-0)
revision (+1/-1)
server/guiserver/handlers.py (+5/-0)
server/guiserver/tests/test_handlers.py (+15/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1295264: jujugui allows iframing and can be clickjacked in this way

High

Fix Released

Link a bug report

Related blueprints

184. By Francesco Banconi on 2014-04-17

Legacy server clickjacking protection.

183. By Francesco Banconi on 2014-04-17

Bump revision up.

182. By Francesco Banconi on 2014-04-17

Builtin server headers.

181. By Francesco Banconi on 2014-04-16

Merged back the new charm release.

180. By Francesco Banconi on 2014-04-15

Merged changes from the released charm.

179. By Francesco Banconi on 2014-04-15

Trusty charm.

Make the charm work on trusty.
Also update the charm documentation.

QA:
Please run the unit and functional tests
using both precise and trusty.
Follow the instructions in the HACKING file.

R=bac
CC=
https://codereview.appspot.com/88100044

178. By Richard Harding on 2014-04-09

Merged back the new charm release.

177. By Richard Harding on 2014-04-09

Updated to the newest juju-gui release.

176. By Francesco Banconi on 2014-04-09

Make the GUI server redirect to the default icon.

Create a specialized proxy handler for handling
Juju HTTP API requests. In this subclass, handle
the case a request is for a local charm icon
that cannot be found on the Juju server.

Tests: `make unittest`.

QA:
- `juju bootstrap`;
- from the branch root, run `make deploy`;
- wait for the GUI service to be ready;
- switch to the trunk branch:
  `juju set juju-gui juju-gui-source=develop`
- wait for the GUI to be ready;
- deploy local charms including an icon:
  you should see the icons are correctly displayed in the
  service blocks and inspector header;
- deploy a local charm not including an icon:
  you should see the fallback icon displayed both in
  the service block and the inspector;
- destroy the environment, done.

R=bac
CC=
https://codereview.appspot.com/86100043

175. By Benji York on 2014-03-19

Handle broken nrpe relations.

R=frankban
CC=
https://codereview.appspot.com/76860047