Changeset 9877 for branches/bosh_support/src/common/xmpp/auth_nb.py
- Timestamp:
- 07/03/08 01:29:10 (5 months ago)
- Files:
-
- 1 modified
-
branches/bosh_support/src/common/xmpp/auth_nb.py (modified) (24 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/bosh_support/src/common/xmpp/auth_nb.py
r9867 r9877 22 22 from client import PlugIn 23 23 import sha,base64,random,dispatcher_nb 24 25 import logging 26 log = logging.getLogger('gajim.c.x.auth_nb') 27 24 28 25 29 import md5 … … 129 133 if not feats.getTag('mechanisms', namespace=NS_SASL): 130 134 self.startsasl='not-supported' 131 self.DEBUG('SASL not supported by server', 'error')135 log.error('SASL not supported by server') 132 136 return 133 137 mecs=[] … … 146 150 else: 147 151 self.startsasl='failure' 148 self.DEBUG('I can only use DIGEST-MD5 and PLAIN mecanisms.', 'error')152 log.error('I can only use DIGEST-MD5 and PLAIN mecanisms.') 149 153 return 150 154 self.startsasl='in-process' … … 162 166 except: 163 167 reason = challenge 164 self.DEBUG('Failed SASL authentification: %s' % reason, 'error')168 log.error('Failed SASL authentification: %s' % reason) 165 169 if self.on_sasl : 166 170 self.on_sasl () … … 168 172 elif challenge.getName() == 'success': 169 173 self.startsasl='success' 170 self.DEBUG('Successfully authenticated with remote server.', 'ok')174 log.info('Successfully authenticated with remote server.') 171 175 handlers=self._owner.Dispatcher.dumpHandlers() 172 176 print '6' * 79 … … 183 187 incoming_data = challenge.getData() 184 188 data=base64.decodestring(incoming_data) 185 self.DEBUG('Got challenge:'+data,'ok')189 log.info('Got challenge:'+data) 186 190 chal = challenge_splitter(data) 187 191 if not self.realm and chal.has_key('realm'): … … 225 229 else: 226 230 self.startsasl='failure' 227 self.DEBUG('Failed SASL authentification: unknown challenge', 'error')231 log.error('Failed SASL authentification: unknown challenge') 228 232 if self.on_sasl : 229 233 self.on_sasl () … … 237 241 ''' Caches username, password and resource for auth. ''' 238 242 PlugIn.__init__(self) 239 self.DBG_LINE ='gen_auth'240 243 self.user = user 241 244 self.password= password … … 249 252 if not self.resource: 250 253 return self.authComponent(owner) 251 self.DEBUG('Querying server about possible auth methods', 'start')254 log.info('Querying server about possible auth methods') 252 255 self.owner = owner 253 256 … … 258 261 def _on_username(self, resp): 259 262 if not isResultNode(resp): 260 self.DEBUG('No result node arrived! Aborting...','error')263 log.error('No result node arrived! Aborting...') 261 264 return self.on_auth(None) 262 265 iq=Iq(typ='set',node=resp) … … 266 269 267 270 if query.getTag('digest'): 268 self.DEBUG("Performing digest authentication",'ok')271 log.info("Performing digest authentication") 269 272 query.setTagData('digest', 270 273 sha.new(self.owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()) … … 275 278 token=query.getTagData('token') 276 279 seq=query.getTagData('sequence') 277 self.DEBUG("Performing zero-k authentication",'ok')280 log.info("Performing zero-k authentication") 278 281 hash = sha.new(sha.new(self.password).hexdigest()+token).hexdigest() 279 282 for foo in xrange(int(seq)): … … 282 285 self._method='0k' 283 286 else: 284 self.DEBUG("Sequre methods unsupported, performing plain text authentication",'warn')287 log.warn("Sequre methods unsupported, performing plain text authentication") 285 288 query.setTagData('password',self.password) 286 289 self._method='plain' … … 289 292 def _on_auth(self, resp): 290 293 if isResultNode(resp): 291 self.DEBUG('Sucessfully authenticated with remove host.','ok')294 log.info('Sucessfully authenticated with remove host.') 292 295 self.owner.User=self.user 293 296 self.owner.Resource=self.resource 294 297 self.owner._registered_name=self.owner.User+'@'+self.owner.Server+'/'+self.owner.Resource 295 298 return self.on_auth(self._method) 296 self.DEBUG('Authentication failed!','error')299 log.error('Authentication failed!') 297 300 return self.on_auth(None) 298 301 … … 310 313 self.Dispatcher.ProcessNonBlocking(data) 311 314 if not self.handshake: 312 self.DEBUG('waiting on handshake', 'notify')315 log.info('waiting on handshake') 313 316 return 314 317 self._owner.onreceive(None) … … 330 333 def __init__(self): 331 334 PlugIn.__init__(self) 332 self.DBG_LINE='bind'333 335 self.bound=None 334 336 … … 337 339 if not feats.getTag('bind',namespace=NS_BIND): 338 340 self.bound='failure' 339 self.DEBUG('Server does not requested binding.','error')341 log.error('Server does not requested binding.') 340 342 return 341 343 if feats.getTag('session',namespace=NS_SESSION): self.session=1 … … 373 375 if isResultNode(resp): 374 376 self.bound.append(resp.getTag('bind').getTagData('jid')) 375 self.DEBUG('Successfully bound %s.'%self.bound[-1],'ok')377 log.info('Successfully bound %s.'%self.bound[-1]) 376 378 jid=JID(resp.getTag('bind').getTagData('jid')) 377 379 self._owner.User=jid.getNode() … … 380 382 payload=[Node('session', attrs={'xmlns':NS_SESSION})]), func=self._on_session) 381 383 elif resp: 382 self.DEBUG('Binding failed: %s.' % resp.getTag('error'),'error')384 log.error('Binding failed: %s.' % resp.getTag('error')) 383 385 self.on_bound(None) 384 386 else: 385 self.DEBUG('Binding failed: timeout expired.', 'error')387 log.error('Binding failed: timeout expired.') 386 388 self.on_bound(None) 387 389 … … 389 391 self._owner.onreceive(None) 390 392 if isResultNode(resp): 391 self.DEBUG('Successfully opened session.', 'ok')393 log.info('Successfully opened session.') 392 394 self.session = 1 393 395 self.on_bound('ok') 394 396 else: 395 self.DEBUG('Session open failed.', 'error')397 log.error('Session open failed.') 396 398 self.session = 0 397 399 self.on_bound(None) 398 400 self._owner.onreceive(None) 399 401 if isResultNode(resp): 400 self.DEBUG('Successfully opened session.', 'ok')402 log.info('Successfully opened session.') 401 403 self.session = 1 402 404 self.on_bound('ok') 403 405 else: 404 self.DEBUG('Session open failed.', 'error')406 log.error('Session open failed.') 405 407 self.session = 0 406 408 self.on_bound(None) … … 412 414 def __init__(self): 413 415 PlugIn.__init__(self) 414 self.DBG_LINE='bind'415 416 self.bound=None 416 417 self.needsUnregister=None … … 449 450 def _on_bind_reponse(self, res): 450 451 if resp and resp.getAttr('error'): 451 self.DEBUG('Binding failed: %s.' % resp.getAttr('error'), 'error')452 log.error('Binding failed: %s.' % resp.getAttr('error')) 452 453 elif resp: 453 self.DEBUG('Successfully bound.', 'ok')454 log.info('Successfully bound.') 454 455 if self.on_bind: 455 456 self.on_bind('ok') 456 457 else: 457 self.DEBUG('Binding failed: timeout expired.', 'error')458 log.error('Binding failed: timeout expired.') 458 459 if self.on_bind: 459 460 self.on_bind(None) … … 463 464 if not feats.getTag('bind',namespace=NS_BIND): 464 465 self.bound='failure' 465 self.DEBUG('Server does not requested binding.','error')466 log.error('Server does not requested binding.') 466 467 return 467 468 if feats.getTag('session',namespace=NS_SESSION): self.session=1 … … 474 475 resp=self._owner.SendAndWaitForResponse(Protocol('bind',attrs={'name':domain},xmlns=NS_COMPONENT_1)) 475 476 if resp and resp.getAttr('error'): 476 self.DEBUG('Binding failed: %s.'%resp.getAttr('error'),'error')477 log.error('Binding failed: %s.'%resp.getAttr('error')) 477 478 elif resp: 478 self.DEBUG('Successfully bound.','ok')479 log.info('Successfully bound.') 479 480 return 'ok' 480 481 else: 481 self.DEBUG('Binding failed: timeout expired.','error')482 log.error('Binding failed: timeout expired.') 482 483 return ''
