Merge branch 'develop' into main

Author: 78778443

code/app/common.php

@@ -230,7 +230,10 @@ function downCode($codePath, $prName, $codeUrl, $is_private = 0, $username = '',
 
 function cleanString($string)
 {
-    $string = preg_replace("/[^a-z0-9]/i", "", $string);
+    $string = strtolower($string);
+    $string = preg_replace("/[^a-z0-9A-Z]/i", "", $string);
+
+    $string = empty($string) ? md5($string) : $string;
 
     return $string;
 }

code/app/controller/Code.php

@@ -60,7 +60,7 @@ public function rescan(Request $request)
             'python_scan_time' => '2000-01-01 00:00:00',
             'webshell_scan_time' => '2000-01-01 00:00:00',
         ];
-        Db::table('app')->where(['id' => $id])->save($array);
+        Db::table('code')->where(['id' => $id])->save($array);
         Db::table('fortify')->where(['code_id' => $id])->delete();
         Db::table('semgrep')->where(['code_id' => $id])->delete();
         Db::table('code_webshell')->where(['code_id' => $id])->delete();

code/app/model/OneForAllModel.php

@@ -35,7 +35,7 @@ public static function subdomainScan()
                 $filename = $file_path.$domain.'.csv';
                 if (!file_exists($filename)) {
                     PluginModel::addScanLog($v['id'], __METHOD__, 2);
-                    addlog(["文件不存在:{$filename}"]);
+                    addlog(["OneForAll子域名扫描结果，文件不存在:{$filename}"]);
                     AppModel::updateScanTime($v['id'],'subdomain_scan_time');
                     continue;
                 }
@@ -56,7 +56,7 @@ public static function subdomainScan()
                     AppModel::updateScanTime($v['id'],'subdomain_scan_time');
                     @unlink($filename);
                 } else {
-                    addlog(["内容获取失败:{$filename}"]);
+                    addlog(["OneForAll子域名扫描,内容获取失败:{$filename}"]);
                 }
                 PluginModel::addScanLog($v['id'], __METHOD__, 1);
             }

code/app/model/WebScanModel.php

@@ -168,19 +168,21 @@ public static function xray()
                     $result = [];
                     execLog($cmd, $result);
                     $result = implode("\n", $result);
-                    addlog(["漏洞扫描结束", $id, $url, $cmd, base64_encode($result)]);
+                    addlog(["xray漏洞扫描结束", $id, $url, $cmd, base64_encode($result)]);
                     $result = file_put_contents($pathArr['cmd_result'], $result);
                     if ($result == false) {
-                        addlog(["写入执行结果失败", base64_encode($pathArr['cmd_result'])]);
+                        addlog(["xray写入执行结果失败", base64_encode($pathArr['cmd_result'])]);
+                        continue;
                     }
                 } else {
                     addlog("xray文件已存在:{$pathArr['tool_result']}");
                 }
                 //如果结果文件不存在
                 if (file_exists($pathArr['tool_result']) == false) {
-                    addlog("文件不存在:{$pathArr['tool_result']}  ,扫描URL失败: {$url}");
+                    addlog("xray扫描结果文件不存在:{$pathArr['tool_result']},扫描URL失败: {$url}");
                     Db::table('app')->where(['id' => $id])->save(['xray_scan_time' => date('2048-m-d H:i:s')]);
                     PluginModel::addScanLog($val['id'], __METHOD__, 2);
+                    continue;
                 }
 
                 $data = json_decode(file_get_contents($pathArr['tool_result']), true);
@@ -198,7 +200,7 @@ public static function xray()
                         'poc' => $value['detail']['payload']
                     ];
                     $addr[] = $newData;
-                    echo "添加漏洞结果:" . json_encode($newData) . PHP_EOL;
+                    echo "xray添加漏洞结果:" . json_encode($newData) . PHP_EOL;
                     XrayModel::addXray($newData);
                 }
                 addlog(["xray扫描数据写入成功:".json_encode($addr)]);