Introduce MacOSDnsServerAddressStreamProvider which correctly detect all nameserver configuration on MacOS (#9161)
Motivation: On MacOS it is not really good enough to check /etc/resolv.conf to determine the nameservers to use. We should retrieve the nameservers using the same way as mDNSResponser and chromium does by doing a JNI call. Modifications: Add MacOSDnsServerAddressStreamProvider and testcase Result: Use correct nameservers by default on MacOS.
This commit is contained in:
Norman Maurer
GitHub
parent
de537b98ef
commit
939e928312
@ -237,3 +237,12 @@ This product contains the Maven wrapper scripts from 'Maven Wrapper', that provi
|
|||||||
* license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
|
* license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
|
||||||
* HOMEPAGE:
|
* HOMEPAGE:
|
||||||
* https://github.com/takari/maven-wrapper
|
* https://github.com/takari/maven-wrapper
|
||||||
|
|
||||||
|
This product contains the dnsinfo.h header file, that provides a way to retrieve the system DNS configuration on MacOS.
|
||||||
|
This private header is also used by Apple's open source
|
||||||
|
mDNSResponder (https://opensource.apple.com/tarballs/mDNSResponder/).
|
||||||
|
|
||||||
|
* LICENSE:
|
||||||
|
* license/LICENSE.dnsinfo.txt (Apache License 2.0)
|
||||||
|
* HOMEPAGE:
|
||||||
|
* http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h
|
||||||
31
all/pom.xml
31
all/pom.xml
@ -65,6 +65,14 @@
|
|||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>netty-resolver-dns-native-macos</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>osx-x86_64</classifier>
|
||||||
|
<scope>compile</scope>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</profile>
|
</profile>
|
||||||
<profile>
|
<profile>
|
||||||
@ -89,6 +97,14 @@
|
|||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>netty-resolver-dns-native-macos</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>osx-x86_64</classifier>
|
||||||
|
<scope>compile</scope>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
||||||
@ -120,6 +136,13 @@
|
|||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>netty-resolver-dns-native-macos</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</profile>
|
</profile>
|
||||||
<!-- The mac, openbsd and freebsd profile will only include the native jar for epol to the all jar.
|
<!-- The mac, openbsd and freebsd profile will only include the native jar for epol to the all jar.
|
||||||
@ -142,6 +165,14 @@
|
|||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>netty-resolver-dns-native-macos</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>osx-x86_64</classifier>
|
||||||
|
<scope>compile</scope>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
<!-- Just include the classes for the other platform so these are at least present in the netty-all artifact -->
|
<!-- Just include the classes for the other platform so these are at least present in the netty-all artifact -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
|
|||||||
22
license/LICENSE.dnsinfo.txt
Normal file
22
license/LICENSE.dnsinfo.txt
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2004-2006, 2008, 2009, 2011 Apple Inc. All rights reserved.
|
||||||
|
*
|
||||||
|
* @APPLE_LICENSE_HEADER_START@
|
||||||
|
*
|
||||||
|
* This file contains Original Code and/or Modifications of Original Code
|
||||||
|
* as defined in and that are subject to the Apple Public Source License
|
||||||
|
* Version 2.0 (the 'License'). You may not use this file except in
|
||||||
|
* compliance with the License. Please obtain a copy of the License at
|
||||||
|
* http://www.opensource.apple.com/apsl/ and read it before using this
|
||||||
|
* file.
|
||||||
|
*
|
||||||
|
* The Original Code and all software distributed under the License are
|
||||||
|
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
|
||||||
|
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
|
||||||
|
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
|
||||||
|
* Please see the License for the specific language governing rights and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
* @APPLE_LICENSE_HEADER_END@
|
||||||
|
*/
|
||||||
2
pom.xml
2
pom.xml
@ -357,6 +357,7 @@
|
|||||||
<module>codec-xml</module>
|
<module>codec-xml</module>
|
||||||
<module>resolver</module>
|
<module>resolver</module>
|
||||||
<module>resolver-dns</module>
|
<module>resolver-dns</module>
|
||||||
|
<module>resolver-dns-native-macos</module>
|
||||||
<module>tarball</module>
|
<module>tarball</module>
|
||||||
<module>transport</module>
|
<module>transport</module>
|
||||||
<module>transport-native-unix-common-tests</module>
|
<module>transport-native-unix-common-tests</module>
|
||||||
@ -732,6 +733,7 @@
|
|||||||
<version>0.13.1</version>
|
<version>0.13.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<parameter>
|
<parameter>
|
||||||
|
<ignoreMissingOldVersion>true</ignoreMissingOldVersion>
|
||||||
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
|
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
|
||||||
<breakBuildOnSourceIncompatibleModifications>true</breakBuildOnSourceIncompatibleModifications>
|
<breakBuildOnSourceIncompatibleModifications>true</breakBuildOnSourceIncompatibleModifications>
|
||||||
<oldVersionPattern>\d+\.\d+\.\d+\.Final</oldVersionPattern>
|
<oldVersionPattern>\d+\.\d+\.\d+\.Final</oldVersionPattern>
|
||||||
|
|||||||
185
resolver-dns-native-macos/pom.xml
Normal file
185
resolver-dns-native-macos/pom.xml
Normal file
@ -0,0 +1,185 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!--
|
||||||
|
~ Copyright 2019 The Netty Project
|
||||||
|
~
|
||||||
|
~ The Netty Project licenses this file to you under the Apache License,
|
||||||
|
~ version 2.0 (the "License"); you may not use this file except in compliance
|
||||||
|
~ with the License. You may obtain a copy of the License at:
|
||||||
|
~
|
||||||
|
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
~
|
||||||
|
~ Unless required by applicable law or agreed to in writing, software
|
||||||
|
~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
~ License for the specific language governing permissions and limitations
|
||||||
|
~ under the License.
|
||||||
|
-->
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<parent>
|
||||||
|
<groupId>io.netty</groupId>
|
||||||
|
<artifactId>netty-parent</artifactId>
|
||||||
|
<version>4.1.42.Final-SNAPSHOT</version>
|
||||||
|
</parent>
|
||||||
|
<artifactId>netty-resolver-dns-native-macos</artifactId>
|
||||||
|
|
||||||
|
<name>Netty/Resolver/DNS/MacOS</name>
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>mac</id>
|
||||||
|
<activation>
|
||||||
|
<os>
|
||||||
|
<family>mac</family>
|
||||||
|
</os>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<jni.compiler.args.ldflags>LDFLAGS=-Wl,-weak_library,${unix.common.lib.unpacked.dir}/lib${unix.common.lib.name}.a</jni.compiler.args.ldflags>
|
||||||
|
<skipTests>false</skipTests>
|
||||||
|
</properties>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<!-- unpack the unix-common static library and include files -->
|
||||||
|
<execution>
|
||||||
|
<id>unpack</id>
|
||||||
|
<phase>generate-sources</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>unpack-dependencies</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<includeGroupIds>${project.groupId}</includeGroupIds>
|
||||||
|
<includeArtifactIds>netty-transport-native-unix-common</includeArtifactIds>
|
||||||
|
<classifier>${jni.classifier}</classifier>
|
||||||
|
<outputDirectory>${unix.common.lib.dir}</outputDirectory>
|
||||||
|
<includes>META-INF/native/**</includes>
|
||||||
|
<overWriteReleases>false</overWriteReleases>
|
||||||
|
<overWriteSnapshots>true</overWriteSnapshots>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.fusesource.hawtjni</groupId>
|
||||||
|
<artifactId>maven-hawtjni-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>build-native-lib</id>
|
||||||
|
<configuration>
|
||||||
|
<name>netty_resolver_dns_native_macos_${os.detected.arch}</name>
|
||||||
|
<nativeSourceDirectory>${project.basedir}/src/main/c</nativeSourceDirectory>
|
||||||
|
<libDirectory>${project.build.outputDirectory}</libDirectory>
|
||||||
|
<!-- We use Maven's artifact classifier instead.
|
||||||
|
This hack will make the hawtjni plugin to put the native library
|
||||||
|
under 'META-INF/native' rather than 'META-INF/native/${platform}'. -->
|
||||||
|
<platform>.</platform>
|
||||||
|
<configureArgs>
|
||||||
|
<arg>${jni.compiler.args.ldflags}</arg>
|
||||||
|
<arg>${jni.compiler.args.cflags}</arg>
|
||||||
|
</configureArgs>
|
||||||
|
</configuration>
|
||||||
|
<goals>
|
||||||
|
<goal>generate</goal>
|
||||||
|
<goal>build</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<!-- Generate the JAR that contains the native library in it. -->
|
||||||
|
<execution>
|
||||||
|
<id>native-jar</id>
|
||||||
|
<goals>
|
||||||
|
<goal>jar</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<archive>
|
||||||
|
<manifest>
|
||||||
|
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
|
||||||
|
</manifest>
|
||||||
|
<manifestEntries>
|
||||||
|
<Bundle-NativeCode>META-INF/native/libnetty_resolver_dns_native_macos_${os.detected.arch}.jnilib; osname=MacOSX, processor=${os.detected.arch}"</Bundle-NativeCode>
|
||||||
|
<Automatic-Module-Name>${javaModuleName}</Automatic-Module-Name>
|
||||||
|
</manifestEntries>
|
||||||
|
<index>true</index>
|
||||||
|
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
||||||
|
</archive>
|
||||||
|
<classifier>${jni.classifier}</classifier>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.netty</groupId>
|
||||||
|
<artifactId>netty-transport-native-unix-common</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>${jni.classifier}</classifier>
|
||||||
|
<!--
|
||||||
|
The unix-common with classifier dependency is optional because it is not a runtime dependency, but a build time
|
||||||
|
dependency to get the static library which is built directly into the shared library generated by this project.
|
||||||
|
-->
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<javaModuleName>io.netty.resolver.dns.macos</javaModuleName>
|
||||||
|
<!-- Needed as we use SelfSignedCertificate in our tests -->
|
||||||
|
<unix.common.lib.name>netty-unix-common</unix.common.lib.name>
|
||||||
|
<unix.common.lib.dir>${project.build.directory}/unix-common-lib</unix.common.lib.dir>
|
||||||
|
<unix.common.lib.unpacked.dir>${unix.common.lib.dir}/META-INF/native/lib</unix.common.lib.unpacked.dir>
|
||||||
|
<unix.common.include.unpacked.dir>${unix.common.lib.dir}/META-INF/native/include</unix.common.include.unpacked.dir>
|
||||||
|
<jni.compiler.args.cflags>CFLAGS=-O3 -Werror -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden -I${unix.common.include.unpacked.dir}</jni.compiler.args.cflags>
|
||||||
|
<jni.compiler.args.ldflags>LDFLAGS=-z now -L${unix.common.lib.unpacked.dir} -Wl,--whole-archive -l${unix.common.lib.name} -Wl,--no-whole-archive</jni.compiler.args.ldflags>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.netty</groupId>
|
||||||
|
<artifactId>netty-common</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.netty</groupId>
|
||||||
|
<artifactId>netty-resolver-dns</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.netty</groupId>
|
||||||
|
<artifactId>netty-transport-native-unix-common</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<!-- Generate the fallback JAR that does not contain the native library. -->
|
||||||
|
<execution>
|
||||||
|
<id>default-jar</id>
|
||||||
|
<configuration>
|
||||||
|
<excludes>
|
||||||
|
<exclude>META-INF/native/**</exclude>
|
||||||
|
</excludes>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</project>
|
||||||
|
|
||||||
106
resolver-dns-native-macos/src/main/c/dnsinfo.h
Normal file
106
resolver-dns-native-macos/src/main/c/dnsinfo.h
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project licenses this file to you under the Apache License,
|
||||||
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at:
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2004-2006, 2008, 2009, 2011 Apple Inc. All rights reserved.
|
||||||
|
*
|
||||||
|
* @APPLE_LICENSE_HEADER_START@
|
||||||
|
*
|
||||||
|
* This file contains Original Code and/or Modifications of Original Code
|
||||||
|
* as defined in and that are subject to the Apple Public Source License
|
||||||
|
* Version 2.0 (the 'License'). You may not use this file except in
|
||||||
|
* compliance with the License. Please obtain a copy of the License at
|
||||||
|
* http://www.opensource.apple.com/apsl/ and read it before using this
|
||||||
|
* file.
|
||||||
|
*
|
||||||
|
* The Original Code and all software distributed under the License are
|
||||||
|
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
|
||||||
|
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
|
||||||
|
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
|
||||||
|
* Please see the License for the specific language governing rights and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
* @APPLE_LICENSE_HEADER_END@
|
||||||
|
*/
|
||||||
|
#ifndef __DNSINFO_H__
|
||||||
|
#define __DNSINFO_H__
|
||||||
|
/*
|
||||||
|
* These routines provide access to the systems DNS configuration
|
||||||
|
*/
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#define DNSINFO_VERSION 20111104
|
||||||
|
#define DEFAULT_SEARCH_ORDER 200000 /* search order for the "default" resolver domain name */
|
||||||
|
#define DNS_PTR(type, name) \
|
||||||
|
union { \
|
||||||
|
type name; \
|
||||||
|
uint64_t _ ## name ## _p; \
|
||||||
|
}
|
||||||
|
#define DNS_VAR(type, name) \
|
||||||
|
type name
|
||||||
|
#pragma pack(4)
|
||||||
|
typedef struct {
|
||||||
|
struct in_addr address;
|
||||||
|
struct in_addr mask;
|
||||||
|
} dns_sortaddr_t;
|
||||||
|
#pragma pack()
|
||||||
|
#pragma pack(4)
|
||||||
|
typedef struct {
|
||||||
|
DNS_PTR(char *, domain); /* domain */
|
||||||
|
DNS_VAR(int32_t, n_nameserver); /* # nameserver */
|
||||||
|
DNS_PTR(struct sockaddr **, nameserver);
|
||||||
|
DNS_VAR(uint16_t, port); /* port (in host byte order) */
|
||||||
|
DNS_VAR(int32_t, n_search); /* # search */
|
||||||
|
DNS_PTR(char **, search);
|
||||||
|
DNS_VAR(int32_t, n_sortaddr); /* # sortaddr */
|
||||||
|
DNS_PTR(dns_sortaddr_t **, sortaddr);
|
||||||
|
DNS_PTR(char *, options); /* options */
|
||||||
|
DNS_VAR(uint32_t, timeout); /* timeout */
|
||||||
|
DNS_VAR(uint32_t, search_order); /* search_order */
|
||||||
|
DNS_VAR(uint32_t, if_index);
|
||||||
|
DNS_VAR(uint32_t, flags);
|
||||||
|
DNS_VAR(uint32_t, reach_flags); /* SCNetworkReachabilityFlags */
|
||||||
|
DNS_VAR(uint32_t, reserved[5]);
|
||||||
|
} dns_resolver_t;
|
||||||
|
#pragma pack()
|
||||||
|
#define DNS_RESOLVER_FLAGS_SCOPED 1 /* configuration is for scoped questions */
|
||||||
|
#pragma pack(4)
|
||||||
|
typedef struct {
|
||||||
|
DNS_VAR(int32_t, n_resolver); /* resolver configurations */
|
||||||
|
DNS_PTR(dns_resolver_t **, resolver);
|
||||||
|
DNS_VAR(int32_t, n_scoped_resolver); /* "scoped" resolver configurations */
|
||||||
|
DNS_PTR(dns_resolver_t **, scoped_resolver);
|
||||||
|
DNS_VAR(uint32_t, reserved[5]);
|
||||||
|
} dns_config_t;
|
||||||
|
#pragma pack()
|
||||||
|
__BEGIN_DECLS
|
||||||
|
/*
|
||||||
|
* DNS configuration access APIs
|
||||||
|
*/
|
||||||
|
const char *
|
||||||
|
dns_configuration_notify_key ();
|
||||||
|
dns_config_t *
|
||||||
|
dns_configuration_copy ();
|
||||||
|
void
|
||||||
|
dns_configuration_free (dns_config_t *config);
|
||||||
|
void
|
||||||
|
_dns_configuration_ack (dns_config_t *config,
|
||||||
|
const char *bundle_id);
|
||||||
|
__END_DECLS
|
||||||
|
#endif /* __DNSINFO_H__ */
|
||||||
263
resolver-dns-native-macos/src/main/c/netty_resolver_dns_macos.c
Normal file
263
resolver-dns-native-macos/src/main/c/netty_resolver_dns_macos.c
Normal file
@ -0,0 +1,263 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project licenses this file to you under the Apache License,
|
||||||
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at:
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
#include <errno.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <dlfcn.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include "dnsinfo.h"
|
||||||
|
#include "netty_unix_jni.h"
|
||||||
|
#include "netty_unix_util.h"
|
||||||
|
#include "netty_unix_socket.h"
|
||||||
|
#include "netty_unix_errors.h"
|
||||||
|
|
||||||
|
static jclass dnsResolverClass = NULL;
|
||||||
|
static jclass byteArrayClass = NULL;
|
||||||
|
static jclass stringClass = NULL;
|
||||||
|
static jmethodID dnsResolverMethodId = NULL;
|
||||||
|
|
||||||
|
// JNI Registered Methods Begin
|
||||||
|
|
||||||
|
// We use the same API as mDNSResponder and Chromium to retrieve the current nameserver configuration for the system:
|
||||||
|
// See:
|
||||||
|
// https://src.chromium.org/viewvc/chrome?revision=218617&view=revision
|
||||||
|
// https://opensource.apple.com/tarballs/mDNSResponder/
|
||||||
|
static jobjectArray netty_resolver_dns_macos_resolvers(JNIEnv* env, jclass clazz) {
|
||||||
|
dns_config_t* config = dns_configuration_copy();
|
||||||
|
|
||||||
|
jobjectArray array = (*env)->NewObjectArray(env, config->n_resolver, dnsResolverClass, NULL);
|
||||||
|
if (array == NULL) {
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < config->n_resolver; i++) {
|
||||||
|
dns_resolver_t* resolver = config->resolver[i];
|
||||||
|
jstring domain = NULL;
|
||||||
|
|
||||||
|
if (resolver->domain != NULL) {
|
||||||
|
domain = (*env)->NewStringUTF(env, resolver->domain);
|
||||||
|
if (domain == NULL) {
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
jobjectArray addressArray = (*env)->NewObjectArray(env, resolver->n_nameserver, byteArrayClass, NULL);
|
||||||
|
if (addressArray == NULL) {
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int a = 0; a < resolver->n_nameserver; a++) {
|
||||||
|
jbyteArray address = netty_unix_socket_createInetSocketAddressArray(env, (const struct sockaddr_storage *) resolver->nameserver[a]);
|
||||||
|
if (address == NULL) {
|
||||||
|
netty_unix_errors_throwOutOfMemoryError(env);
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
(*env)->SetObjectArrayElement(env, addressArray, a, address);
|
||||||
|
}
|
||||||
|
|
||||||
|
jint port = resolver->port;
|
||||||
|
|
||||||
|
jobjectArray searchArray = (*env)->NewObjectArray(env, resolver->n_search, stringClass, NULL);
|
||||||
|
if (searchArray == NULL) {
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int a = 0; a < resolver->n_search; a++) {
|
||||||
|
jstring search = (*env)->NewStringUTF(env, resolver->search[a]);
|
||||||
|
if (search == NULL) {
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
|
(*env)->SetObjectArrayElement(env, searchArray, a, search);
|
||||||
|
}
|
||||||
|
|
||||||
|
jstring options = NULL;
|
||||||
|
if (resolver->options != NULL) {
|
||||||
|
options = (*env)->NewStringUTF(env, resolver->options);
|
||||||
|
if (options == NULL) {
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
jint timeout = resolver->timeout;
|
||||||
|
jint searchOrder = resolver->search_order;
|
||||||
|
|
||||||
|
jobject java_resolver = (*env)->NewObject(env, dnsResolverClass, dnsResolverMethodId, domain,
|
||||||
|
addressArray, port, searchArray, options, timeout, searchOrder);
|
||||||
|
if (java_resolver == NULL) {
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
(*env)->SetObjectArrayElement(env, array, i, java_resolver);
|
||||||
|
}
|
||||||
|
|
||||||
|
dns_configuration_free(config);
|
||||||
|
return array;
|
||||||
|
error:
|
||||||
|
dns_configuration_free(config);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// JNI Method Registration Table Begin
|
||||||
|
|
||||||
|
static JNINativeMethod* createDynamicMethodsTable(const char* packagePrefix) {
|
||||||
|
JNINativeMethod* dynamicMethods = malloc(sizeof(JNINativeMethod) * 1);
|
||||||
|
|
||||||
|
char* dynamicTypeName = netty_unix_util_prepend(packagePrefix, "io/netty/resolver/dns/macos/DnsResolver;");
|
||||||
|
JNINativeMethod* dynamicMethod = &dynamicMethods[0];
|
||||||
|
dynamicMethod->name = "resolvers";
|
||||||
|
dynamicMethod->signature = netty_unix_util_prepend("()[L", dynamicTypeName);
|
||||||
|
dynamicMethod->fnPtr = (void *) netty_resolver_dns_macos_resolvers;
|
||||||
|
free(dynamicTypeName);
|
||||||
|
return dynamicMethods;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void freeDynamicMethodsTable(JNINativeMethod* dynamicMethods) {
|
||||||
|
free(dynamicMethods[0].signature);
|
||||||
|
free(dynamicMethods);
|
||||||
|
}
|
||||||
|
|
||||||
|
// JNI Method Registration Table End
|
||||||
|
|
||||||
|
|
||||||
|
static void JNI_OnUnload_netty_resolver_dns_native_macos0(JavaVM* vm, void* reserved) {
|
||||||
|
JNIEnv* env;
|
||||||
|
if ((*vm)->GetEnv(vm, (void**) &env, NETTY_JNI_VERSION) != JNI_OK) {
|
||||||
|
// Something is wrong but nothing we can do about this :(
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (byteArrayClass != NULL) {
|
||||||
|
(*env)->DeleteGlobalRef(env, byteArrayClass);
|
||||||
|
byteArrayClass = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stringClass != NULL) {
|
||||||
|
(*env)->DeleteGlobalRef(env, stringClass);
|
||||||
|
stringClass = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void netty_resolver_dns_native_macos0_OnUnLoad(JNIEnv* env) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
static jint JNI_OnLoad_netty_resolver_dns_native_macos0(JavaVM* vm, void* reserved) {
|
||||||
|
JNIEnv* env;
|
||||||
|
if ((*vm)->GetEnv(vm, (void**) &env, NETTY_JNI_VERSION) != JNI_OK) {
|
||||||
|
return JNI_ERR;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifndef NETTY_BUILD_STATIC
|
||||||
|
Dl_info dlinfo;
|
||||||
|
jint status = 0;
|
||||||
|
// We need to use an address of a function that is uniquely part of this library, so choose a static
|
||||||
|
// function. See https://github.com/netty/netty/issues/4840.
|
||||||
|
if (!dladdr((void*) netty_resolver_dns_native_macos0_OnUnLoad, &dlinfo)) {
|
||||||
|
fprintf(stderr, "FATAL: resolver-dns-native-macos JNI call to dladdr failed!\n");
|
||||||
|
return JNI_ERR;
|
||||||
|
}
|
||||||
|
char* packagePrefix = netty_unix_util_parse_package_prefix(dlinfo.dli_fname, "netty_resolver_dns_native_macos", &status);
|
||||||
|
if (status == JNI_ERR) {
|
||||||
|
fprintf(stderr, "FATAL: resolver-dns-native-macos JNI encountered unexpected dlinfo.dli_fname: %s\n", dlinfo.dli_fname);
|
||||||
|
return JNI_ERR;
|
||||||
|
}
|
||||||
|
#endif /* NETTY_BUILD_STATIC */
|
||||||
|
|
||||||
|
// Register the methods which are not referenced by static member variables
|
||||||
|
JNINativeMethod* dynamicMethods = createDynamicMethodsTable(packagePrefix);
|
||||||
|
if (netty_unix_util_register_natives(env,
|
||||||
|
packagePrefix,
|
||||||
|
"io/netty/resolver/dns/macos/MacOSDnsServerAddressStreamProvider",
|
||||||
|
dynamicMethods, 1) != 0) {
|
||||||
|
freeDynamicMethodsTable(dynamicMethods);
|
||||||
|
fprintf(stderr, "FATAL: Couldnt register natives");
|
||||||
|
|
||||||
|
return JNI_ERR;
|
||||||
|
}
|
||||||
|
freeDynamicMethodsTable(dynamicMethods);
|
||||||
|
dynamicMethods = NULL;
|
||||||
|
|
||||||
|
|
||||||
|
char* nettyClassName = netty_unix_util_prepend(packagePrefix, "io/netty/resolver/dns/macos/DnsResolver");
|
||||||
|
jclass localDnsResolverClass = (*env)->FindClass(env, nettyClassName);
|
||||||
|
free(nettyClassName);
|
||||||
|
nettyClassName = NULL;
|
||||||
|
if (localDnsResolverClass == NULL) {
|
||||||
|
// pending exception...
|
||||||
|
return JNI_ERR;
|
||||||
|
}
|
||||||
|
dnsResolverClass = (jclass) (*env)->NewGlobalRef(env, localDnsResolverClass);
|
||||||
|
if (dnsResolverClass == NULL) {
|
||||||
|
return JNI_ERR;
|
||||||
|
}
|
||||||
|
dnsResolverMethodId = (*env)->GetMethodID(env, dnsResolverClass, "<init>", "(Ljava/lang/String;[[BI[Ljava/lang/String;Ljava/lang/String;II)V");
|
||||||
|
if (dnsResolverMethodId == NULL) {
|
||||||
|
netty_unix_errors_throwRuntimeException(env, "failed to get method ID: DnsResolver.<init>(String, byte[][], String[], String, int, int)");
|
||||||
|
return JNI_ERR;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (packagePrefix != NULL) {
|
||||||
|
free(packagePrefix);
|
||||||
|
packagePrefix = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
jclass byteArrayCls = (*env)->FindClass(env, "[B");
|
||||||
|
if (byteArrayCls == NULL) {
|
||||||
|
// pending exception...
|
||||||
|
return JNI_ERR;
|
||||||
|
}
|
||||||
|
byteArrayClass = (jclass) (*env)->NewGlobalRef(env, byteArrayCls);
|
||||||
|
if (byteArrayClass == NULL) {
|
||||||
|
return JNI_ERR;
|
||||||
|
}
|
||||||
|
|
||||||
|
jclass stringCls = (*env)->FindClass(env, "java/lang/String");
|
||||||
|
if (stringCls == NULL) {
|
||||||
|
// pending exception...
|
||||||
|
return JNI_ERR;
|
||||||
|
}
|
||||||
|
stringClass = (jclass) (*env)->NewGlobalRef(env, stringCls);
|
||||||
|
if (stringClass == NULL) {
|
||||||
|
return JNI_ERR;
|
||||||
|
}
|
||||||
|
|
||||||
|
return NETTY_JNI_VERSION;
|
||||||
|
}
|
||||||
|
|
||||||
|
// We build with -fvisibility=hidden so ensure we mark everything that needs to be visible with JNIEXPORT
|
||||||
|
// http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-February/014549.html
|
||||||
|
|
||||||
|
// Invoked by the JVM when statically linked
|
||||||
|
JNIEXPORT jint JNI_OnLoad_netty_resolver_dns_native_macos(JavaVM* vm, void* reserved) {
|
||||||
|
return JNI_OnLoad_netty_resolver_dns_native_macos0(vm, reserved);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Invoked by the JVM when statically linked
|
||||||
|
JNIEXPORT void JNI_OnUnload_netty_resolver_dns_native_macos(JavaVM* vm, void* reserved) {
|
||||||
|
JNI_OnUnload_netty_resolver_dns_native_macos0(vm, reserved);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifndef NETTY_BUILD_STATIC
|
||||||
|
JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
|
||||||
|
return JNI_OnLoad_netty_resolver_dns_native_macos0(vm, reserved);
|
||||||
|
}
|
||||||
|
|
||||||
|
JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved) {
|
||||||
|
return JNI_OnUnload_netty_resolver_dns_native_macos0(vm, reserved);
|
||||||
|
}
|
||||||
|
#endif /* NETTY_BUILD_STATIC */
|
||||||
@ -0,0 +1,81 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project licenses this file to you under the Apache License,
|
||||||
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at:
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
package io.netty.resolver.dns.macos;
|
||||||
|
|
||||||
|
import io.netty.channel.unix.NativeInetAddress;
|
||||||
|
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represent the {@code dns_resolver_t} struct.
|
||||||
|
*/
|
||||||
|
final class DnsResolver {
|
||||||
|
|
||||||
|
private final String domain;
|
||||||
|
private final InetSocketAddress[] nameservers;
|
||||||
|
private final int port;
|
||||||
|
private final String[] searches;
|
||||||
|
private final String options;
|
||||||
|
private final int timeout;
|
||||||
|
private final int searchOrder;
|
||||||
|
|
||||||
|
DnsResolver(String domain, byte[][] nameservers, int port,
|
||||||
|
String[] searches, String options, int timeout, int searchOrder) {
|
||||||
|
this.domain = domain;
|
||||||
|
if (nameservers == null) {
|
||||||
|
this.nameservers = new InetSocketAddress[0];
|
||||||
|
} else {
|
||||||
|
this.nameservers = new InetSocketAddress[nameservers.length];
|
||||||
|
for (int i = 0; i < nameservers.length; i++) {
|
||||||
|
byte[] addr = nameservers[i];
|
||||||
|
this.nameservers[i] = NativeInetAddress.address(addr, 0, addr.length);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.port = port;
|
||||||
|
this.searches = searches;
|
||||||
|
this.options = options;
|
||||||
|
this.timeout = timeout;
|
||||||
|
this.searchOrder = searchOrder;
|
||||||
|
}
|
||||||
|
|
||||||
|
String domain() {
|
||||||
|
return domain;
|
||||||
|
}
|
||||||
|
|
||||||
|
InetSocketAddress[] nameservers() {
|
||||||
|
return nameservers;
|
||||||
|
}
|
||||||
|
|
||||||
|
int port() {
|
||||||
|
return port;
|
||||||
|
}
|
||||||
|
|
||||||
|
String[] searches() {
|
||||||
|
return searches;
|
||||||
|
}
|
||||||
|
|
||||||
|
String options() {
|
||||||
|
return options;
|
||||||
|
}
|
||||||
|
|
||||||
|
int timeout() {
|
||||||
|
return timeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
int searchOrder() {
|
||||||
|
return searchOrder;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,183 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project licenses this file to you under the Apache License,
|
||||||
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at:
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
package io.netty.resolver.dns.macos;
|
||||||
|
|
||||||
|
import io.netty.resolver.dns.DnsServerAddressStream;
|
||||||
|
import io.netty.resolver.dns.DnsServerAddressStreamProvider;
|
||||||
|
import io.netty.resolver.dns.DnsServerAddressStreamProviders;
|
||||||
|
import io.netty.resolver.dns.DnsServerAddresses;
|
||||||
|
import io.netty.util.internal.NativeLibraryLoader;
|
||||||
|
import io.netty.util.internal.PlatformDependent;
|
||||||
|
import io.netty.util.internal.StringUtil;
|
||||||
|
import io.netty.util.internal.SystemPropertyUtil;
|
||||||
|
import io.netty.util.internal.ThrowableUtil;
|
||||||
|
import io.netty.util.internal.logging.InternalLogger;
|
||||||
|
import io.netty.util.internal.logging.InternalLoggerFactory;
|
||||||
|
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.atomic.AtomicLong;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@link DnsServerAddressStreamProvider} implementation which makes use of the same mechanism as
|
||||||
|
* <a href="https://opensource.apple.com/tarballs/mDNSResponder/">Apple's open source mDNSResponder</a> to retrieve the
|
||||||
|
* current nameserver configuration of the system.
|
||||||
|
*/
|
||||||
|
public final class MacOSDnsServerAddressStreamProvider implements DnsServerAddressStreamProvider {
|
||||||
|
|
||||||
|
// Fallback provider
|
||||||
|
private static final DnsServerAddressStreamProvider DEFAULT_PROVIDER =
|
||||||
|
DnsServerAddressStreamProviders.platformDefault();
|
||||||
|
|
||||||
|
private static final Throwable UNAVAILABILITY_CAUSE;
|
||||||
|
|
||||||
|
private static final InternalLogger logger =
|
||||||
|
InternalLoggerFactory.getInstance(MacOSDnsServerAddressStreamProvider.class);
|
||||||
|
|
||||||
|
// Let's refresh every 10 seconds.
|
||||||
|
private static final long REFRESH_INTERVAL = TimeUnit.SECONDS.toNanos(10);
|
||||||
|
|
||||||
|
static {
|
||||||
|
Throwable cause = null;
|
||||||
|
try {
|
||||||
|
loadNativeLibrary();
|
||||||
|
} catch (Throwable error) {
|
||||||
|
cause = error;
|
||||||
|
}
|
||||||
|
UNAVAILABILITY_CAUSE = cause;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void loadNativeLibrary() {
|
||||||
|
String name = SystemPropertyUtil.get("os.name").toLowerCase(Locale.UK).trim();
|
||||||
|
if (!name.startsWith("mac")) {
|
||||||
|
throw new IllegalStateException("Only supported on MacOS");
|
||||||
|
}
|
||||||
|
String staticLibName = "netty_resolver_dns_native_macos";
|
||||||
|
String sharedLibName = staticLibName + '_' + PlatformDependent.normalizedArch();
|
||||||
|
ClassLoader cl = PlatformDependent.getClassLoader(MacOSDnsServerAddressStreamProvider.class);
|
||||||
|
try {
|
||||||
|
NativeLibraryLoader.load(sharedLibName, cl);
|
||||||
|
} catch (UnsatisfiedLinkError e1) {
|
||||||
|
try {
|
||||||
|
NativeLibraryLoader.load(staticLibName, cl);
|
||||||
|
logger.debug("Failed to load {}", sharedLibName, e1);
|
||||||
|
} catch (UnsatisfiedLinkError e2) {
|
||||||
|
ThrowableUtil.addSuppressed(e1, e2);
|
||||||
|
throw e1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isAvailable() {
|
||||||
|
return UNAVAILABILITY_CAUSE == null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void ensureAvailability() {
|
||||||
|
if (UNAVAILABILITY_CAUSE != null) {
|
||||||
|
throw (Error) new UnsatisfiedLinkError(
|
||||||
|
"failed to load the required native library").initCause(UNAVAILABILITY_CAUSE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Throwable unavailabilityCause() {
|
||||||
|
return UNAVAILABILITY_CAUSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MacOSDnsServerAddressStreamProvider() {
|
||||||
|
ensureAvailability();
|
||||||
|
}
|
||||||
|
|
||||||
|
private volatile Map<String, DnsServerAddresses> currentMappings = retrieveCurrentMappings();
|
||||||
|
private final AtomicLong lastRefresh = new AtomicLong(System.nanoTime());
|
||||||
|
|
||||||
|
private static Map<String, DnsServerAddresses> retrieveCurrentMappings() {
|
||||||
|
DnsResolver[] resolvers = resolvers();
|
||||||
|
|
||||||
|
if (resolvers == null || resolvers.length == 0) {
|
||||||
|
return Collections.emptyMap();
|
||||||
|
}
|
||||||
|
Map<String, DnsServerAddresses> resolverMap = new HashMap<String, DnsServerAddresses>(resolvers.length);
|
||||||
|
for (DnsResolver resolver: resolvers) {
|
||||||
|
// Skip mdns
|
||||||
|
if ("mdns".equalsIgnoreCase(resolver.options())) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
InetSocketAddress[] nameservers = resolver.nameservers();
|
||||||
|
if (nameservers == null || nameservers.length == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
String domain = resolver.domain();
|
||||||
|
if (domain == null) {
|
||||||
|
// Default mapping.
|
||||||
|
domain = StringUtil.EMPTY_STRING;
|
||||||
|
}
|
||||||
|
InetSocketAddress[] servers = resolver.nameservers();
|
||||||
|
for (int a = 0; a < servers.length; a++) {
|
||||||
|
InetSocketAddress address = servers[a];
|
||||||
|
// Check if the default port should be used
|
||||||
|
if (address.getPort() == 0) {
|
||||||
|
int port = resolver.port();
|
||||||
|
if (port == 0) {
|
||||||
|
port = 53;
|
||||||
|
}
|
||||||
|
servers[a] = new InetSocketAddress(address.getAddress(), port);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
resolverMap.put(domain, DnsServerAddresses.sequential(servers));
|
||||||
|
}
|
||||||
|
return resolverMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DnsServerAddressStream nameServerAddressStream(String hostname) {
|
||||||
|
long last = lastRefresh.get();
|
||||||
|
Map<String, DnsServerAddresses> resolverMap = currentMappings;
|
||||||
|
if (System.nanoTime() - last > REFRESH_INTERVAL) {
|
||||||
|
// This is slightly racy which means it will be possible still use the old configuration for a small
|
||||||
|
// amount of time, but that's ok.
|
||||||
|
if (lastRefresh.compareAndSet(last, System.nanoTime())) {
|
||||||
|
resolverMap = currentMappings = retrieveCurrentMappings();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final String originalHostname = hostname;
|
||||||
|
for (;;) {
|
||||||
|
int i = hostname.indexOf('.', 1);
|
||||||
|
if (i < 0 || i == hostname.length() - 1) {
|
||||||
|
// Try access default mapping.
|
||||||
|
DnsServerAddresses addresses = resolverMap.get(StringUtil.EMPTY_STRING);
|
||||||
|
if (addresses != null) {
|
||||||
|
return addresses.stream();
|
||||||
|
}
|
||||||
|
return DEFAULT_PROVIDER.nameServerAddressStream(originalHostname);
|
||||||
|
}
|
||||||
|
|
||||||
|
DnsServerAddresses addresses = resolverMap.get(hostname);
|
||||||
|
if (addresses != null) {
|
||||||
|
return addresses.stream();
|
||||||
|
}
|
||||||
|
|
||||||
|
hostname = hostname.substring(i + 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static native DnsResolver[] resolvers();
|
||||||
|
}
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project licenses this file to you under the Apache License,
|
||||||
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at:
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* MacOS specific nameserver resolution.
|
||||||
|
*/
|
||||||
|
@UnstableApi
|
||||||
|
package io.netty.resolver.dns.macos;
|
||||||
|
|
||||||
|
import io.netty.util.internal.UnstableApi;
|
||||||
@ -0,0 +1,43 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project licenses this file to you under the Apache License,
|
||||||
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at:
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
package io.netty.resolver.dns.macos;
|
||||||
|
|
||||||
|
import io.netty.resolver.dns.DnsServerAddressStream;
|
||||||
|
import io.netty.resolver.dns.DnsServerAddressStreamProvider;
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Assume;
|
||||||
|
import org.junit.BeforeClass;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
public class MacOSDnsServerAddressStreamProviderTest {
|
||||||
|
|
||||||
|
@BeforeClass
|
||||||
|
public static void assume() {
|
||||||
|
Assume.assumeTrue(MacOSDnsServerAddressStreamProvider.isAvailable());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void test() {
|
||||||
|
DnsServerAddressStreamProvider provider = new MacOSDnsServerAddressStreamProvider();
|
||||||
|
DnsServerAddressStream stream = provider.nameServerAddressStream("netty.io");
|
||||||
|
Assert.assertNotNull(stream);
|
||||||
|
Assert.assertNotEquals(0, stream.size());
|
||||||
|
|
||||||
|
for (int i = 0; i < stream.size(); i++) {
|
||||||
|
Assert.assertNotEquals(0, stream.next().getPort());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -123,6 +123,14 @@
|
|||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>netty-resolver-dns-native-macos</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>osx-x86_64</classifier>
|
||||||
|
<scope>compile</scope>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</profile>
|
</profile>
|
||||||
<profile>
|
<profile>
|
||||||
@ -145,6 +153,14 @@
|
|||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>netty-resolver-dns-native-macos</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>osx-x86_64</classifier>
|
||||||
|
<scope>compile</scope>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
||||||
|
|||||||
@ -173,7 +173,7 @@ static void initInetSocketAddressArray(JNIEnv* env, const struct sockaddr_storag
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static jbyteArray createInetSocketAddressArray(JNIEnv* env, const struct sockaddr_storage* addr) {
|
jbyteArray netty_unix_socket_createInetSocketAddressArray(JNIEnv* env, const struct sockaddr_storage* addr) {
|
||||||
jsize len = addressLength(addr);
|
jsize len = addressLength(addr);
|
||||||
jbyteArray bArray = (*env)->NewByteArray(env, len);
|
jbyteArray bArray = (*env)->NewByteArray(env, len);
|
||||||
if (bArray == NULL) {
|
if (bArray == NULL) {
|
||||||
@ -587,7 +587,7 @@ static jbyteArray netty_unix_socket_remoteAddress(JNIEnv* env, jclass clazz, jin
|
|||||||
if (getpeername(fd, (struct sockaddr*) &addr, &len) == -1) {
|
if (getpeername(fd, (struct sockaddr*) &addr, &len) == -1) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
return createInetSocketAddressArray(env, &addr);
|
return netty_unix_socket_createInetSocketAddressArray(env, &addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
static jbyteArray netty_unix_socket_localAddress(JNIEnv* env, jclass clazz, jint fd) {
|
static jbyteArray netty_unix_socket_localAddress(JNIEnv* env, jclass clazz, jint fd) {
|
||||||
@ -596,7 +596,7 @@ static jbyteArray netty_unix_socket_localAddress(JNIEnv* env, jclass clazz, jint
|
|||||||
if (getsockname(fd, (struct sockaddr*) &addr, &len) == -1) {
|
if (getsockname(fd, (struct sockaddr*) &addr, &len) == -1) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
return createInetSocketAddressArray(env, &addr);
|
return netty_unix_socket_createInetSocketAddressArray(env, &addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
static jint netty_unix_socket_newSocketDgramFd(JNIEnv* env, jclass clazz, jboolean ipv6) {
|
static jint netty_unix_socket_newSocketDgramFd(JNIEnv* env, jclass clazz, jboolean ipv6) {
|
||||||
|
|||||||
@ -21,6 +21,8 @@
|
|||||||
|
|
||||||
// External C methods
|
// External C methods
|
||||||
int netty_unix_socket_initSockaddr(JNIEnv* env, jboolean ipv6, jbyteArray address, jint scopeId, jint jport, const struct sockaddr_storage* addr, socklen_t* addrSize);
|
int netty_unix_socket_initSockaddr(JNIEnv* env, jboolean ipv6, jbyteArray address, jint scopeId, jint jport, const struct sockaddr_storage* addr, socklen_t* addrSize);
|
||||||
|
jbyteArray netty_unix_socket_createInetSocketAddressArray(JNIEnv* env, const struct sockaddr_storage* addr);
|
||||||
|
|
||||||
int netty_unix_socket_getOption(JNIEnv* env, jint fd, int level, int optname, void* optval, socklen_t optlen);
|
int netty_unix_socket_getOption(JNIEnv* env, jint fd, int level, int optname, void* optval, socklen_t optlen);
|
||||||
int netty_unix_socket_setOption(JNIEnv* env, jint fd, int level, int optname, const void* optval, socklen_t len);
|
int netty_unix_socket_setOption(JNIEnv* env, jint fd, int level, int optname, const void* optval, socklen_t len);
|
||||||
int netty_unix_socket_ipAddressLength(const struct sockaddr_storage* addr);
|
int netty_unix_socket_ipAddressLength(const struct sockaddr_storage* addr);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user