Merge pull request #161 from HXSecurity/issue-145

update:change php deploy

Author: 奇淼（piexlmax

.env

@@ -7,8 +7,8 @@ VUE_APP_ATOM_API = '/atom-webapi'
 
 # target host
 
-# VUE_TARGET_HOST = 'http://192.168.2.181:8000'
-VUE_TARGET_HOST = 'https://iast-test.huoxian.cn'
+VUE_TARGET_HOST = 'http://192.168.2.181:8002'
+# VUE_TARGET_HOST = 'https://iast-test.huoxian.cn'
 # VUE_TARGET_HOST = 'http://52.81.92.214:30485'
 # VUE_TARGET_HOST = 'http://iast.huoxian.cn'
 

src/config/lang/en.ts

@@ -198,14 +198,14 @@ export default {
           'Note: If you cannot configure the system environment variables, you can change the agent configuration file, modify the project name, and find the path address of the python installation agent extension package, for example: /Library/Frameworks/Python.framework/Versions/3.8/lib/python3.8/site -packages/dongtai_agent_python modify project.name in dongtai_agent_python/config.json, the priority of system environment variable projectName is higher than project.name in configuration file;',
       },
       php: {
-        ManualInstallation: 'Manual Installation',
-        term1: 'Python Version: 8.0.9 and above',
+        Manualinstallation: 'manual installation',
+        term1: 'PHP version no less than 8.0.9',
         manualInstallationDesc1:
-          'a. Manually unzip php-agent-test.tar.gz. There are three files in PHP agent test: Dongtai_ php_ Agent.so & test.json & run-tests.php, copy Dongtai_ php_ Agent.so to the extension in the PHP installation environment, for example:/usr/local/lib/php/pecl/20200930.',
+          'A. manually decompress php-agent.tar.gz. There are three files in PHP agent: dongtai_php_agent.so & policy.json & dongtai-php-property.ini. Copy dongtai_php_agent.so to the extension in the PHP installation environment, for example: / usr / local / lib / PHP / PECL / 20200930',
         manualInstallationDesc2:
-          'b. Find php.ini, use the command: PHP - I | grep php.ini, and add: extension in php.ini_ Dir = "path of dongtai_php_agent.so inside PHP", extension = Dongtai_ php_ Agent, then execute PHP – V, the PHP version information is displayed normally, and there will be Dongtai in PHP – M_ php_ Agent, that is, the installation is successful.',
+          'B. find the configuration file directory of PHP, add: dongtai-php-property.ini, then execute PHP – m, and check that there will be dongtai_php_agent, that is, the installation is successful.',
         manualInstallationDesc3:
-          'c. Through the terminal, enter PHP agent test, execute PHP run-tests.php test results, or enter the shooting range test. The shooting range address is: https://github.com/jinghao1/phpvul',
+          'C. through the terminal, enter PHP agent and execute PHP run-tests.php test results. You can also enter the shooting range for test. The shooting range address is: https://github.com/jinghao1/phpvul ',
       },
     },
     search: {

src/config/lang/zh_cn.ts

@@ -202,11 +202,11 @@ export default {
         ManualInstallation: '手动安装',
         term1: 'PHP版本不低于8.0.9',
         manualInstallationDesc1:
-          'a. 手动解压缩php-agent-test.tar.gz，php-agent-test里面有三个文件，分别是：dongtai_php_agent.so& test.json & run-tests.php，复制dongtai_php_agent.so到php安装环境中的extension中，例如：/usr/local/lib/php/pecl/20200930',
+          'a. 手动解压缩php-agent.tar.gz，php-agent里面有三个文件，分别是：dongtai_php_agent.so& policy.json &dongtai-php-property.ini，复制dongtai_php_agent.so到php安装环境中的extension中，例如：/usr/local/lib/php/pecl/20200930',
         manualInstallationDesc2:
-          'b. 找到php.ini，使用命令：php -i | grep php.ini，在php.ini添加：extension_dir = " dongtai_php_agent.so在php内部的路径" , extension=dongtai_php_agent，之后执行php –v，正常显示PHP版本信息,php –m 查看会有dongtai_php_agent，即安装成功。',
+          'b. 找到php的配置文件目录，添加：dongtai-php-property.ini，之后执行php –m， 查看会有dongtai_php_agent，即安装成功。',
         manualInstallationDesc3:
-          'c. 通过终端，进入php-agent-test，执行 php run-tests.php测试结果，也可以进入靶场测试，靶场地址：https://github.com/jinghao1/phpvul',
+          'c. 通过终端，进入php-agent，执行 php run-tests.php测试结果，也可以进入靶场测试，靶场地址：https://github.com/jinghao1/phpvul',
       },
     },
     search: {

src/services/deploy.ts

@@ -33,6 +33,8 @@ export default () =>
           link.href = window.URL.createObjectURL(blob)
           if (language === 'java') {
             link.download = 'agent.jar'
+          } else if (language === 'php') {
+            link.download = 'php-agent.tar.gz'
           } else {
             link.download = 'dongtai-agent-python.tar.gz'
           }

src/views/deploy/Deploy.vue

@@ -465,7 +465,7 @@ export default class Deploy extends VueBase {
       case 'python':
         return `curl -X GET "${this.uri}/api/v1/agent/download?url=${this.uri}&language=python&projectName=Demo%20Project" -H 'Authorization: Token ${this.token}' -o dongtai-agent-python.tar.gz -k`
       case 'php':
-        return `curl -X GET "${this.uri}/api/v1/agent/download?url=${this.uri}&language=php" -H 'Authorization: Token ${this.token}' -o php-agent-test.tar.gz`
+        return `curl -X GET "${this.uri}/api/v1/agent/download?url=${this.uri}&language=php" -H 'Authorization: Token ${this.token}' -o php-agent.tar.gz`
     }
   }
   get pythonShell() {

src/views/setting/SysInfo.vue

@@ -29,7 +29,7 @@
         <div class="moudleTitle-th">
           {{ $t('views.sysInfo.vul_verifiy') }}
           <el-popover placement="top-start" width="340" trigger="hover">
-            <p>{{ $t('views.sysInfo.open') }}</p>
+            <p>{{ $t('views.sysInfo.vul') }}</p>
             <span slot="reference"> <i class="el-icon-question"></i>： </span>
           </el-popover>
         </div>