Overview
Comment: | OFDNSResolver: Add a fallback for localhost |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
4671310302b3d80f5ae380808f24e0bb |
User & Date: | js on 2018-08-04 00:06:36 |
Other Links: | manifest | tags |
Context
2018-08-04
| ||
00:48 | Add utils/ofdns check-in: aefaa06dd1 user: js tags: trunk | |
00:06 | OFDNSResolver: Add a fallback for localhost check-in: 4671310302 user: js tags: trunk | |
2018-08-02
| ||
01:16 | OFDNSResolver: Add support for parsing SOA records check-in: c165d49455 user: js tags: trunk | |
Changes
Modified src/OFDNSResolver.m from [d938f274bb] to [785a05654f].
︙ | ︙ | |||
45 46 47 48 49 50 51 | # include <iphlpapi.h> # undef interface #endif /* * RFC 1035 doesn't specify if pointers to pointers are allowed, and if so how * many. Since it's unspecified, we have to assume that it might happen, but we | | | | | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | # include <iphlpapi.h> # undef interface #endif /* * RFC 1035 doesn't specify if pointers to pointers are allowed, and if so how * many. Since it's unspecified, we have to assume that it might happen, but we * also want to limit it to avoid DoS. Limiting it to 16 levels of pointers and * immediately rejecting pointers to itself seems like a fair balance. */ #define MAX_ALLOWED_POINTERS 16 /* * TODO: * * - Timeouts * - Resolve with each search domain * - Iterate through name servers |
︙ | ︙ | |||
263 264 265 266 267 268 269 | return [[[OFADNSResourceRecord alloc] initWithName: name address: address TTL: TTL] autorelease]; } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_NS) { size_t j = i; OFString *authoritativeHost = parseName(buffer, length, &j, | | | | | | 263 264 265 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 311 312 | return [[[OFADNSResourceRecord alloc] initWithName: name address: address TTL: TTL] autorelease]; } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_NS) { size_t j = i; OFString *authoritativeHost = parseName(buffer, length, &j, MAX_ALLOWED_POINTERS); if (j != i + dataLength) @throw [OFInvalidServerReplyException exception]; return [[[OFNSDNSResourceRecord alloc] initWithName: name recordClass: recordClass authoritativeHost: authoritativeHost TTL: TTL] autorelease]; } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_CNAME) { size_t j = i; OFString *alias = parseName(buffer, length, &j, MAX_ALLOWED_POINTERS); if (j != i + dataLength) @throw [OFInvalidServerReplyException exception]; return [[[OFCNAMEDNSResourceRecord alloc] initWithName: name recordClass: recordClass alias: alias TTL: TTL] autorelease]; } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_SOA) { size_t j = i; OFString *primaryNameServer = parseName(buffer, length, &j, MAX_ALLOWED_POINTERS); OFString *responsiblePerson; uint32_t serialNumber, refreshInterval, retryInterval; uint32_t expirationInterval, minTTL; if (j > i + dataLength) @throw [OFInvalidServerReplyException exception]; responsiblePerson = parseName(buffer, length, &j, MAX_ALLOWED_POINTERS); if (dataLength - (j - i) != 20) @throw [OFInvalidServerReplyException exception]; serialNumber = (buffer[j] << 24) | (buffer[j + 1] << 16) | (buffer[j + 2] << 8) | buffer[j + 3]; refreshInterval = (buffer[j + 4] << 24) | |
︙ | ︙ | |||
330 331 332 333 334 335 336 | retryInterval: retryInterval expirationInterval: expirationInterval minTTL: minTTL TTL: TTL] autorelease]; } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_PTR) { size_t j = i; OFString *domainName = parseName(buffer, length, &j, | | | 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 | retryInterval: retryInterval expirationInterval: expirationInterval minTTL: minTTL TTL: TTL] autorelease]; } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_PTR) { size_t j = i; OFString *domainName = parseName(buffer, length, &j, MAX_ALLOWED_POINTERS); if (j != i + dataLength) @throw [OFInvalidServerReplyException exception]; return [[[OFPTRDNSResourceRecord alloc] initWithName: name recordClass: recordClass |
︙ | ︙ | |||
352 353 354 355 356 357 358 | if (dataLength < 2) @throw [OFInvalidServerReplyException exception]; preference = (buffer[i] << 8) | buffer[i + 1]; j = i + 2; mailExchange = parseName(buffer, length, &j, | | | 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 | if (dataLength < 2) @throw [OFInvalidServerReplyException exception]; preference = (buffer[i] << 8) | buffer[i + 1]; j = i + 2; mailExchange = parseName(buffer, length, &j, MAX_ALLOWED_POINTERS); if (j != i + dataLength) @throw [OFInvalidServerReplyException exception]; return [[[OFMXDNSResourceRecord alloc] initWithName: name recordClass: recordClass |
︙ | ︙ | |||
456 457 458 459 460 461 462 463 | } - (instancetype)init { self = [super init]; @try { #ifdef OF_WINDOWS | > < < < < < | 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 | } - (instancetype)init { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); #ifdef OF_WINDOWS OFString *path; #endif _minNumberOfDotsInAbsoluteName = 1; #ifdef OF_HAVE_FILES # if defined(OF_WINDOWS) path = [[OFWindowsRegistryKey localMachineKey] stringForValue: @"DataBasePath" subKeyPath: @"SYSTEM\\CurrentControlSet\\Services\\" @"Tcpip\\Parameters"]; path = [path stringByAppendingPathComponent: @"hosts"]; if (path != nil) [self of_parseHosts: path]; # elif defined(OF_HAIKU) [self of_parseHosts: @"/boot/common/settings/network/hosts"]; # elif defined(OF_MORPHOS) [self of_parseHosts: @"ENVARC:sys/net/hosts"]; # elif defined(OF_AMIGAOS4) [self of_parseHosts: @"DEVS:Internet/hosts"]; # elif defined(OF_AMIGAOS) |
︙ | ︙ | |||
500 501 502 503 504 505 506 | [self of_parseResolvConf: @"/etc/resolv.conf.tail"]; # endif #endif #ifdef OF_WINDOWS [self of_parseNetworkParams]; #endif | | > > > > > > > > > | > > | > > | | > > > > > > | 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 | [self of_parseResolvConf: @"/etc/resolv.conf.tail"]; # endif #endif #ifdef OF_WINDOWS [self of_parseNetworkParams]; #endif if (_staticHosts == nil) { OFArray *localhost = #ifdef HAVE_IPV6 localhost = [OFArray arrayWithObjects: @"::1", @"127.0.0.1", nil]; #else localhost = [OFArray arrayWithObject: @"127.0.0.1"]; #endif _staticHosts = [[OFDictionary alloc] initWithObject: localhost forKey: @"localhost"]; } if (_nameServers == nil) #ifdef HAVE_IPV6 _nameServers = [[OFArray alloc] initWithObjects: @"127.0.0.1", @"::1", nil]; #else _nameServers = [[OFArray alloc] initWithObject: @"127.0.0.1"]; #endif if (_localDomain == nil) _localDomain = [domainFromHostname() copy]; if (_searchDomains == nil) { if (_localDomain != nil) _searchDomains = [[OFArray alloc] initWithObject: _localDomain]; else _searchDomains = [[OFArray alloc] init]; } _queries = [[OFMutableDictionary alloc] init]; objc_autoreleasePoolPop(pool); } @catch (id e) { [self release]; @throw e; } return self; } |
︙ | ︙ | |||
837 838 839 840 841 842 843 | /* * Skip over the questions - we use the ID to identify the * query. * * TODO: Compare to our query, just in case? */ for (uint_fast16_t j = 0; j < numQuestions; j++) { | | | | 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 | /* * Skip over the questions - we use the ID to identify the * query. * * TODO: Compare to our query, just in case? */ for (uint_fast16_t j = 0; j < numQuestions; j++) { parseName(buffer, length, &i, MAX_ALLOWED_POINTERS); i += 4; } for (uint_fast16_t j = 0; j < numAnswers; j++) { OFString *name = parseName(buffer, length, &i, MAX_ALLOWED_POINTERS); of_dns_resource_record_class_t recordClass; of_dns_resource_record_type_t recordType; uint32_t TTL; uint16_t dataLength; OFDNSResourceRecord *record; if (i + 10 > length) |
︙ | ︙ |