Merge branch 'master' into google

NEWS

@@ -133,8 +133,7 @@ Some advantages of Yadis support are:
 
  * Easy interoperability for different identity services
 
-For more information about Yadis, see http://yadis.org/ or
-http://www.openidenabled.com/yadis/
+For more information about Yadis, see http://yadis.org/
 
 Extension Support
 -----------------

NOTICE

@@ -1,4 +1,4 @@
 Python OpenID may be obtained from
-http://www.openidenabled.com/openid/libraries/python
+http://github.com/openid/python-openid
 and we'd like to hear about how you're using this software.
 Write to us at openid@janrain.com.

README

@@ -59,8 +59,7 @@ CONTACT
 =======
 
 Send bug reports, suggestions, comments, and questions to
-http://lists.openidenabled.com/mailman/listinfo/dev
-dev@lists.openidenabled.com.
+http://openid.net/developers/dev-mailing-lists/.
 
 If you have a bugfix or feature you'd like to contribute, don't
 hesitate to send it to us.  For more detailed information on how to

contrib/associate

@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+"""Make an OpenID Assocition request against an endpoint
+and print the results."""
+
+import sys
+
+from openid.store.memstore import MemoryStore
+from openid.consumer import consumer
+from openid.consumer.discover import OpenIDServiceEndpoint
+
+from datetime import datetime
+
+def verboseAssociation(assoc):
+    """A more verbose representation of an Association.
+    """
+    d = assoc.__dict__
+    issued_date = datetime.fromtimestamp(assoc.issued)
+    d['issued_iso'] = issued_date.isoformat()
+    fmt = """  Type: %(assoc_type)s
+  Handle: %(handle)s
+  Issued: %(issued)s [%(issued_iso)s]
+  Lifetime: %(lifetime)s
+  Secret: %(secret)r
+"""
+    return fmt % d
+
+def main():
+    if not sys.argv[1:]:
+        print "Usage: %s ENDPOINT_URL..." % (sys.argv[0],)
+    for endpoint_url in sys.argv[1:]:
+        print "Associating with", endpoint_url
+
+        # This makes it clear why j3h made AssociationManager when we
+        # did the ruby port.  We can't invoke requestAssociation
+        # without these other trappings.
+        store = MemoryStore()
+        endpoint = OpenIDServiceEndpoint()
+        endpoint.server_url = endpoint_url
+        c = consumer.GenericConsumer(store)
+        auth_req = c.begin(endpoint)
+        if auth_req.assoc:
+            print verboseAssociation(auth_req.assoc)
+        else:
+            print "  ...no association."
+
+if __name__ == '__main__':
+    main()

examples/README

@@ -88,4 +88,4 @@ Getting help
 
 Please send bug reports, patches, and other feedback to
 
-  dev@lists.openidenabled.com
+  http://openid.net/developers/dev-mailing-lists/

examples/consumer.py

@@ -30,8 +30,7 @@ def quoteattr(s):
 PYTHONPATH environment variable).
 
 For more information, see the README in the root of the library
-distribution or http://www.openidenabled.com/
-""")
+distribution.""")
     sys.exit(1)
 
 from openid.store import memstore
@@ -423,7 +422,7 @@ def pageHeader(self, title):
     <h1>%s</h1>
     <p>
       This example consumer uses the <a href=
-      "http://www.openidenabled.com/openid/libraries/python" >Python
+      "http://github.com/openid/python-openid" >Python
       OpenID</a> library. It just verifies that the identifier that you enter
       is your identifier.
     </p>

examples/djopenid/README

@@ -64,4 +64,4 @@ CONTACT
 
 Please send bug reports, patches, and other feedback to
 
-  dev@lists.openidenabled.com
+  http://openid.net/developers/dev-mailing-lists/

examples/server.py

@@ -25,8 +25,7 @@ def quoteattr(s):
 PYTHONPATH environment variable).
 
 For more information, see the README in the root of the library
-distribution or http://www.openidenabled.com/
-""")
+distribution.""")
     sys.exit(1)
 
 from openid.extensions import sreg

openid/__init__.py

@@ -6,8 +6,8 @@
 implementing an OpenID server, see the C{L{openid.server.server}}
 module.
 
-@contact: U{dev@lists.openidenabled.com
-    <http://lists.openidenabled.com/mailman/listinfo/dev>}
+@contact: U{http://openid.net/developers/dev-mailing-lists/
+    <http://openid.net/developers/dev-mailing-lists/}
 
 @copyright: (C) 2005-2008 JanRain, Inc.
 

openid/association.py

@@ -527,12 +527,12 @@ def checkMessageSignature(self, message):
 
         @raises ValueError: if the message has no signature or no signature
             can be calculated for it.
-        """        
+        """
         message_sig = message.getArg(OPENID_NS, 'sig')
         if not message_sig:
             raise ValueError("%s has no sig." % (message,))
         calculated_sig = self.getMessageSignature(message)
-        return calculated_sig == message_sig
+        return cryptutil.const_eq(calculated_sig, message_sig)
 
 
     def _makePairs(self, message):

openid/consumer/consumer.py

@@ -133,7 +133,7 @@
 
     Add an OpenID login field somewhere on your site.  When an OpenID
     is entered in that field and the form is submitted, it should make
-    a request to the your site which includes that OpenID URL.
+    a request to your site which includes that OpenID URL.
 
     First, the application should L{instantiate a Consumer<Consumer.__init__>}
     with a session for per-user state and store for shared state.
@@ -165,14 +165,13 @@
     the URL by the OpenID provider as the information necessary to
     finish the request.
 
-    Get an C{L{Consumer}} instance with the same session and store as
+    Get a C{L{Consumer}} instance with the same session and store as
     before and call its C{L{complete<Consumer.complete>}} method,
     passing in all the received query arguments.
 
     There are multiple possible return types possible from that
-    method. These indicate the whether or not the login was
-    successful, and include any additional information appropriate for
-    their type.
+    method. These indicate whether or not the login was successful,
+    and include any additional information appropriate for their type.
 
 @var SUCCESS: constant used as the status for
     L{SuccessResponse<openid.consumer.consumer.SuccessResponse>} objects.

openid/cryptutil.py

@@ -218,3 +218,13 @@ def randomString(length, chrs=None):
     else:
         n = len(chrs)
         return ''.join([chrs[randrange(n)] for _ in xrange(length)])
+
+def const_eq(s1, s2):
+    if len(s1) != len(s2):
+        return False
+
+    result = True
+    for i in range(len(s1)):
+        result = result and (s1[i] == s2[i])
+
+    return result

openid/fetchers.py

@@ -249,7 +249,11 @@ def _parseHeaders(self, header_file):
         header_file.seek(0)
 
         # Remove the status line from the beginning of the input
-        unused_http_status_line = header_file.readline()
+        unused_http_status_line = header_file.readline().lower ()
+        if unused_http_status_line.startswith('http/1.1 100 '):
+            unused_http_status_line = header_file.readline()
+            unused_http_status_line = header_file.readline()
+
         lines = [line.strip() for line in header_file]
 
         # and the blank line from the end

openid/yadis/__init__.py

@@ -1,7 +1,4 @@
-"""Yadis.
 
-@see: U{http://www.openidenabled.com/yadis}
-"""
 
 __all__ = [
     'constants',