Merge lp://staging/~gary/juju-gui/authtoken into lp://staging/juju-gui/experimental
Status: | Merged |
---|---|
Merged at revision: | 1213 |
Proposed branch: | lp://staging/~gary/juju-gui/authtoken |
Merge into: | lp://staging/juju-gui/experimental |
Diff against target: |
1162 lines (+790/-126) 11 files modified
app/app.js (+94/-19) app/store/env/fakebackend.js (+21/-0) app/store/env/go.js (+51/-3) app/store/env/sandbox.js (+32/-3) app/views/login.js (+8/-2) test/test_app.js (+186/-2) test/test_env_go.js (+208/-97) test/test_fakebackend.js (+31/-0) test/test_login.js (+1/-0) test/test_sandbox_go.js (+87/-0) test/utils.js (+71/-0) |
To merge this branch: | bzr merge lp://staging/~gary/juju-gui/authtoken |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email:
|
Description of the change
Add authtoken support to the GUI
The authtoken support in this branch includes support for both a real environment and the sandbox. In writing this and testing it, I encountered some code that was not working, and some code that was not tested, and some code that was very difficult to test. This branch is utterly gigantic, for which I apologize. It includes the changes I needed to get everything else working. I should factor it out, now that I have figured out what needs to be done, but I'm a bit fatigued, so I'm asking for reviewer indulgence.
There are two ways you should QA. First, in the sandbox, delete the user and password from the config-debug file and then load the GUI in your browser using a URL like this: http://
Now it's time to QA a live environment. Here's how I suggest you do it.
1. In this branch, run BRANCH_IS_GOOD=1 make distfile . When it is finished, it will tell you what file it made.
2. Get a copy of the lp:~juju-gui/charms/precise/juju-gui/trunk/ branch if you don't have one already. If you do have one, make sure it is up to date.
3. mv the file you made in step 1 to the charm's releases directory. rm the old release in that directory.
4. juju bootstrap.
5. In the charm, run make deploy. Wait until it says it is done deploying the code.
6. Start up Python in your local machine. Edit the following code to include the address from step 5 and the appropriate password from your ~/.juju/
import itertools
import json
import pprint
import websocket
address = 'PUBLICADDRESS' # e.g. ec2-107-
password = 'YOURPASSWORD'
url = 'wss://
ws = websocket.
counter = itertools.count()
def process(request):
request = request.copy()
request[
ws.
pprint.
process(
process(
The last response should be something like this:
{u'RequestId': 2,
u'Response': {u'Created': u'2013-
7. Now in your browser construct a url that has the GUI address from step 5 and the authtoken from step 6. It should look something like this:
https:/
Go to this address. It should log you in as it did in the sandbox.
8. Try logging in and out with different methods to see if everything works as you expect.
Thank you very much!!!
Reviewers: mp+196782_ code.launchpad. net,
Message:
Please take a look.
Description:
Add authtoken support to the GUI
The authtoken support in this branch includes support for both a real
environment and the sandbox. In writing this and testing it, I
encountered some code that was not working, and some code that was not
tested, and some code that was very difficult to test. This branch is
utterly gigantic, for which I apologize. It includes the changes I
needed to get everything else working. I should factor it out, now that
I have figured out what needs to be done, but I'm a bit fatigued, so I'm
asking for reviewer indulgence.
There are two ways you should QA. First, in the sandbox, delete the localhost: 8888?authtoken= demoToken . This should log you in, demoToken in demoToken# bws-whatever is correct, not the other way around.* badToken. It should send you to the login page with an
user and password from the config-debug file and then load the GUI in
your browser using a URL like this:
http://
remove the authtoken from the URL, and notify you that you used a token
to authenticate. Find some other URLs, like in the charm browser, and
copy them. Log out with the button on the top right. Paste the
previous URL in to the browser, and then insert ?authtoken=
the URL. *Note that a querystring should come before a hash, so
?authtoken=
Maybe do that log in, log out cycle a couple of times to try a few
different URLs. Now log out and try a different token, like
?authtoken=
appropriate error message.
Now it's time to QA a live environment. Here's how I suggest you do it.
1. In this branch, run BRANCH_IS_GOOD=1 make distfile . When it is
finished, it will tell you what file it made.
2. Get a copy of the lp:~juju-gui/charms/precise/juju-gui/trunk/ branch
if you don't have one already. If you do have one, make sure it is up
to date.
3. mv the file you made in step 1 to the charm's releases directory. rm
the old release in that directory.
4. juju bootstrap.
5. In the charm, run make deploy. Wait until it says it is done
deploying the code.
6. Start up Python in your local machine. Edit the following code to environments. yaml file.
include the address from step 5 and the appropriate password from your
~/.juju/
import itertools 21-197- 193.compute- 1.amazonaws. com {}:443/ ws'.format( address) create_ connection( url) 'RequestId' ] = counter.next() send(json. dumps(request) ) pprint( json.loads( ws.recv( )))
import json
import pprint
import websocket
address = 'PUBLICADDRESS' # e.g.
ec2-107-
password = 'YOURPASSWORD'
url = 'wss://
ws = websocket.
counter = itertools.count()
def process(request):
request = request.copy()
request[
ws.
pprint.
process( dict(Type= 'Admin' , Request='Login', Params={'AuthTag': dict(Type= 'GUIToken' , Request='Create', Params={}))
'user-admin', 'Password': password}))
process(
The last response should be something like this:
{u'RequestId': 2, 11-25T20: 11:41.624417Z' ,
u'Expires' : u'2013- 11-25T20: 13:41.624417Z' ,
u'Token' : u'e8ea8ac912fc4 ef6a355e82bb65c af6d'}}
u'Response': {u'Created': u'2013-
7. Now in your browser construct a url that has the GUI address from
step 5 and the ...