Skip to content

Commit 72f5572

Browse files
author
Kevin Turner
committed
[project @ kvform: use KVFormError, catch in server.Signatory.sign]
1 parent 1fec1a2 commit 72f5572

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

‎openid/kvform.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
import types
66

7+
class KVFormError(ValueError):
8+
pass
9+
710
def seqToKV(seq, strict=False):
811
"""Represent a sequence of pairs of strings as newline-terminated
912
key:value pairs. The pairs are generated in the order given.
@@ -17,7 +20,7 @@ def seqToKV(seq, strict=False):
1720
def err(msg):
1821
formatted = 'seqToKV warning: %s: %r' % (msg, seq)
1922
if strict:
20-
raise ValueError(formatted)
23+
raise KVFormError(formatted)
2124
else:
2225
oidutil.log(formatted)
2326

@@ -30,11 +33,11 @@ def err(msg):
3033
k = str(k)
3134

3235
if '\n' in k:
33-
raise ValueError(
36+
raise KVFormError(
3437
'Invalid input for seqToKV: key contains newline: %r' % (k,))
3538

3639
if ':' in k:
37-
raise ValueError(
40+
raise KVFormError(
3841
'Invalid input for seqToKV: key contains colon: %r' % (k,))
3942

4043
if k.strip() != k:
@@ -47,7 +50,7 @@ def err(msg):
4750
v = str(v)
4851

4952
if '\n' in v:
50-
raise ValueError(
53+
raise KVFormError(
5154
'Invalid input for seqToKV: value contains newline: %r' % (v,))
5255

5356
if v.strip() != v:
@@ -68,7 +71,7 @@ def kvToSeq(data, strict=False):
6871
def err(msg):
6972
formatted = 'kvToSeq warning: %s: %r' % (msg, data)
7073
if strict:
71-
raise ValueError(formatted)
74+
raise KVFormError(formatted)
7275
else:
7376
oidutil.log(formatted)
7477

‎openid/server/server.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121

122122
from openid import cryptutil
123123
from openid import oidutil
124+
from openid import kvform
124125
from openid.dh import DiffieHellman
125126
from openid.store.nonce import mkNonce
126127
from openid.server.trustroot import TrustRoot, verifyReturnTo
@@ -222,7 +223,6 @@ def fromMessage(klass, message, op_endpoint=UNUSED):
222223

223224
fromMessage = classmethod(fromMessage)
224225

225-
226226
def answer(self, signatory):
227227
"""Respond to this request.
228228
@@ -1187,7 +1187,10 @@ def sign(self, response):
11871187
# dumb mode.
11881188
assoc = self.createAssociation(dumb=True)
11891189

1190-
signed_response.fields = assoc.signMessage(signed_response.fields)
1190+
try:
1191+
signed_response.fields = assoc.signMessage(signed_response.fields)
1192+
except kvform.KVFormError, err:
1193+
raise EncodingError(*err.args)
11911194
return signed_response
11921195

11931196

0 commit comments

Comments
 (0)