1717from openid import cryptutil
1818from openid import oidutil
1919from openid .association import Association
20- from openid .server import interface
21- from openid .stores .filestore import FileOpenIDStore
20+ from openid .server import server
21+ from openid .store .filestore import FileOpenIDStore
2222
2323class OpenIDHTTPServer (HTTPServer ):
2424 """
2525 http server that contains a reference to an OpenID Server and
2626 knows its base URL.
2727 """
28- def __init__ (self , server , * args , ** kwargs ):
28+ def __init__ (self , oidserver , * args , ** kwargs ):
2929 HTTPServer .__init__ (self , * args , ** kwargs )
3030
3131 if self .server_port != 80 :
@@ -34,7 +34,7 @@ def __init__(self, server, *args, **kwargs):
3434 else :
3535 self .base_url = 'http://%s/' % (self .server_name ,)
3636
37- self .openid = server
37+ self .openid = oidserver
3838 self .approved = {}
3939
4040class ServerHandler (BaseHTTPRequestHandler ):
@@ -95,9 +95,9 @@ def do_POST(self):
9595 path = self .parsed_uri [2 ]
9696 if path == '/openidserver' :
9797 status , body = self .server .openid .processPost (self .query )
98- if status == interface .OK :
98+ if status == server .OK :
9999 self .send_response (200 )
100- elif status == interface .ERROR :
100+ elif status == server .ERROR :
101101 self .send_response (400 )
102102 else :
103103 assert 0 , 'should be unreachable %r' % (status ,)
@@ -155,21 +155,21 @@ def doOpenIDGet(self):
155155 status , info = self .server .openid .getAuthenticationResponse (\
156156 authorized , self .query )
157157
158- if status == interface .REDIRECT :
158+ if status == server .REDIRECT :
159159 self .redirect (info )
160160
161- elif status == interface .DO_AUTH :
161+ elif status == server .DO_AUTH :
162162 retry , cancel = info
163163
164164 if identity_ok :
165165 self .showDecidePage (identity , trust_root , retry , cancel )
166166 else :
167167 self .showLoginPage (retry , cancel )
168168
169- elif status == interface .DO_ABOUT :
170- self .showAboutPage (self )
169+ elif status == server .DO_ABOUT :
170+ self .showAboutPage ()
171171
172- elif status == interface .ERROR :
172+ elif status == server .ERROR :
173173 self .showErrorPage (info )
174174
175175 else :
@@ -255,7 +255,7 @@ def showDecidePage(self, identity, trust_root, retry, cancel):
255255 told that you control identity URL listed below. (If you are
256256 using a delegated identity, the site will take care of
257257 reversing the delegation on its own.)</p>
258- ''' % args , form = '''\
258+ ''' , form = '''\
259259 <table>
260260 <tr><td>Identity:</td><td>%(identity)s</td></tr>
261261 <tr><td>Trust Root:</td><td>%(trust_root)s</td></tr>
@@ -490,15 +490,15 @@ def main(host, port, data_path):
490490 server_url = 'http://%s/openidserver' % host
491491 else :
492492 server_url = 'http://%s:%s/openidserver' % (host , port )
493- store = FileOpenIDStore ('sstore' )
494- server = interface .OpenIDServer (server_url , store )
493+ store = FileOpenIDStore (data_path )
494+ oidserver = server .OpenIDServer (server_url , store )
495495
496496 addr = (host , port )
497- server = OpenIDHTTPServer (server , addr , ServerHandler )
497+ httpserver = OpenIDHTTPServer (oidserver , addr , ServerHandler )
498498
499499 print 'Server running at:'
500- print server .base_url
501- server .serve_forever ()
500+ print httpserver .base_url
501+ httpserver .serve_forever ()
502502
503503if __name__ == '__main__' :
504504 host = 'localhost'
0 commit comments