vs2019 - 16.9.2, Update dns checking. including some readme.md

Author: iostream

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,24 +7,21 @@ assignees: ''
 
 ---
 
-**Important**
- - Make sure you use [latest spotify](https://www.spotify.com) before reporting a bug.
- - Make sure you use the [latest blockthespot](https://www.github.com/mrpond/BlockTheSpot/releases) before reporting a bug.
- - Make sure if blockthespot DLL got replaced after Spotify update (important).
-
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**Desktop:**
+**Important:**
 <!--(please complete the following information)-->
  - OS: [e.g. Windows 10]
- - Spotify Version: [e.g. 1.1.47.684.g136419d9]
- - BlockTheSpot Product Version: [e.g. 0.51.0.0] <!--[right click chrome_elf.dll -> Details -> Product Version]-->
+ - Confirm that you currently using latest version of
+  1. [latest spotify](https://www.spotify.com) 
+  2. [latest blockthespot](https://www.github.com/mrpond/BlockTheSpot/releases) from github.
+  3. Blockthespot are not working with Spotify from Microsoft Store or alpha version of Spotify.
 
 **Additional context**
 Add any other context about the problem here. 
 If ad blocking is not working, please include a debug log by
  1. edit config.ini and set Log = 1 
  2. after ads song play close Spotify
- 3. zip the main_log.txt, utility_log.txt
+ 3. zip the blockthespot_log.txt

JUNTA.jpg

@@ -1,14 +1,8 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/31l6ynm0a1fhr2vs/branch/master?svg=true)](https://ci.appveyor.com/project/mrpond/blockthespot/branch/master)  [![Discord](https://discord.com/api/guilds/807273906872123412/widget.png)](https://discord.gg/p43cusgUPm)
 
 <center>
-    <h3 align="center"><a href="https://en.wikipedia.org/wiki/2020_Thai_protests">Support the 2020 Thai protests</a></h3>
-    <h3 align="center">#WhatsHappeningInThailand</h3>
-    <h3 align="center"><a href="https://twitter.com/search?q=%23ม็อบ13กุมภา">#ม็อบ13กุมภา</a></h3>
+    <h3 align="center"><a href="https://en.wikipedia.org/wiki/2020_Thai_protests">Support the 2020 Thailand & 2021 Myanmar protests</a></h3>
     <h3 align="center">Help me stop the dictatorship in Thailand and Myanmar!</h3>
-    <h3 align="center">#CivilDisobedienceMovement</h3>
-    <h3 align="center">#JusticeForMyanmar</h3>
-    <h3 align="center">#Save_Myanmar</h3>
-    <h3 align="center">Today 13 February 2021 police attack pro-democracy demonstrator in Thailand!</h3>
     <h3 align="center">Southeast Asia strong together!</h3>
 </center>
 
@@ -17,7 +11,7 @@
     <h4 align="center">A multi-purpose adblocker and skip-bypass for the <strong>Windows</strong> Spotify desktop application.</h4>
     <h5 align="center">Please support Spotify by purchasing premium</h5>
     <p align="center">
-        <strong>Last updated:</strong> 10 December 2020<br>
+        <strong>Last updated:</strong> 24 March 2020<br>
         <strong>Last tested version:</strong> 1.1.55.498.gf9a83c60
     </p> 
 </center>

README.md

@@ -9,27 +9,31 @@ class Logger {
 public:
 	Logger (Config* config) {
 
-		m_isEnable = config->getConfig ("Log");
-		if (m_isEnable) {
+		m_active = config->getConfig ("Log");
+		if (m_active) {
 			m_log.open ("blockthespot_log.txt", std::ios::out | std::ios::app);
 			m_log << "BlockTheSpot - Build date: " << __TIMESTAMP__ << std::endl;
 		}
 	}
 
 	~Logger () {
-		if (m_isEnable) {
+		if (m_active) {
 			m_log.flush ();
 			m_log.close ();
 		}
 	}
 
+	bool is_active () {
+		return m_active;
+	}
+
 	void Log (std::string_view log) {
-		if (m_isEnable)
+		if (m_active)
 			m_log << log << std::endl;
 	}
 
 private:
-	bool m_isEnable = false;
+	bool m_active = false;
 	std::ofstream m_log;
 
 };

src/Logger.h

@@ -51,26 +51,11 @@ DWORD WINAPI KillBanner (LPVOID conf)
 			VirtualProtect ((char*)skipPod + 6, 1, PAGE_EXECUTE_READWRITE, &oldProtect);
 			memset ((char*)skipPod + 6, 0xE9, 1);
 			VirtualProtect ((char*)skipPod + 6, 1, oldProtect, &oldProtect);
-			logger->Log ("main process - #1patch success!");
+			logger->Log ("main process - patch success!");
 		}
 		else {
-			logger->Log ("main process - #1patch failed!");
+			logger->Log ("main process - patch failed!");
 		}
-
-		skipPod = FindPattern ((uint8_t*)hModule, mInfo.SizeOfImage, (BYTE*)"\x00\x61\x64\x70\x6F\x64\x00", "xxxxxxx");
-		if (skipPod)
-		{
-			DWORD oldProtect;
-			VirtualProtect ((char*)skipPod + 5, 1, PAGE_EXECUTE_READWRITE, &oldProtect);
-			memset ((char*)skipPod + 5, 0x90, 1);
-			VirtualProtect ((char*)skipPod + 5, 1, oldProtect, &oldProtect);
-
-			logger->Log ("main process - #2patch success!");
-		}
-		else {
-			logger->Log ("main process - #2patch failed!");
-		}
-
 	} 
 	else {
 		logger->Log ("GetModuleInformation failed!");

src/Modify.cpp

@@ -7,16 +7,14 @@
 
 _getaddrinfo getaddrinfo_orig;
 
-const std::vector<std::string_view> blockList = { "google", "doubleclick", "qualaroo.com", "fbsbx.com", "adeventtracker" };
-
 // check if ads hostname
 bool is_blockhost (std::string_view nodename, Config* config) {
-
-	
 	static bool wpad = config->getConfig ("Skip_wpad");
+	static const std::vector<std::string_view> blockList = { "google", "doubleclick", "qualaroo.com", "fbsbx.com", /*"cloudflare"*/ };
+	
 	if (0 == nodename.compare ("wpad"))
 		return wpad ? true : false;
-	for (auto i : blockList) {
+	for (auto &i : blockList) {
 		if (std::string_view::npos != nodename.find (i))
 			return true;
 	}
@@ -31,6 +29,8 @@ int WSAAPI getaddrinfo_hook (
 {
 	static auto* config = new Config ();
 	static auto* logger = new Logger (config);
+	static const std::vector<std::string_view> dnscheck = { "dns.google", "cloudflare" };
+
 	if (nodename == nullptr)
 		return getaddrinfo_orig (nodename, servname, hints, res);
 
@@ -50,6 +50,15 @@ int WSAAPI getaddrinfo_hook (
 			logger->Log ("allowed - " + nnodename);
 		}
 	}
+	if (true == logger->is_active() &&
+		true == config->getConfig ("Skip_wpad"))
+	{
+		for (auto& i : dnscheck) {
+			if (std::string_view::npos != nnodename.find (i))
+				logger->Log ("custom dns currently in use - " + nnodename +
+							 " turn on Skip_wpad in config.ini or switch to adguard dns");
+		}
+	}
 	return result;
 }