From bbfdbb00c88714ffea0f299b85cef124b158e576 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Wed, 2 Mar 2022 13:00:25 +0000
Subject: [PATCH 1/2] dnsresolver: use dns blocker app to filter trackers

[TheScarastic] : Adapt for android r
---
 getaddrinfo.cpp | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/getaddrinfo.cpp b/getaddrinfo.cpp
index 071f6ac3..d6e77cfa 100644
--- a/getaddrinfo.cpp
+++ b/getaddrinfo.cpp
@@ -3,6 +3,7 @@
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * Copyright (C) 2021 ECORP
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -322,6 +323,63 @@ int validateHints(const addrinfo* _Nonnull hints) {
 
 }  // namespace
 
+int shouldBlockRequest(const char* hostname, int uid){
+        int sock;
+	struct sockaddr_in server;
+	char message[1000], server_reply[2000];
+
+	//Create socket
+	sock = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP);
+	if (sock == -1) {
+		LOG(DEBUG) << "Socket: Could not create socket";
+	}
+	LOG(DEBUG) << "Socket: created";
+
+	server.sin_addr.s_addr = inet_addr("127.0.0.1");
+	server.sin_family = AF_INET;
+	server.sin_port = htons( 8888 );
+
+	//Connect to remote server
+	if (connect(sock, (struct sockaddr *)&server, sizeof(server)) < 0) {
+		LOG(DEBUG) << "Socket: connect failed. Error";
+                close(sock);
+		return -1;
+	}
+
+	LOG(DEBUG) << "Socket: Connected";
+
+	//keep communicating with server
+	snprintf(message, sizeof(message), "%s,%d", hostname, uid);
+
+	//Send some data
+	if(send(sock, message, strlen(message), 0) < 0) {
+		LOG(DEBUG) << "Socket: Send failed";
+		close(sock);
+		return 0;
+	}
+	shutdown(sock, SHUT_WR);
+	//Receive a reply from the server
+	if (recv(sock, server_reply, 2000, 0) < 0) {
+		LOG(DEBUG) << "Socket:recv failed";
+		close(sock);
+		return 0;
+	}
+
+	LOG(DEBUG) << "Socket: Server reply : " << server_reply;
+	if (strncmp(server_reply, "pass", 4) == 0) {
+		LOG(DEBUG) << "Socket: Shouldn't block";
+		close(sock);
+		return 0;
+	} else {
+	        LOG(DEBUG) << "Socket: should block";
+		close(sock);
+		return 1;
+	}
+	close(sock);
+	return 0;
+
+}
+
 int android_getaddrinfofornetcontext(const char* hostname, const char* servname,
                                      const addrinfo* hints, const android_net_context* netcontext,
                                      addrinfo** res, NetworkDnsEventReported* event) {
@@ -415,6 +473,12 @@ int resolv_getaddrinfo(const char* _Nonnull hostname, const char* servname, cons
     if (hostname == nullptr && servname == nullptr) return EAI_NONAME;
     if (hostname == nullptr) return EAI_NODATA;
 
+    if (shouldBlockRequest(hostname, netcontext->uid)) {
+	char* dest = new char[10];
+        strncpy(dest, "localhost", strlen("localhost"));
+        hostname = dest;
+    }
+
     // servname is allowed to be nullptr
     // hints is allowed to be nullptr
     assert(res != nullptr);
-- 
GitLab


From e3e1bacd4ce3af1fc9690ebc512dd9b3773322e9 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Fri, 4 Mar 2022 06:59:24 +0000
Subject: [PATCH 2/2] dnsresolver: Adapt for Unix socket

---
 getaddrinfo.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/getaddrinfo.cpp b/getaddrinfo.cpp
index d6e77cfa..d74a06bb 100644
--- a/getaddrinfo.cpp
+++ b/getaddrinfo.cpp
@@ -324,23 +324,26 @@ int validateHints(const addrinfo* _Nonnull hints) {
 }  // namespace
 
 int shouldBlockRequest(const char* hostname, int uid){
-        int sock;
-	struct sockaddr_in server;
+        int sock, len;
+	struct sockaddr_un server;
 	char message[1000], server_reply[2000];
 
 	//Create socket
-	sock = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP);
-	if (sock == -1) {
+	sock = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+	if (sock == -1)	{
 		LOG(DEBUG) << "Socket: Could not create socket";
 	}
 	LOG(DEBUG) << "Socket: created";
 
-	server.sin_addr.s_addr = inet_addr("127.0.0.1");
-	server.sin_family = AF_INET;
-	server.sin_port = htons( 8888 );
+        char const* name = "foundation.e.privacy";
+        int nameLen = strlen(name);
+        server.sun_path[0] = '\0'; /* abstract namespace */
+        strncpy(server.sun_path + 1, name, nameLen);
+        server.sun_family = AF_UNIX;
+        len = 1 + nameLen + offsetof(struct sockaddr_un, sun_path);
 
 	//Connect to remote server
-	if (connect(sock, (struct sockaddr *)&server, sizeof(server)) < 0) {
+	if (connect(sock, (struct sockaddr *)&server, len) < 0) {
 		LOG(DEBUG) << "Socket: connect failed. Error";
                 close(sock);
 		return -1;
-- 
GitLab