source: TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/login.kid @ 2867

Subversion URL: http://proj.badc.rl.ac.uk/svn/ndg/TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/login.kid@2867
Revision 2867, 2.3 KB checked in by pjkersha, 13 years ago (diff)

ows_server/ows_server/models/ndgSecurity.py:

  • added logging for access decisions
  • updated hack for temporary AA address. This is in place until a permanent

address is allocated for the AA for CEDA and the Moles and CSML records
updated accordingly.

ows_server/ows_server/controllers/login.py:

  • fix in setup to the way c.returnTo is set - now uses request.paramsr?. - Previously 'r' was ignored if submitted as hidden filed in a form.
  • refactored code - simplified calls to SM connect and getAttCert in

getCredentials, added log debug messages to methods

ows_server/ows_server/controllers/logout.py:

  • added log messages.
  • check for 'ndgSec' is session object

ows_server/ows_server/templates/login.kid:

  • set 'r' as hidden field instead of query argument in form action string.

This to try as fix to #862 but suspect this may not be the root of the
problem.

Line 
1<html py:extends="'ndgPage.kid'" xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#">
2    <head py:replace="pagehead(0)"/>
3    <body>
4        <div py:replace="header()"/>
5                <table cellspacing="0" border="0" cellpadding="5">
6                <tbody>
7                <tr>
8                <td><h4>Login</h4></td>
9        </tr>
10        <tr>
11                        <span py:replace="loginForm()"/>
12                </tr>
13                </tbody>
14                </table>
15                ${c.xml}
16                <div py:replace="footer()"/>
17    </body>
18   
19    <span py:def="loginForm()" class="loginForm">
20                <form action="$g.getCredentials" method="POST">
21                <input type="hidden" name="r" value="${c.returnTo}"/>
22                <table cellspacing="0" border="0" cellpadding="5">
23                <tbody>
24                <tr>
25                        <td>Username:</td>
26                        <td><input type="text" name="username" value=""/></td>
27                </tr>
28                <tr>
29                        <td>Pass-phrase:</td>
30                        <td><input type="password" name="passphrase"/></td>
31                </tr>
32                <tr>
33                        <td colspan="2" align="right">
34                        <input type="submit" value="Login"/></td>
35                </tr>
36                </tbody>
37                </table>
38                </form>
39        </span>
40       
41        <div py:def="footer()" id="Footer">
42        <center><table><tbody>
43            <tr>
44                <td align="center" width="60%">
45                    <table><tbody>
46                    <tr><td><span py:replace="linkimage(g.ndgLink,g.ndgImage,'NDG')"/></td>
47                    <td> This portal is a product of the <a href="http://ndg.nerc.ac.uk"> NERC DataGrid</a>
48                    Not all functionality is completely implemented, bugs and problems are expected </td>
49                    </tr>
50                    </tbody></table>
51                </td>
52                <td width="40%" align="center">
53                    <div id="loginStatus">
54                        <!--! now we choose one of the next two (logged in or not) -->
55                        <div py:if="'ndgSec' in session"><table><tbody><tr><td> User [${session['ndgSec']['u']}] logged in
56                        at [${session['ndgSec']['h']}] with roles [${session['ndgSec']['roles']}]</td><td>
57                        &nbsp;<span py:replace="logOut()"/></td></tr></tbody></table></div>
58                        <div py:if="'ndgSec' not in session"></div>
59                    </div>
60                </td>
61                <td><span py:replace="linkimage(g.stfcLink,g.stfcImage,'Hosted by the STFC CEDA')"/></td>
62            </tr>
63        </tbody></table></center>
64    </div>
65</html>
Note: See TracBrowser for help on using the repository browser.