Skip to content

Commit 6d642ea

Browse files
author
tailor
committed
[project @ rename openid.server.interface module]
1 parent 0c677bd commit 6d642ea

3 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎examples/server.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
from openid import cryptutil
1818
from openid import oidutil
1919
from 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

2323
class 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

4040
class 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

503503
if __name__ == '__main__':
504504
host = 'localhost'

‎openid/server/impl.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from openid import oidutil
66
from openid import cryptutil
77
from openid.dh import DiffieHellman
8-
from openid.server import interface
8+
from openid.server import server
99
from openid.server.trustroot import TrustRoot
1010
from openid.association import Association
1111

@@ -55,13 +55,13 @@ def getAuthenticationResponse(self, authorized, args):
5555
if mode == 'checkid_immediate':
5656
nargs = dict(args)
5757
nargs['openid.mode'] = 'checkid_setup'
58-
return interface.REDIRECT, oidutil.appendArgs(self.url, nargs)
58+
return server.REDIRECT, oidutil.appendArgs(self.url, nargs)
5959

6060
elif mode == 'checkid_setup':
6161
ret = oidutil.appendArgs(self.url, args)
6262
can = oidutil.appendArgs(return_to, {'openid.mode': 'cancel'})
6363

64-
return interface.DO_AUTH, (ret, can)
64+
return server.DO_AUTH, (ret, can)
6565

6666
else:
6767
return self._getErr(
@@ -93,7 +93,7 @@ def getAuthenticationResponse(self, authorized, args):
9393

9494
sig = assoc.addSignature(_signed_fields, reply)
9595

96-
return interface.REDIRECT, oidutil.appendArgs(return_to, reply)
96+
return server.REDIRECT, oidutil.appendArgs(return_to, reply)
9797

9898
def processPost(self, args):
9999
try:
@@ -162,7 +162,7 @@ def _associate(self, args):
162162
else:
163163
reply['mac_key'] = oidutil.toBase64(assoc.secret)
164164

165-
return interface.OK, kvform.dictToKV(reply)
165+
return server.OK, kvform.dictToKV(reply)
166166

167167
def _checkAuth(self, args):
168168
assoc = self.store.getAssociation(
@@ -199,7 +199,7 @@ def _checkAuth(self, args):
199199
is_valid = 'false'
200200

201201
reply['is_valid'] = is_valid
202-
return interface.OK, kvform.dictToKV(reply)
202+
return server.OK, kvform.dictToKV(reply)
203203

204204
def _getErr(self, args, msg):
205205
return_to = args.get('openid.return_to')
@@ -208,10 +208,10 @@ def _getErr(self, args, msg):
208208
'openid.mode': 'error',
209209
'openid.error': msg
210210
}
211-
return interface.REDIRECT, oidutil.appendArgs(return_to, err)
211+
return server.REDIRECT, oidutil.appendArgs(return_to, err)
212212
else:
213-
return interface.ERROR, msg
213+
return server.ERROR, msg
214214

215215
def _postErr(self, msg):
216-
return interface.ERROR, kvform.dictToKV({'error': msg})
216+
return server.ERROR, kvform.dictToKV({'error': msg})
217217

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@
8787
C{L{processPost<OpenIDServer.processPost}} method with the parsed
8888
POST parameters. The return value is a pair, consisting of a
8989
status value and a response body. If the status value is
90-
C{L{openid.consumer.interface.OK}}, send the body back with an
91-
HTTP status code of 200. If the status value is
92-
C{L{openid.consumer.interface.ERROR}}, send the body back with an
93-
HTTP status code of 400. Both of those response codes are
94-
prescribed by the U{OpenID spec<http://openid.net/specs.bml>}.
95-
The content type for the responses is explicitly not defined, but
96-
text/plain is suggested.
90+
C{L{openid.server.server.OK}}, send the body back with an HTTP
91+
status code of 200. If the status value is
92+
C{L{openid.server.server.ERROR}}, send the body back with an HTTP
93+
status code of 400. Both of those response codes are prescribed
94+
by the U{OpenID spec<http://openid.net/specs.bml>}. The content
95+
type for the responses is explicitly not defined, but text/plain
96+
is suggested.
9797
9898
When a GET request comes in, several steps need to take place:
9999
@@ -345,7 +345,7 @@ def getAuthenticationResponse(self, authorized, args):
345345
def processPost(self, args):
346346
"""
347347
This method processes POST requests to the OpenID server URL.
348-
See the L{module documentation<openid.server.interface>} for
348+
See the L{module documentation<openid.server.server>} for
349349
more notes on when to use this method.
350350
351351

0 commit comments

Comments
 (0)