Skip to content

Commit 798be3e

Browse files
vneogi199vneogi199
committed
Fixed merge issues
1 parent 9e07d97 commit 798be3e

File tree

476 files changed

+40670
-66900
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

476 files changed

+40670
-66900
lines changed

‎Extension/browserReadyBundle.js‎

Lines changed: 128 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,133 @@
11
(function(){function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}return e})()({1:[function(require,module,exports){
22
<<<<<<< HEAD
3-
// var urlExists = require('url-exists');
4-
// var whois = require('whois-json');
5-
// var sslCertificate = require('get-ssl-certificate');
6-
7-
// function isShortUrl(url){
8-
// var query = url.split('?');
9-
// var fragment = url.split('/');
10-
// if (url.length > 30) return false;
11-
// if (query[1] != undefined) return false;
12-
// if (fragment[3] == undefined || fragment[3] == '' || fragment[5] != undefined) return false;
13-
// if (fragment[2].length > 10) return false;
14-
// return true;
15-
// }
16-
// var TLDs = ["ac", "ad", "ae", "aero", "af", "ag", "ai", "al", "am", "an", "ao", "aq", "ar", "arpa", "as", "asia", "at", "au", "aw", "ax", "az", "ba", "bb", "bd", "be", "bf", "bg", "bh", "bi", "biz", "bj", "bm", "bn", "bo", "br", "bs", "bt", "bv", "bw", "by", "bz", "ca", "cat", "cc", "cd", "cf", "cg", "ch", "ci", "ck", "cl", "cm", "cn", "co", "com", "coop", "cr", "cu", "cv", "cx", "cy", "cz", "de", "dj", "dk", "dm", "do", "dz", "ec", "edu", "ee", "eg", "er", "es", "et", "eu", "fi", "fj", "fk", "fm", "fo", "fr", "ga", "gb", "gd", "ge", "gf", "gg", "gh", "gi", "gl", "gm", "gn", "gov", "gp", "gq", "gr", "gs", "gt", "gu", "gw", "gy", "hk", "hm", "hn", "hr", "ht", "hu", "id", "ie", "il", "im", "in", "info", "int", "io", "iq", "ir", "is", "it", "je", "jm", "jo", "jobs", "jp", "ke", "kg", "kh", "ki", "km", "kn", "kp", "kr", "kw", "ky", "kz", "la", "lb", "lc", "li", "lk", "lr", "ls", "lt", "lu", "lv", "ly", "ma", "mc", "md", "me", "mg", "mh", "mil", "mk", "ml", "mm", "mn", "mo", "mobi", "mp", "mq", "mr", "ms", "mt", "mu", "museum", "mv", "mw", "mx", "my", "mz", "na", "name", "nc", "ne", "net", "nf", "ng", "ni", "nl", "no", "np", "nr", "nu", "nz", "om", "org", "pa", "pe", "pf", "pg", "ph", "pk", "pl", "pm", "pn", "pr", "pro", "ps", "pt", "pw", "py", "qa", "re", "ro", "rs", "ru", "rw", "sa", "sb", "sc", "sd", "se", "sg", "sh", "si", "sj", "sk", "sl", "sm", "sn", "so", "sr", "st", "su", "sv", "sy", "sz", "tc", "td", "tel", "tf", "tg", "th", "tj", "tk", "tl", "tm", "tn", "to", "tp", "tr", "travel", "tt", "tv", "tw", "tz", "ua", "ug", "uk", "us", "uy", "uz", "va", "vc", "ve", "vg", "vi", "vn", "vu", "wf", "ws", "xn--0zwm56d", "xn--11b5bs3a9aj6g", "xn--3e0b707e", "xn--45brj9c", "xn--80akhbyknj4f", "xn--90a3ac", "xn--9t4b11yi5a", "xn--clchc0ea0b2g2a9gcd", "xn--deba0ad", "xn--fiqs8s", "xn--fiqz9s", "xn--fpcrj9c3d", "xn--fzc2c9e2c", "xn--g6w251d", "xn--gecrj9c", "xn--h2brj9c", "xn--hgbk6aj7f53bba", "xn--hlcj6aya9esc7a", "xn--j6w193g", "xn--jxalpdlp", "xn--kgbechtv", "xn--kprw13d", "xn--kpry57d", "xn--lgbbat1ad8j", "xn--mgbaam7a8h", "xn--mgbayh7gpa", "xn--mgbbh1a71e", "xn--mgbc0a9azcg", "xn--mgberp4a5d4ar", "xn--o3cw4h", "xn--ogbpf8fl", "xn--p1ai", "xn--pgbs0dh", "xn--s9brj9c", "xn--wgbh1c", "xn--wgbl6a", "xn--xkc2al3hye2a", "xn--xkc2dl3a5ee0h", "xn--yfro4i67o", "xn--ygbi2ammx", "xn--zckzah", "xxx", "ye", "yt", "za", "zm", "zw"];
17-
// function getDomain(url){
18-
// var parts = url.split('.');
19-
// if (parts[0] === 'www'){
20-
// parts.shift();
21-
// }
22-
// for(tld in TLDs){
23-
// if(TLDs[tld]==parts[parts.length-1]){
24-
// parts.splice(-1);
25-
// break;
26-
// }
27-
// }
28-
// return parts.length>2?1:parts.length==2?0:-1;
29-
// }
30-
// var getFavicon = function(){
31-
// var favicon = undefined;
32-
// var nodeList = document.getElementsByTagName("link");
33-
// for (var i = 0; i < nodeList.length; i++)
34-
// {
35-
// if((nodeList[i].getAttribute("rel") == "icon")||(nodeList[i].getAttribute("rel") == "shortcut icon"))
36-
// {
37-
// favicon = nodeList[i].getAttribute("href");
38-
// }
39-
// }
40-
// if(favicon[0]=="/") {
41-
// url=location.href.split('/')[0]+'//'+location.href.split('/')[2]+favicon;
42-
// urlExists(url, function(err, exists) {
43-
// if(exists) return -1;
44-
// else return 1;
45-
// });
46-
// }
47-
// else {
48-
// url=favicon.replace(favicon.split('/')[0]+'//'+favicon.split('/')[2],location.href.split('/')[0]+'//'+location.href.split('/')[2]);
49-
// if (favicon[0]=="/")
50-
// {
51-
// url=location.href.split('/')[0]+'//'+location.href.split('/')[2]+favicon;
52-
// urlExists(url, function(err, exists) {
53-
// if(exists) return -1;
54-
// else return 1;
55-
// });
56-
// }
57-
// }
58-
// }
59-
// function checkAbnormalURL(){
60-
// whois(location.hostname, function(err, result){
61-
// if(JSON.stringify(result.domainName, null, 2)) return -1;
62-
// else return 1;
63-
// });
64-
// }
65-
// function calcAge(){
66-
// whois(location.hostname, function(err, result){
67-
// var today = new Date();
68-
// if(today.getFullYear()-JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[0]>=1){
69-
// return -1;
70-
// }
71-
// else if(today.getMonth()+1-JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[1]>=6){
72-
// return -1;
73-
// }
74-
// else return 1;
75-
// });
76-
// }
77-
// function datediff(){
78-
// sslCertificate.get(location.hostname).then(function (certificate) {
79-
// D=new Date(certificate.valid_to);
80-
// D1=new Date(certificate.valid_from);
81-
// op=(D.getFullYear()-D1.getFullYear()>1)?-1:((D.getFullYear()-D1.getFullYear()==1)?((11-D.getMonth()+D1.getMonth())>=12?-1:1):1);
82-
// return op;
83-
// });
84-
// }
85-
// function registrationLength(){
86-
// whois(location.hostname, function(err, result){
87-
// if(JSON.stringify(result.registryExpiryDate, null, 2).replace('"','').split('-')[0]-JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[0]<1){
88-
// return 1;
89-
// }
90-
// else if(JSON.stringify(result.registryExpiryDate, null, 2).replace('"','').split('-')[0]-JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[0]==1){
91-
// if(JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[1]+1-JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[1]>1)
92-
// return -1;
93-
// else return 1;
94-
// }
95-
// else return 1;
96-
// });
97-
// }
98-
having_IP_Address=window.location.hostname.match(/[a-z]/i)?1:-1;
99-
// URL_Length=location.hostname.length>75?1:location.hostname.length>=54?0:-1;
100-
// Shortining_Service=isShortUrl(window.location.href)?1:-1;
101-
// having_At_Symbol=window.location.hostname.match(/@/i)?1:-1;
102-
// double_slash_redirecting=location.href.lastIndexOf("//")>7?1:-1;
103-
// Prefix_Suffix=window.location.hostname.match(/-/i)?-1:1;
104-
// having_Sub_Domain=getDomain(window.location.hostname);
105-
// Favicon=getFavicon();
106-
// HTTPS_token=(window.location.hostname.search('https')!=-1)?-1:1;
107-
// Abnormal_URL=checkAbnormalURL();
108-
// age_of_domain=calcAge();
109-
// SSLfinal_State=datediff();
110-
111-
console.log(having_IP_Address);
112-
113-
// var alexa = require('alexarank');
114-
115-
// alexa("http://www.echojs.com/", function(error, result) {
116-
// if (!error) {
117-
// console.log("success");
118-
// } else {
119-
// console.log("error");
120-
// }
121-
// });
122-
// var div = document.createElement("div");
123-
// div.setAttribute("id", "se-pre-con");
124-
// document.body.appendChild(div);
125-
// document.getElementById("se-pre-con").innerHTML = "<br><br><br><br><h1>Warning!!</h1><br><img src='http://pluspng.com/img-png/png-wrong-cross-clear-cross-empty-incorrect-red-wrong-icon-512.png'></img><br><p>This Page is suspected as Phishing Site.</p>";
126-
// var div2 = document.createElement("div");
127-
// div2.setAttribute("id", "del");
128-
// document.getElementById('se-pre-con').appendChild(div2);
129-
// document.getElementById("del").innerHTML = "<a>Click Here to Close the Message.</a>"
130-
// div2.onclick = function() {this.parentNode.removeChild(this);document.getElementById('se-pre-con').remove();
3+
// var urlExists = require('url-exists');
4+
// var whois = require('whois-json');
5+
// var sslCertificate = require('get-ssl-certificate');
6+
7+
// function isShortUrl(url){
8+
// var query = url.split('?');
9+
// var fragment = url.split('/');
10+
// if (url.length > 30) return false;
11+
// if (query[1] != undefined) return false;
12+
// if (fragment[3] == undefined || fragment[3] == '' || fragment[5] != undefined) return false;
13+
// if (fragment[2].length > 10) return false;
14+
// return true;
15+
// }
16+
// var TLDs = ["ac", "ad", "ae", "aero", "af", "ag", "ai", "al", "am", "an", "ao", "aq", "ar", "arpa", "as", "asia", "at", "au", "aw", "ax", "az", "ba", "bb", "bd", "be", "bf", "bg", "bh", "bi", "biz", "bj", "bm", "bn", "bo", "br", "bs", "bt", "bv", "bw", "by", "bz", "ca", "cat", "cc", "cd", "cf", "cg", "ch", "ci", "ck", "cl", "cm", "cn", "co", "com", "coop", "cr", "cu", "cv", "cx", "cy", "cz", "de", "dj", "dk", "dm", "do", "dz", "ec", "edu", "ee", "eg", "er", "es", "et", "eu", "fi", "fj", "fk", "fm", "fo", "fr", "ga", "gb", "gd", "ge", "gf", "gg", "gh", "gi", "gl", "gm", "gn", "gov", "gp", "gq", "gr", "gs", "gt", "gu", "gw", "gy", "hk", "hm", "hn", "hr", "ht", "hu", "id", "ie", "il", "im", "in", "info", "int", "io", "iq", "ir", "is", "it", "je", "jm", "jo", "jobs", "jp", "ke", "kg", "kh", "ki", "km", "kn", "kp", "kr", "kw", "ky", "kz", "la", "lb", "lc", "li", "lk", "lr", "ls", "lt", "lu", "lv", "ly", "ma", "mc", "md", "me", "mg", "mh", "mil", "mk", "ml", "mm", "mn", "mo", "mobi", "mp", "mq", "mr", "ms", "mt", "mu", "museum", "mv", "mw", "mx", "my", "mz", "na", "name", "nc", "ne", "net", "nf", "ng", "ni", "nl", "no", "np", "nr", "nu", "nz", "om", "org", "pa", "pe", "pf", "pg", "ph", "pk", "pl", "pm", "pn", "pr", "pro", "ps", "pt", "pw", "py", "qa", "re", "ro", "rs", "ru", "rw", "sa", "sb", "sc", "sd", "se", "sg", "sh", "si", "sj", "sk", "sl", "sm", "sn", "so", "sr", "st", "su", "sv", "sy", "sz", "tc", "td", "tel", "tf", "tg", "th", "tj", "tk", "tl", "tm", "tn", "to", "tp", "tr", "travel", "tt", "tv", "tw", "tz", "ua", "ug", "uk", "us", "uy", "uz", "va", "vc", "ve", "vg", "vi", "vn", "vu", "wf", "ws", "xn--0zwm56d", "xn--11b5bs3a9aj6g", "xn--3e0b707e", "xn--45brj9c", "xn--80akhbyknj4f", "xn--90a3ac", "xn--9t4b11yi5a", "xn--clchc0ea0b2g2a9gcd", "xn--deba0ad", "xn--fiqs8s", "xn--fiqz9s", "xn--fpcrj9c3d", "xn--fzc2c9e2c", "xn--g6w251d", "xn--gecrj9c", "xn--h2brj9c", "xn--hgbk6aj7f53bba", "xn--hlcj6aya9esc7a", "xn--j6w193g", "xn--jxalpdlp", "xn--kgbechtv", "xn--kprw13d", "xn--kpry57d", "xn--lgbbat1ad8j", "xn--mgbaam7a8h", "xn--mgbayh7gpa", "xn--mgbbh1a71e", "xn--mgbc0a9azcg", "xn--mgberp4a5d4ar", "xn--o3cw4h", "xn--ogbpf8fl", "xn--p1ai", "xn--pgbs0dh", "xn--s9brj9c", "xn--wgbh1c", "xn--wgbl6a", "xn--xkc2al3hye2a", "xn--xkc2dl3a5ee0h", "xn--yfro4i67o", "xn--ygbi2ammx", "xn--zckzah", "xxx", "ye", "yt", "za", "zm", "zw"];
17+
// function getDomain(url){
18+
// var parts = url.split('.');
19+
// if (parts[0] === 'www'){
20+
// parts.shift();
21+
// }
22+
// for(tld in TLDs){
23+
// if(TLDs[tld]==parts[parts.length-1]){
24+
// parts.splice(-1);
25+
// break;
26+
// }
27+
// }
28+
// return parts.length>2?1:parts.length==2?0:-1;
29+
// }
30+
// var getFavicon = function(){
31+
// var favicon = undefined;
32+
// var nodeList = document.getElementsByTagName("link");
33+
// for (var i = 0; i < nodeList.length; i++)
34+
// {
35+
// if((nodeList[i].getAttribute("rel") == "icon")||(nodeList[i].getAttribute("rel") == "shortcut icon"))
36+
// {
37+
// favicon = nodeList[i].getAttribute("href");
38+
// }
39+
// }
40+
// if(favicon[0]=="/") {
41+
// url=location.href.split('/')[0]+'//'+location.href.split('/')[2]+favicon;
42+
// urlExists(url, function(err, exists) {
43+
// if(exists) return -1;
44+
// else return 1;
45+
// });
46+
// }
47+
// else {
48+
// url=favicon.replace(favicon.split('/')[0]+'//'+favicon.split('/')[2],location.href.split('/')[0]+'//'+location.href.split('/')[2]);
49+
// if (favicon[0]=="/")
50+
// {
51+
// url=location.href.split('/')[0]+'//'+location.href.split('/')[2]+favicon;
52+
// urlExists(url, function(err, exists) {
53+
// if(exists) return -1;
54+
// else return 1;
55+
// });
56+
// }
57+
// }
58+
// }
59+
// function checkAbnormalURL(){
60+
// whois(location.hostname, function(err, result){
61+
// if(JSON.stringify(result.domainName, null, 2)) return -1;
62+
// else return 1;
63+
// });
64+
// }
65+
// function calcAge(){
66+
// whois(location.hostname, function(err, result){
67+
// var today = new Date();
68+
// if(today.getFullYear()-JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[0]>=1){
69+
// return -1;
70+
// }
71+
// else if(today.getMonth()+1-JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[1]>=6){
72+
// return -1;
73+
// }
74+
// else return 1;
75+
// });
76+
// }
77+
// function datediff(){
78+
// sslCertificate.get(location.hostname).then(function (certificate) {
79+
// D=new Date(certificate.valid_to);
80+
// D1=new Date(certificate.valid_from);
81+
// op=(D.getFullYear()-D1.getFullYear()>1)?-1:((D.getFullYear()-D1.getFullYear()==1)?((11-D.getMonth()+D1.getMonth())>=12?-1:1):1);
82+
// return op;
83+
// });
84+
// }
85+
// function registrationLength(){
86+
// whois(location.hostname, function(err, result){
87+
// if(JSON.stringify(result.registryExpiryDate, null, 2).replace('"','').split('-')[0]-JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[0]<1){
88+
// return 1;
89+
// }
90+
// else if(JSON.stringify(result.registryExpiryDate, null, 2).replace('"','').split('-')[0]-JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[0]==1){
91+
// if(JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[1]+1-JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[1]>1)
92+
// return -1;
93+
// else return 1;
94+
// }
95+
// else return 1;
96+
// });
97+
// }
98+
having_IP_Address=window.location.hostname.match(/[a-z]/i)?1:-1;
99+
// URL_Length=location.hostname.length>75?1:location.hostname.length>=54?0:-1;
100+
// Shortining_Service=isShortUrl(window.location.href)?1:-1;
101+
// having_At_Symbol=window.location.hostname.match(/@/i)?1:-1;
102+
// double_slash_redirecting=location.href.lastIndexOf("//")>7?1:-1;
103+
// Prefix_Suffix=window.location.hostname.match(/-/i)?-1:1;
104+
// having_Sub_Domain=getDomain(window.location.hostname);
105+
// Favicon=getFavicon();
106+
// HTTPS_token=(window.location.hostname.search('https')!=-1)?-1:1;
107+
// Abnormal_URL=checkAbnormalURL();
108+
// age_of_domain=calcAge();
109+
// SSLfinal_State=datediff();
110+
111+
console.log(having_IP_Address);
112+
113+
// var alexa = require('alexarank');
114+
115+
// alexa("http://www.echojs.com/", function(error, result) {
116+
// if (!error) {
117+
// console.log("success");
118+
// } else {
119+
// console.log("error");
120+
// }
121+
// });
122+
// var div = document.createElement("div");
123+
// div.setAttribute("id", "se-pre-con");
124+
// document.body.appendChild(div);
125+
// document.getElementById("se-pre-con").innerHTML = "<br><br><br><br><h1>Warning!!</h1><br><img src='http://pluspng.com/img-png/png-wrong-cross-clear-cross-empty-incorrect-red-wrong-icon-512.png'></img><br><p>This Page is suspected as Phishing Site.</p>";
126+
// var div2 = document.createElement("div");
127+
// div2.setAttribute("id", "del");
128+
// document.getElementById('se-pre-con').appendChild(div2);
129+
// document.getElementById("del").innerHTML = "<a>Click Here to Close the Message.</a>"
130+
// div2.onclick = function() {this.parentNode.removeChild(this);document.getElementById('se-pre-con').remove();
131131
// }
132132
=======
133133
var sslCertficate = require('get-ssl-certificate');

‎Extension/content.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// var urlExists = require('url-exists');
22
// var whois = require('whois-json');
3-
// var sslCertificate = require('get-ssl-certificate');
3+
var sslCertificate = require('get-ssl-certificate');
44

55
// function isShortUrl(url){
66
// var query = url.split('?');
@@ -72,14 +72,14 @@
7272
// else return 1;
7373
// });
7474
// }
75-
// function datediff(){
76-
// sslCertificate.get(location.hostname).then(function (certificate) {
77-
// D=new Date(certificate.valid_to);
78-
// D1=new Date(certificate.valid_from);
79-
// op=(D.getFullYear()-D1.getFullYear()>1)?-1:((D.getFullYear()-D1.getFullYear()==1)?((11-D.getMonth()+D1.getMonth())>=12?-1:1):1);
80-
// return op;
81-
// });
82-
// }
75+
function datediff(){
76+
sslCertificate.get(location.hostname).then(function (certificate) {
77+
D=new Date(certificate.valid_to);
78+
D1=new Date(certificate.valid_from);
79+
op=(D.getFullYear()-D1.getFullYear()>1)?-1:((D.getFullYear()-D1.getFullYear()==1)?((11-D.getMonth()+D1.getMonth())>=12?-1:1):1);
80+
return op;
81+
});
82+
}
8383
// function registrationLength(){
8484
// whois(location.hostname, function(err, result){
8585
// if(JSON.stringify(result.registryExpiryDate, null, 2).replace('"','').split('-')[0]-JSON.stringify(result.creationDate, null, 2).replace('"','').split('-')[0]<1){
@@ -104,7 +104,7 @@
104104
// HTTPS_token=(window.location.hostname.search('https')!=-1)?1:-1;
105105
//Abnormal_URL=checkAbnormalURL();
106106
//age_of_domain=calcAge();
107-
//SSLfinal_State=datediff();
107+
SSLfinal_State=datediff();
108108

109109
// console.log(Favicon);
110110

‎Extension/manifest.json‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,7 @@
99
},
1010
"content_scripts": [{
1111
"css": ["styles.css"],
12-
<<<<<<< HEAD
13-
"js": ["content.js"],
14-
=======
15-
<<<<<<< HEAD
16-
"js": ["rough.js"],
17-
=======
18-
<<<<<<< HEAD
19-
"js": ["browserReadyBundle.js"],
20-
"matches": ["https://blog.lateral.io/*"]
21-
=======
2212
"js": ["bundle.js"],
23-
>>>>>>> 236a01e309605a4d24a0befd911230b265682eab
24-
>>>>>>> 0d166245b41dec6a292e4ae4d820af2280253e4b
2513
"matches": ["<all_urls>"]
2614
},
2715
{

‎Extension/node_modules/.bin/rapydscript‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Extension/node_modules/.bin/rapydscript‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)