Uncloack CNAME hostnames

1 files changed, 41 insertions, 6 deletions

diff --git a/js/vapi-background.js b/js/vapi-background.js
index e5e6998..061ae29 100644
--- a/js/vapi-background.js
+++ b/js/vapi-background.js
@@ -313,12 +313,7 @@
 
             return this.mimeTypeMap[mime.slice(0, pos)] || 0;
         },
-        observe: function (channel, topic) {
-            if (channel instanceof Ci.nsIHttpChannel === false) {
-                return;
-            }
-
-            let URI = channel.URI;
+        operate: function (channel, URI, topic) {
             let channelData = this.channelDataFromChannel(channel);
 
             if (topic.lastIndexOf('http-on-examine-', 0) === 0) {
@@ -423,6 +418,46 @@
             // Carry data for behind-the-scene redirects
             channel.setProperty(this.REQDATAKEY, [tabId, rawType]);
         },
+        observe: function (channel, topic) {
+            if (channel instanceof Ci.nsIHttpChannel === false) {
+                return;
+            }
+
+            let URI = channel.URI;
+            let channelData = this.channelDataFromChannel(channel);
+
+            if (ηMatrix.userSettings.resolveCname === true) {
+                let CC = Components.classes;
+                let CI = Components.interfaces;
+
+                let dns = CC['@mozilla.org/network/dns-service;1']
+                    .createInstance(CI.nsIDNSService);
+
+                let listener = {
+                    onLookupComplete: function (req, rec, stat) {
+                        if (!Components.isSuccessCode(stat)) {
+                            console.error("can't resolve canonical name");
+                            return;
+                        }
+                        let addr = rec.canonicalName;
+
+                        let ios = CC['@mozilla.org/network/io-service;1']
+                            .createInstance(CI.nsIIOService);
+
+                        let uri = ios.newURI(URI.scheme+'://'+addr, null, null);
+
+                        vAPI.httpObserver.operate(channel, uri, topic);
+                    },
+                };
+
+                dns.asyncResolve(URI.host,
+                                 CI.nsIDNSService.RESOLVE_CANONICAL_NAME,
+                                 listener,
+                                 null);
+            } else {
+                this.operate(channel, URI, topic);
+            }
+        },
         asyncOnChannelRedirect: function (oldChannel, newChannel,
                                           flags, callback) {
             // contentPolicy.shouldLoad doesn't detect redirects, this