Merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-markup-showing-up into lp:canonical-identity-provider/release

[Łukasz Czyżykowski]

[Szilveszter Farkas (phanatic)]

review: Approve

=== modified file 'identityprovider/templates/widgets/unknown_rp.html'
--- identityprovider/templates/widgets/unknown_rp.html	2010-05-13 09:41:09 +0000
+++ identityprovider/templates/widgets/unknown_rp.html	2010-06-04 14:45:33 +0000
@@ -13,7 +13,7 @@
     </p>
     {% endif %}
 
-    <p class="grey">{{ brand.unknown_rp }}</p>
+    <p class="grey">{{ brand.unknown_rp|safe }}</p>
 
     <div>
         <a href="{{ trust_root }}">{{ trust_root }}</a>

=== modified file 'identityprovider/tests/test_views_server.py'
--- identityprovider/tests/test_views_server.py	2010-05-27 15:38:35 +0000
+++ identityprovider/tests/test_views_server.py	2010-06-04 14:45:33 +0000
@@ -8,6 +8,7 @@
 from django.contrib.auth.models import AnonymousUser
 from openid.extensions import pape
 from openid.extensions.sreg import SRegRequest
+
 from openid.message import Message, OPENID2_NS, IDENTIFIER_SELECT
 from openid.server.server import Server, ProtocolError
 from openid.yadis.constants import YADIS_HEADER_NAME
@@ -20,6 +21,7 @@
     AccountCreationRationale)
 from identityprovider.models.person import PersonLocation
 from identityprovider.models.authtoken import create_token
+
 from identityprovider.views import server
 from identityprovider.tests.utils import (SQLCachedTestCase,
     BasicAccountTestCase, AuthenticatedTestCase, OpenIDProviderTestCase)
@@ -31,13 +33,29 @@
 class DummyORequest(object):
     mode = 'checkid_setup'
     trust_root = 'http://localhost/'
+    message = Message()
     identity = 'http://localhost/+id/mark_oid'
 
     def idSelect(self):
         return False
 
+class DummySession(dict):
+
+    @property
+    def session_key(self):
+        return 'abc'
+
+    def flush(self): pass
+
 
 class DummyRequest(object):
+
+    def __init__(self):
+        self.session = DummySession()
+
+
+class UntrustedRPTest(SQLCachedTestCase):
+
     def __init__(self, META=None, REQUEST=None):
         class MockSession(dict):
             def __init__(self):
@@ -782,3 +800,20 @@
         team = Person.objects.get(name=team_name)
         team.visibility = PERSON_VISIBILITY_PRIVATE_MEMBERSHIP
         team.save()
+
+
+class DecideTestCase(BasicAccountTestCase):
+
+    fixtures = ["test"]
+    pgsql_functions = ["generate_openid_identifier"]
+
+    def test_unknown_rp(self):
+        self.client.login(username='[e-mail]', password='test')
+
+        session = self.client.session
+        token = 'a' * 16
+        session[token] = signed.dumps(DummyORequest())
+        session.save()
+
+        r = self.client.get('/%s/+decide' % token)
+        self.assertContains(r, '<em>not</em>')