@@ -94,13 +94,13 @@ def setUp(self):
9494
9595 def test_construct (self ):
9696 self .failUnlessEqual ([], self .req .auth_policies )
97- self .failUnlessEqual (None , self .req .auth_age )
97+ self .failUnlessEqual (None , self .req .auth_time )
9898 self .failUnlessEqual ('pape' , self .req .ns_alias )
9999 self .failUnlessEqual (None , self .req .nist_auth_level )
100100
101- req2 = pape .Response ([pape .AUTH_MULTI_FACTOR ], 1000 , 3 )
101+ req2 = pape .Response ([pape .AUTH_MULTI_FACTOR ], "2004-12-11T10:30:44Z" , 3 )
102102 self .failUnlessEqual ([pape .AUTH_MULTI_FACTOR ], req2 .auth_policies )
103- self .failUnlessEqual (1000 , req2 .auth_age )
103+ self .failUnlessEqual ("2004-12-11T10:30:44Z" , req2 .auth_time )
104104 self .failUnlessEqual (3 , req2 .nist_auth_level )
105105
106106 def test_add_policy_uri (self ):
@@ -120,15 +120,13 @@ def test_getExtensionArgs(self):
120120 self .failUnlessEqual ({'auth_policies' : 'http://uri' }, self .req .getExtensionArgs ())
121121 self .req .addPolicyURI ('http://zig' )
122122 self .failUnlessEqual ({'auth_policies' : 'http://uri http://zig' }, self .req .getExtensionArgs ())
123- self .req .auth_age = 789
124- self .failUnlessEqual ({'auth_policies' : 'http://uri http://zig' , 'auth_age ' : '789' }, self .req .getExtensionArgs ())
123+ self .req .auth_time = "1776-07-04T14:43:12Z"
124+ self .failUnlessEqual ({'auth_policies' : 'http://uri http://zig' , 'auth_time ' : "1776-07-04T14:43:12Z" }, self .req .getExtensionArgs ())
125125 self .req .nist_auth_level = 3
126- self .failUnlessEqual ({'auth_policies' : 'http://uri http://zig' , 'auth_age ' : '789' , 'nist_auth_level' : '3' }, self .req .getExtensionArgs ())
126+ self .failUnlessEqual ({'auth_policies' : 'http://uri http://zig' , 'auth_time ' : "1776-07-04T14:43:12Z" , 'nist_auth_level' : '3' }, self .req .getExtensionArgs ())
127127
128128 def test_getExtensionArgs_error_auth_age (self ):
129- self .req .auth_age = "older than the sun"
130- self .failUnlessRaises (ValueError , self .req .getExtensionArgs )
131- self .req .auth_age = - 10
129+ self .req .auth_time = "long ago"
132130 self .failUnlessRaises (ValueError , self .req .getExtensionArgs )
133131
134132 def test_getExtensionArgs_error_nist_auth_level (self ):
@@ -141,45 +139,45 @@ def test_getExtensionArgs_error_nist_auth_level(self):
141139
142140 def test_parseExtensionArgs (self ):
143141 args = {'auth_policies' : 'http://foo http://bar' ,
144- 'auth_age ' : '9 ' }
142+ 'auth_time ' : '1970-01-01T00:00:00Z ' }
145143 self .req .parseExtensionArgs (args )
146- self .failUnlessEqual (9 , self .req .auth_age )
144+ self .failUnlessEqual ('1970-01-01T00:00:00Z' , self .req .auth_time )
147145 self .failUnlessEqual (['http://foo' ,'http://bar' ], self .req .auth_policies )
148146
149147 def test_parseExtensionArgs_empty (self ):
150148 self .req .parseExtensionArgs ({})
151- self .failUnlessEqual (None , self .req .auth_age )
149+ self .failUnlessEqual (None , self .req .auth_time )
152150 self .failUnlessEqual ([], self .req .auth_policies )
153151
154152 def test_parseExtensionArgs_strict_bogus1 (self ):
155153 args = {'auth_policies' : 'http://foo http://bar' ,
156- 'auth_age ' : 'not too old ' }
154+ 'auth_time ' : 'yesterday ' }
157155 self .failUnlessRaises (ValueError , self .req .parseExtensionArgs ,
158156 args , True )
159157
160158 def test_parseExtensionArgs_strict_bogus2 (self ):
161159 args = {'auth_policies' : 'http://foo http://bar' ,
162- 'auth_age ' : '63 ' ,
160+ 'auth_time ' : '1970-01-01T00:00:00Z ' ,
163161 'nist_auth_level' : 'some' }
164162 self .failUnlessRaises (ValueError , self .req .parseExtensionArgs ,
165163 args , True )
166164
167165 def test_parseExtensionArgs_strict_good (self ):
168166 args = {'auth_policies' : 'http://foo http://bar' ,
169- 'auth_age ' : '0 ' ,
167+ 'auth_time ' : '1970-01-01T00:00:00Z ' ,
170168 'nist_auth_level' : '0' }
171169 self .req .parseExtensionArgs (args , True )
172170 self .failUnlessEqual (['http://foo' ,'http://bar' ], self .req .auth_policies )
173- self .failUnlessEqual (0 , self .req .auth_age )
171+ self .failUnlessEqual ('1970-01-01T00:00:00Z' , self .req .auth_time )
174172 self .failUnlessEqual (0 , self .req .nist_auth_level )
175173
176174 def test_parseExtensionArgs_nostrict_bogus (self ):
177175 args = {'auth_policies' : 'http://foo http://bar' ,
178- 'auth_age ' : 'old ' ,
176+ 'auth_time ' : 'when the cows come home ' ,
179177 'nist_auth_level' : 'some' }
180178 self .req .parseExtensionArgs (args )
181179 self .failUnlessEqual (['http://foo' ,'http://bar' ], self .req .auth_policies )
182- self .failUnlessEqual (None , self .req .auth_age )
180+ self .failUnlessEqual (None , self .req .auth_time )
183181 self .failUnlessEqual (None , self .req .nist_auth_level )
184182
185183 def test_fromSuccessResponse (self ):
@@ -188,24 +186,24 @@ def test_fromSuccessResponse(self):
188186 'ns' : OPENID2_NS ,
189187 'ns.pape' : pape .ns_uri ,
190188 'pape.auth_policies' : ' ' .join ([pape .AUTH_MULTI_FACTOR , pape .AUTH_PHISHING_RESISTANT ]),
191- 'pape.auth_age ' : '5476 '
189+ 'pape.auth_time ' : '1970-01-01T00:00:00Z '
192190 })
193191 signed_stuff = {
194192 'auth_policies' : ' ' .join ([pape .AUTH_MULTI_FACTOR , pape .AUTH_PHISHING_RESISTANT ]),
195- 'auth_age ' : '5476 '
193+ 'auth_time ' : '1970-01-01T00:00:00Z '
196194 }
197195 oid_req = DummySuccessResponse (openid_req_msg , signed_stuff )
198196 req = pape .Response .fromSuccessResponse (oid_req )
199197 self .failUnlessEqual ([pape .AUTH_MULTI_FACTOR , pape .AUTH_PHISHING_RESISTANT ], req .auth_policies )
200- self .failUnlessEqual (5476 , req .auth_age )
198+ self .failUnlessEqual ('1970-01-01T00:00:00Z' , req .auth_time )
201199
202200 def test_fromSuccessResponseNoSignedArgs (self ):
203201 openid_req_msg = Message .fromOpenIDArgs ({
204202 'mode' : 'id_res' ,
205203 'ns' : OPENID2_NS ,
206204 'ns.pape' : pape .ns_uri ,
207205 'pape.auth_policies' : ' ' .join ([pape .AUTH_MULTI_FACTOR , pape .AUTH_PHISHING_RESISTANT ]),
208- 'pape.auth_age ' : '5476 '
206+ 'pape.auth_time ' : '1970-01-01T00:00:00Z '
209207 })
210208
211209 signed_stuff = {}
0 commit comments