Make sure that Connman is used as a DNS proxy

Change-Id: Id91f8090be354c18e4a2f2fd66766f3bf98878dd

diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec
index a2d7fa2a0e231b617b0d81dbc492957dfcbeb1b4..def481ece9f02f2c2228286d6e28e7bf5229c006 100644 (file)
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@ -85,6 +85,8 @@ echo "security-tests postinst done ..."
 /usr/bin/test-performance-check.sh
 /usr/bin/setup-nether-tests-nns.sh
 /usr/bin/teardown-nether-tests-nns.sh
+/usr/bin/setup-nether-tests-dns.sh
+/usr/bin/teardown-nether-tests-dns.sh
 
 /etc/dbus-1/system.d/security-tests.conf
 

diff --git a/src/nether-tests/CMakeLists.txt b/src/nether-tests/CMakeLists.txt
index 95d9eca6bbdfcafcc1746c992d5f7249ea7ef308..b08c24ef4202237104156c55b24a9d5e6d07aeaf 100644 (file)
--- a/src/nether-tests/CMakeLists.txt
+++ b/src/nether-tests/CMakeLists.txt
@@ -71,6 +71,8 @@ INSTALL(TARGETS ${TARGET_NETHER_TESTS} DESTINATION /usr/bin)
 INSTALL(FILES
     ${PROJECT_SOURCE_DIR}/src/nether-tests/setup-nether-tests-nns.sh
     ${PROJECT_SOURCE_DIR}/src/nether-tests/teardown-nether-tests-nns.sh
+    ${PROJECT_SOURCE_DIR}/src/nether-tests/setup-nether-tests-dns.sh
+    ${PROJECT_SOURCE_DIR}/src/nether-tests/teardown-nether-tests-dns.sh
     DESTINATION bin
     PERMISSIONS OWNER_READ
                 OWNER_WRITE

diff --git a/src/nether-tests/nether_tests.cpp b/src/nether-tests/nether_tests.cpp
index dbfe7462821195fea6ecf73535831d7dd0d5e441..b9e20da1574abfd35d238964f6c160002ab16f1b 100644 (file)
--- a/src/nether-tests/nether_tests.cpp
+++ b/src/nether-tests/nether_tests.cpp
@@ -56,6 +56,9 @@ const std::string NETHER_NETNS_NAME_TEST = "nether_test_network_ns";
 const std::string NETNS_RUN_DIR = "/var/run/netns"; // taken from iproute2
 const std::string NETHER_NETNS_SETUP_COMMAND = "/usr/bin/setup-nether-tests-nns.sh " + NETHER_NETNS_NAME_TEST;
 const std::string NETHER_NETNS_TEARDOWN_COMMAND = "/usr/bin/teardown-nether-tests-nns.sh " + NETHER_NETNS_NAME_TEST;
+const std::string NETHER_DNS_SETUP_COMMAND = "/usr/bin/setup-nether-tests-dns.sh";
+const std::string NETHER_DNS_TEARDOWN_COMMAND = "/usr/bin/teardown-nether-tests-dns.sh";
+
 
 const ssize_t NET_BUFFER_SIZE = 1024;
 const int UDP_MESSAGES_COUNT = 20000;
@@ -1394,6 +1397,10 @@ RUNNER_TEST_GROUP_INIT(NETHER_LOCAL_DNS_CONNECTION)
 RUNNER_CHILD_TEST(nether_check_gethostbyname_internet_access_granted)
 {
     RUNNER_IGNORED_MSG("Disabled until the implementation of handling of DNS queries is finished.");
+
+    ScopedShellScriptRunner networkDNSRunner(NETHER_DNS_SETUP_COMMAND,
+                                             NETHER_DNS_TEARDOWN_COMMAND);
+
     const auto getHostAddress = [](void) {
       struct hostent *server = gethostbyname(DNS_TEST_ADDRESS.c_str());
       RUNNER_ASSERT_MSG(server != nullptr, "Couldn't find host "
@@ -1406,6 +1413,10 @@ RUNNER_CHILD_TEST(nether_check_gethostbyname_internet_access_granted)
 RUNNER_CHILD_TEST(nether_check_gethostbyname_internet_access_denied)
 {
     RUNNER_IGNORED_MSG("Disabled until the implementation of handling of DNS queries is finished.");
+
+    ScopedShellScriptRunner networkDNSRunner(NETHER_DNS_SETUP_COMMAND,
+                                             NETHER_DNS_TEARDOWN_COMMAND);
+
     const auto getHostAddress = [](void) {
       struct hostent *server = gethostbyname(DNS_TEST_ADDRESS.c_str());
       RUNNER_ASSERT_MSG(server == nullptr, "Host was found " << DNS_TEST_ADDRESS);

diff --git a/src/nether-tests/setup-nether-tests-dns.sh b/src/nether-tests/setup-nether-tests-dns.sh
new file mode 100644 (file)
index 0000000..c3e1fea
--- /dev/null
+++ b/src/nether-tests/setup-nether-tests-dns.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+#####################################################################
+# Copyright (c) 2017 Samsung Electronics Co., Ltd All Rights Reserved
+#
+#    Licensed 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.
+#####################################################################
+
+# make sure the filesystem is mounted in RW mode
+rw
+
+# backup old resolv.conf
+cp /etc/resolv.conf /etc/resolv.conf.back
+
+# configure Connman as a local DNS server
+echo "nameserver 127.0.0.1" > /etc/resolv.conf

diff --git a/src/nether-tests/teardown-nether-tests-dns.sh b/src/nether-tests/teardown-nether-tests-dns.sh
new file mode 100644 (file)
index 0000000..0d240f6
--- /dev/null
+++ b/src/nether-tests/teardown-nether-tests-dns.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+#####################################################################
+# Copyright (c) 2017 Samsung Electronics Co., Ltd All Rights Reserved
+#
+#    Licensed 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.
+#####################################################################
+
+# restore old resolv.conf
+mv /etc/resolv.conf.back /etc/resolv.conf
+
+