Differences From Artifact [365d927559]:
- File src/XMPPConnection.m — part of check-in [3a3855f187] at 2011-03-09 03:32:14 on branch trunk — Add basic STARTTLS support (user: florob@babelmonkeys.de, size: 9942) [annotate] [blame] [check-ins using]
To Artifact [4a47a74ef8]:
- File
src/XMPPConnection.m
— part of check-in
[991c7aeff2]
at
2011-03-10 21:14:32
on branch trunk
— Stop caching authentication mechanisms
We don't need to do that. In fact we had to do additional work. (user: florob@babelmonkeys.de, size: 9858) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
52 53 54 55 56 57 58 | sock = [[OFTCPSocket alloc] init]; parser = [[OFXMLParser alloc] init]; elementBuilder = [[OFXMLElementBuilder alloc] init]; port = 5222; useTLS = YES; | < < | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | sock = [[OFTCPSocket alloc] init]; parser = [[OFXMLParser alloc] init]; elementBuilder = [[OFXMLElementBuilder alloc] init]; port = 5222; useTLS = YES; parser.delegate = self; elementBuilder.delegate = self; return self; } - (void)dealloc |
︙ | ︙ | |||
268 269 270 271 272 273 274 | [jidElem.children.firstObject stringValue]]; of_log(@"Bound to JID: %@", [JID fullJID]); } } - (void)_handleFeatures: (OFXMLElement*)elem { | < < > > > > > > > | > | | | | | | | | | | | | | < | < < < < | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 | [jidElem.children.firstObject stringValue]]; of_log(@"Bound to JID: %@", [JID fullJID]); } } - (void)_handleFeatures: (OFXMLElement*)elem { OFXMLElement *starttls = [elem elementsForName: @"starttls" namespace: NS_STARTTLS].firstObject; OFXMLElement *bind = [elem elementsForName: @"bind" namespace: NS_BIND].firstObject; OFArray *mechs = [elem elementsForName: @"mechanisms" namespace: NS_SASL]; OFMutableArray *mechanisms = [OFMutableArray array]; if (starttls != nil) [self sendStanza: [OFXMLElement elementWithName: @"starttls" namespace: NS_STARTTLS]]; else if ([mechs count]) { for (OFXMLElement *mech in [mechs.firstObject children]) [mechanisms addObject: [mech.children.firstObject stringValue]]; if ([mechanisms containsObject: @"SCRAM-SHA-1"]) { authModule = [[XMPPSCRAMAuth alloc] initWithAuthcid: username password: password hash: [OFSHA1Hash class]]; [self _sendAuth: @"SCRAM-SHA-1"]; } else if ([mechanisms containsObject: @"PLAIN"]) { authModule = [[XMPPPLAINAuth alloc] initWithAuthcid: username password: password]; [self _sendAuth: @"PLAIN"]; } } else if (bind != nil) [self _sendResourceBind]; } - (void)elementBuilder: (OFXMLElementBuilder*)b didBuildElement: (OFXMLElement*)elem { elem.defaultNamespace = NS_CLIENT; [elem setPrefix: @"stream" |
︙ | ︙ | |||
319 320 321 322 323 324 325 | if ([elem.namespace isEqual: NS_STARTTLS]) { if ([elem.name isEqual: @"proceed"]) { /* FIXME: Catch errors here */ sock = [[GTLSSocket alloc] initWithSocket: sock]; /* Stream restart */ | < < | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 | if ([elem.namespace isEqual: NS_STARTTLS]) { if ([elem.name isEqual: @"proceed"]) { /* FIXME: Catch errors here */ sock = [[GTLSSocket alloc] initWithSocket: sock]; /* Stream restart */ parser.delegate = self; [self _startStream]; } else if ([elem.name isEqual: @"failure"]) /* TODO: Find/create an exception to throw here */ @throw [OFException newWithClass: isa]; } |
︙ | ︙ | |||
352 353 354 355 356 357 358 | } else if ([elem.name isEqual: @"success"]) { [authModule parseServerFinalMessage: [OFDataArray dataArrayWithBase64EncodedString: [elem.children.firstObject stringValue]]]; of_log(@"Auth successful"); /* Stream restart */ | < < < | 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 | } else if ([elem.name isEqual: @"success"]) { [authModule parseServerFinalMessage: [OFDataArray dataArrayWithBase64EncodedString: [elem.children.firstObject stringValue]]]; of_log(@"Auth successful"); /* Stream restart */ parser.delegate = self; [self _startStream]; } else if ([elem.name isEqual: @"failure"]) { of_log(@"Auth failed!"); // FIXME: Do more parsing/handling @throw [XMPPAuthFailedException newWithClass: isa connection: self |
︙ | ︙ |