lp://staging/~juju-gui/charms/precise/juju-gui/trunk
- Get this branch:
- bzr branch lp://staging/~juju-gui/charms/precise/juju-gui/trunk
Branch merges
- Mark Mims (community): Approve
-
Diff: 1381 lines (+502/-214)18 files modifiedHACKING.md (+2/-2)
README.md (+3/-7)
config.yaml (+14/-5)
config/config.js.template (+10/-6)
config/haproxy.cfg.template (+42/-0)
config/haproxy.conf (+22/-0)
config/juju-api-agent.conf.template (+4/-4)
config/juju-api-improv.conf.template (+4/-4)
config/nginx-site.template (+18/-14)
config/nginx.conf (+1/-1)
hooks/config-changed (+21/-25)
hooks/install (+33/-22)
hooks/start (+11/-20)
hooks/stop (+6/-10)
hooks/utils.py (+132/-31)
revision (+1/-1)
tests/deploy.test (+63/-32)
tests/test_utils.py (+115/-30)
Related source package recipes
Branch information
Recent revisions
- 182. By Francesco Banconi
-
Avoid clickjacking.
Update the builtin and legacy servers to send
the proper X-Frame-Options header so that
iframing is denied from extraneous origins.The legacy server has been update to ensure
clickjacking is not possible on jujucharms.com.Tests: `make unittest`.
QA:
- juju bootstrap an environment;
- run `make deploy`;
- wait for the GUI to be ready/started;
- open the GUI with the browser and log in;
- prepare an HTML page like the following, replacing
<GUI UNIT HOSTNAME> with the address of the GUI in
your environment:<!DOCTYPE html>
<html>
<head>
<title>test clickjacking</title>
</head>
<body>
<iframe src="https://<GUI UNIT HOSTNAME>"
height="800" width="1000">< /iframe>
</body>
</html>- open the test page above with the browser,
the iframe should be empty;
- switch to the legacy server:
`juju set juju-gui builtin-server= false`;
- wait a minute for the config-changed hook
to complete;
- open the test page above with the browser,
the iframe should be empty;
- destroy the environment.R=jeff.pihach
CC=
https://codereview. appspot. com/88090048 - 179. By Francesco Banconi
-
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 - 176. By Francesco Banconi
-
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
-
Handle broken nrpe relations.
R=frankban
CC=
https://codereview. appspot. com/76860047 - 174. By Francesco Banconi
-
Update juju-deployer and python-jujuclient.
Update GUI server/juju requirements to the newest version.
QA:
- bootstrap a juju-core trunk env;
- make deploy;
- open the GUI, ensure the GUI server works well by:
- using the GUI as usual (deploy a charm, change settings, etc.);
- deploying a bundle from the GUI;
- deploying a local charm from the GUI;
- going to /gui-server-info and checking everything seems fine.
- destroy the environment, thank you!R=matthew.scott
CC=
https://codereview. appspot. com/75190044
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
