ver:2.0.12 (momosecurity#25)

## [2.0.12]-2023-02-14
感谢 小笼包 提出bug。
### 修复
- 修复当前页面无script标签时无法正常使用的bug。
- 修复了一些空值判断导致的异常。

CHANGELOG.md

@@ -1,5 +1,10 @@
 # 变更日志
 此项目的所有显著更改将记录在此文件中。
+## [2.0.12]-2023-02-14
+感谢 小笼包 提出bug。
+### 修复
+- 修复当前页面无script标签时无法正常使用的bug。
+- 修复了一些空值判断导致的异常。
 
 ## [2.0.11]-2022-11-09
 感谢 xiaoliangli1128 提出bug，并提供了部分规则。

background.js

@@ -863,7 +863,7 @@ function webhook(data) {
             // console.log(webhookRequest);
             fetch(webhookRequest, webhookInit).then(function(response) {
                 // console.log(response);
-            });
+            }).catch(err=>{ console.log("webhook fetch error",err)});
         }
     });
 }
@@ -943,7 +943,7 @@ chrome.runtime.onMessage.addListener(
                     search_data[request.current]['donetasklist'].push(0);
                     chrome.storage.local.set({["findsomething_result_"+request.current]: search_data[request.current]}, function(){});
                     });
-                });
+                }).catch(err=>{ console.log("fetch error",err)});
                 promiseTask.push(p);
             }
             catch (e){

content.js

@@ -40,9 +40,11 @@
     chrome.runtime.sendMessage({greeting: "find",data: target_list, current: href}, function(response) { });
 
     function is_script(u){
-        for(var i=0;i<script_src.length;i++){
-            if (script_src[i].indexOf(u)>0){
-                return true
+        if(script_src){
+            for(var i=0;i<script_src.length;i++){
+                if (script_src[i].indexOf(u)>0){
+                    return true
+                }
             }
         }
         return false
@@ -266,17 +268,19 @@ chrome.storage.local.get(["global_float"], function(settings){
 
 function init_copy() {
     var elements = document.getElementsByClassName("finsomething_copy");
-    for (var i=0, len=elements.length|0; i<len; i=i+1|0) {
-        let ele_name = elements[i].name;
-        elements[i].onclick=function () {
-            // console.log('copy begin');
-            var inp =document.createElement('textarea');
-            document.body.appendChild(inp)
-            inp.value =document.getElementById(ele_name).textContent;
-            inp.select();
-            document.execCommand('copy',false);
-            inp.remove();
-            // console.log('copy end');
+    if (elements) {
+        for (var i=0, len=elements.length|0; i<len; i=i+1|0) {
+            let ele_name = elements[i].name;
+            elements[i].onclick=function () {
+                // console.log('copy begin');
+                var inp =document.createElement('textarea');
+                document.body.appendChild(inp)
+                inp.value =document.getElementById(ele_name).textContent;
+                inp.select();
+                document.execCommand('copy',false);
+                inp.remove();
+                // console.log('copy end');
+            }
         }
     }
 };
@@ -291,15 +295,17 @@ function sleep (time) {
 var key = ["ip","ip_port","domain","path","incomplete_path","url","static","sfz","mobile","mail","jwt","algorithm","secret"]
 
 function show_info(result_data) {
-    for (var k in key){
-        if (result_data[key[k]]!=null && result_data[key[k]].length != 0){
-            // console.log(result_data[key[k]])
-            let p="";
-            for(var i in result_data[key[k]]){
-                p = p + result_data[key[k]][i] +'\n'
+    if(result_data){
+        for (var k in key){
+            if (result_data[key[k]]){
+                // console.log(result_data[key[k]])
+                let p="";
+                for(var i in result_data[key[k]]){
+                    p = p + result_data[key[k]][i] +'\n'
+                }
+                document.getElementById(key[k]).style.whiteSpace="pre";
+                document.getElementById(key[k]).textContent=p;
             }
-            document.getElementById(key[k]).style.whiteSpace="pre";
-            document.getElementById(key[k]).textContent=p;
         }
     }
 }

manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "FindSomething",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "manifest_version": 3,
   "description": "在网页的源代码或js中找到一些有趣的东西",  
   "permissions": [     

popup.js

@@ -4,44 +4,46 @@ var key = ["ip","ip_port","domain","path","incomplete_path","url","static","sfz"
 
 function init_copy() {
     var elements = document.getElementsByClassName("copy");
-    for (var i=0, len=elements.length|0; i<len; i=i+1|0) {
-        let ele_name = elements[i].name;
-        let ele_id = elements[i].id;
-        elements[i].onclick=function () {
-            var inp =document.createElement('textarea');
-            document.body.appendChild(inp)
-            var copytext = document.getElementById(ele_name).textContent;
-            if (ele_id == "path_url_button"){
-                Promise.all([getCurrentTab().then(function x(tab){
-                    // console.log(tab);
-                    if(tab == undefined){
-                        alert("请点击原页面后再复制：）")
-                        return;
-                    }
-                    var url = new URL(tab.url)
-                    var path_list = copytext.split('\n')
-                    copytext = ""
-                    for (var i = path_list.length - 1; i >= 0; i--) {
-                        if(path_list[i][0] == '.'){
-                            copytext += url.origin+'/'+path_list[i]+'\n';
-                        }else{
-                            copytext += url.origin+path_list[i]+'\n';
+    if(elements){
+        for (var i=0, len=elements.length|0; i<len; i=i+1|0) {
+            let ele_name = elements[i].name;
+            let ele_id = elements[i].id;
+            elements[i].onclick=function () {
+                var inp =document.createElement('textarea');
+                document.body.appendChild(inp)
+                var copytext = document.getElementById(ele_name).textContent;
+                if (ele_id == "path_url_button"){
+                    Promise.all([getCurrentTab().then(function x(tab){
+                        // console.log(tab);
+                        if(tab == undefined){
+                            alert("请点击原页面后再复制：）")
+                            return;
                         }
-                    }
-                    inp.value = copytext.slice(0, -1);
-                    inp.select();
-                    // console.log(copytext)
-                    document.execCommand('copy',false);
-                    // inp.remove();
-                })]).then(res=> inp.remove())
+                        var url = new URL(tab.url)
+                        var path_list = copytext.split('\n')
+                        copytext = ""
+                        for (var i = path_list.length - 1; i >= 0; i--) {
+                            if(path_list[i][0] == '.'){
+                                copytext += url.origin+'/'+path_list[i]+'\n';
+                            }else{
+                                copytext += url.origin+path_list[i]+'\n';
+                            }
+                        }
+                        inp.value = copytext.slice(0, -1);
+                        inp.select();
+                        // console.log(copytext)
+                        document.execCommand('copy',false);
+                        // inp.remove();
+                    })]).then(res=> inp.remove())
+                    // alert('复制成功');
+                    return ;
+                }
+                inp.value = copytext;
+                inp.select();
+                document.execCommand('copy',false);
+                inp.remove();
                 // alert('复制成功');
-                return ;
             }
-            inp.value = copytext;
-            inp.select();
-            document.execCommand('copy',false);
-            inp.remove();
-            // alert('复制成功');
         }
     }
 };
@@ -58,7 +60,7 @@ function sleep (time) {
 
 function show_info(result_data) {
     for (var k in key){
-        if (result_data[key[k]]!=null && result_data[key[k]].length != 0){
+        if (result_data[key[k]]){
             // console.log(result_data[key[k]])
             let p="";
             for(var i in result_data[key[k]]){
@@ -82,7 +84,7 @@ getCurrentTab().then(function get_info(tab) {
         // console.log(result_data)
         if(result_data == undefined || result_data['done']!='done'){
             // console.log('还未提取完成');
-            if(result_data != undefined && result_data.donetasklist != undefined ){
+            if(result_data && result_data.donetasklist){
                 // console.log("findsomething_result_"+tab.url)
                 chrome.storage.local.get(["findsomething_result_"+tab.url], show_info(result_data));
                 // show_info(result_data);