From 8a5072ebad0a8154c75193fa063c56d024c2e3f3 Mon Sep 17 00:00:00 2001 From: WaterWei <50091357@qq.com> Date: Thu, 30 Sep 2021 14:11:37 +0800 Subject: [PATCH 1/9] Delete .DS_Store --- .DS_Store | Bin 8196 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 8a7a9ebd24f09d7edcb96b22115802077b53ba53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHM-A)rh6g~r0wji=Vk)LR?u`w|LO$%t`g0L2h5@V>8U@>Su5Nb_t zd;stKiO=8z_yTC+wO7VR&|B|3v$KW%ST4orOfvJGIdjfT&bMcFJ5vB4iDE7eFa!V+ zR)%sHHoqxsoYkh%7HB#U3HpP+=N5E}>e&C(WGxhe0l|P^KrkQ}5Dfec4B$7L6{*E{ zpO1=GFd!KCFBxF(2L&rbHNXl-|J8wwe*{1bq1rDf%S=F20#pO6aKsTTgu5bgR}vgC z2zN)l64C2|Emysj0 z)b=#fHXPsC%o%91_QG_SF{e#l8^7A)5C=$FFpr;|ox3v-OrX1U%b{=)iJ_I?SkOj9U^25`P ze6Um+pTbyUH%^TE6_2xJ+^=inGqbzF%?$ZmjqjT*SD$UTv+G><`5w8qufI3aJ8)rO zaA;t7WaMH-?$@>KcHUu6X_i{lNmxZ=HSd_YR6)y{c0TPHPra0RU}WUJ2Gd0&_xM<~ zv|m7*$g#qo?yh4Pwm;v(=B8_S>5SatW*ur-N$Q%ON$r)I(Umn9^KITUcINF(iYxA7 zek~N3nY(N_E@G2^dPQ>_&CVN%{dG&z4Qs(pP|u?~%#zKPrFPOW*i2~?Wfn_x<_9M? zs@|^(SGgcVlnVe+^+n8=rASp3AX(bR2k+qn9Ku)l z4nIi;877y>D48VFWQN=$56L3Qk}YDAC)~fSn%tM_S0XO2hj)y1Op8WwDbNDJOAHl zegEI!CAxwE!N9-7013^d<`NiD^;bq?aO|wDVBNsV3bU(l^j)y2y9mJk(I18=D`?7m W)Br0SQG-QX1o$+FMlkS48TbVOcT|S} From b51209fcdaacd3649c03c832463896de92e57b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E7=AB=A0?= <1377699408@qq.com> Date: Fri, 8 Oct 2021 11:04:48 +0800 Subject: [PATCH 2/9] 2.6.2 typo , --- docs/download/hfish-last-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/download/hfish-last-version b/docs/download/hfish-last-version index 84fd77d..19a861d 100644 --- a/docs/download/hfish-last-version +++ b/docs/download/hfish-last-version @@ -7,6 +7,6 @@ "3.修复：部分系统环境中节点无可执行权限问题。", "4.修复：部分场景中节点会频繁离线的问题。", "5.优化：部分系统环境中对pcap依赖的问题。", - "6.优化：部分页面的交互逻辑。", + "6.优化：部分页面的交互逻辑。" ] } From 65a0e567960e1254efb27dddbc1b81bbfc7b82ce Mon Sep 17 00:00:00 2001 From: pickled-pepper <44440751+pickled-pepper@users.noreply.github.com> Date: Wed, 13 Oct 2021 16:01:21 +0800 Subject: [PATCH 3/9] Delete .DS_Store --- docs/static/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 docs/static/.DS_Store diff --git a/docs/static/.DS_Store b/docs/static/.DS_Store deleted file mode 100644 index 9fc3b8778a588728de81853753f021abd072409c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5EDE3>-rwBGIIz+$(T{B}xivE`Sm!kRqN0g8Ee)BWK}eF#ZT7dQc%6G?why z^?KgsP4OH9u;t6$C9nW6r#s@!!_@rTePSn-F(RGMc)))o*3>?YOUC!BkRSKQ+X z&xibB!xR5mSM>cy7*{eWAO)m=6p#W^;CBjm@1@Pp6BVU^6p#X63i$V-(H(o?m>8c9 zh8O{eGp571j#+}(JVES*VLuSIxKGHbLwWR3B}@e=3A7* zdZMBfkOIdFoaT1n{eMmWVg5fRX(t7wz`s(!W~-aklCM;~b@FoFYa9KR?ltdpH?D)i n5bc;4?U);H#}`qQb Date: Wed, 13 Oct 2021 16:28:12 +0800 Subject: [PATCH 4/9] docker --- docs/.DS_Store | Bin 10244 -> 10244 bytes docs/2-1-docker.md | 95 ++++++++++++++++++++++++++++++++++++++------- docs/_coverpage.md | 7 +++- docs/_sidebar.md | 1 + 4 files changed, 87 insertions(+), 16 deletions(-) diff --git a/docs/.DS_Store b/docs/.DS_Store index d517a94bc0b3594201da2da5535d3ebc10219762..4f757cc39c8953758659f1a201878625f50de3e2 100644 GIT binary patch delta 197 zcmZn(XbITxQ(&{P;A<8(rgR1d2EEBDVn$#lW8LN$F>hu|J_Z+te1>F(Y=%^ZqSW?` zl{9>7G ME&3R%3m-880Ig>^rT_o{ delta 192 zcmZn(XbITxQ$UoL!H7YZ!4Qa381fmC8L}Bt8Hy%<5RusYM&Jj_wRJNl&zF*CoVj_w)B`3aph*j5Ss6u)%z&zmO;B`B?v*m#{9aCiaWjj; QUzW|sMPwN Linux amd64 Docker镜像的下载 +- 使用docker-compose，默认拉起**HFish**以及**MySql镜像** + +HFish镜像采用host模式启动，MySql镜像bridge模式启动。可在docker-compose.yml中修改MySql镜像的密码和映射端口。 + +- 进行数据持久化保存。 + +docker-compose.yml同目录下，会生成一个data文件夹，用于存放当前的所有攻击数据。另外，会生成一个logs文件夹，存放当前的所有日志。 + + + +#### Docker使用说明 + +**请确认自己的环境已经安装docker和docker compose** + +> 步骤1:将docker-compose.yml放置到需要启动HFish的服务器 + +下载:[docker_compose.yml](http://hfish.cn-bj.ufileos.com/docker-compose/2.6.2/docker-compose.yml) + +复制: ```shell -docker pull dskyz/hfish:latest +version: "3.7" +services: + web: + image: threatbook/hfish-server:2.6.2 + network_mode: "host" + container_name: hfish-server # 容器名 + restart: always + volumes: + - "./logs:/opt/hfish/logs" + - "/root/.hfish:/root/.hfish" + depends_on: + - db + command: sh /wait.sh hfish root 1234567 3306 /opt/hfish/server + + db: + image: threatbook/hfish-mysql:2.6.2 +# build: ./mysql + restart: always + container_name: hfish-mysql-db # 容器名 + environment: + - MYSQL_ROOT_PASSWORD=1234567 + - TZ=Asia/Shanghai + ports: + - 3306:3306 + volumes: + - ./data:/var/lib/mysql + command: --character-set-server=utf8mb4 + --collation-server=utf8mb4_general_ci + --explicit_defaults_for_timestamp=true + --lower_case_table_names=1 + --default-time-zone=+08:00 ``` -> 镜像的运行 +> 步骤2:在dockercompose.yml中，按需修改MySql的映射端口和密码 -```shell -docker run -d -p 4433:4433 -p 4434:4434 --name=hfish --restart=always dskyz/hfish:latest -``` +`注意，无论是修改端口还是密码，都需要将箭头所指的两个位置同步做修改` -例：如果控制端的ip是192.168.1.1，登陆链接为：https://192.168.1.1:4433/web/ +![image-20211012222209522](http://img.threatbook.cn/hfish/image-20211012222209522.png) -> 登陆web界面 + + +> 步骤3: 使用docker-compose up命令，启动docker ``` -登陆链接：https://[ip]:4433/web/ -账号：admin -密码：HFish2021 +docker-compose up ``` -例：如果控制端的ip是192.168.1.1，登陆链接为：https://192.168.1.1:4433/web/ + + +> 注意:在docker启动后，会有几分钟的mysql容器初始化，请耐心等待 + +image-20211012222554572 + +image-20211012222730930 +> 步骤4:登陆HFish + +登陆地址:https://ip:4433/web + +初始用户名:admin + +初始密码:HFish2021 + + + +> 数据持久化查询 + +docker-compose.yml同目录下，会生成一个data文件夹，用于存放当前的所有攻击数据。另外，会生成一个logs文件夹，存放当前的所有日志。 + +![image-20211012223326542](http://img.threatbook.cn/hfish/image-20211012223326542.png) \ No newline at end of file diff --git a/docs/_coverpage.md b/docs/_coverpage.md index f48b014..ef767c2 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -10,8 +10,11 @@ -[Linux版](https://hfish.io/#/2-2-linux) -[Windows版](https://hfish.io/#/2-3-windows) +[Linux下载](https://hfish.io/#/2-2-linux) +[Windows下载](https://hfish.io/#/2-3-windows) + +[Docker下载](https://hfish.io/#/2-1-docker) + [使用手册](#HFish设计理念) diff --git a/docs/_sidebar.md b/docs/_sidebar.md index 3220e90..f72f3dd 100644 --- a/docs/_sidebar.md +++ b/docs/_sidebar.md @@ -5,6 +5,7 @@ - [版本说明](download) - [Linux下载部署](2-2-linux) - [Windows下载部署](2-3-windows) + - [Docker下载部署](2-1-docker) - [提高数据库性能](2-4-mariadb) - [企业部署策略](2-5-env) - [快速上手](1-3-workflow) From 275b94a4173e661f50e2d89890f4d2c9ccafb39d Mon Sep 17 00:00:00 2001 From: maqian Date: Wed, 13 Oct 2021 16:30:54 +0800 Subject: [PATCH 5/9] coverpage --- docs/_coverpage.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/_coverpage.md b/docs/_coverpage.md index ef767c2..a2ff0a4 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -8,15 +8,13 @@ - - [Linux下载](https://hfish.io/#/2-2-linux) [Windows下载](https://hfish.io/#/2-3-windows) - [Docker下载](https://hfish.io/#/2-1-docker) - [使用手册](#HFish设计理念) + + ![](http://img.threatbook.cn/hfish/background.jpg) \ No newline at end of file From 74c394c3bd24d0e5e045e1568e3321c258ede673 Mon Sep 17 00:00:00 2001 From: maqian Date: Wed, 13 Oct 2021 16:41:09 +0800 Subject: [PATCH 6/9] docker2 --- docs/.DS_Store | Bin 10244 -> 10244 bytes docs/2-1-docker.md | 42 ++++-------------------------------------- 2 files changed, 4 insertions(+), 38 deletions(-) diff --git a/docs/.DS_Store b/docs/.DS_Store index 4f757cc39c8953758659f1a201878625f50de3e2..da76fb8abf71fde4c06e4740f86ed53d6e2445dc 100644 GIT binary patch delta 61 zcmZn(XbITxQ$UoL!H7YZ!4Qa381fmC8L}Bt8Hy$+2#HRfDJih|r$7nEd01}-NI{*Lx delta 55 zcmZn(XbITxQ(&{PU4Ie!9+NK0(#Z%O&I3HnS`I LV%cmh%FGM^>!uLq diff --git a/docs/2-1-docker.md b/docs/2-1-docker.md index 9e3d81f..02edc0c 100644 --- a/docs/2-1-docker.md +++ b/docs/2-1-docker.md @@ -20,63 +20,29 @@ docker-compose.yml同目录下，会生成一个data文件夹，用于存放当 下载:[docker_compose.yml](http://hfish.cn-bj.ufileos.com/docker-compose/2.6.2/docker-compose.yml) -复制: -```shell -version: "3.7" -services: - web: - image: threatbook/hfish-server:2.6.2 - network_mode: "host" - container_name: hfish-server # 容器名 - restart: always - volumes: - - "./logs:/opt/hfish/logs" - - "/root/.hfish:/root/.hfish" - depends_on: - - db - command: sh /wait.sh hfish root 1234567 3306 /opt/hfish/server - - db: - image: threatbook/hfish-mysql:2.6.2 -# build: ./mysql - restart: always - container_name: hfish-mysql-db # 容器名 - environment: - - MYSQL_ROOT_PASSWORD=1234567 - - TZ=Asia/Shanghai - ports: - - 3306:3306 - volumes: - - ./data:/var/lib/mysql - command: --character-set-server=utf8mb4 - --collation-server=utf8mb4_general_ci - --explicit_defaults_for_timestamp=true - --lower_case_table_names=1 - --default-time-zone=+08:00 -``` > 步骤2:在dockercompose.yml中，按需修改MySql的映射端口和密码 `注意，无论是修改端口还是密码，都需要将箭头所指的两个位置同步做修改` -![image-20211012222209522](http://img.threatbook.cn/hfish/image-20211012222209522.png) +image-20211012222209522 > 步骤3: 使用docker-compose up命令，启动docker ``` -docker-compose up + docker-compose up -d ``` > 注意:在docker启动后，会有几分钟的mysql容器初始化，请耐心等待 -image-20211012222554572 +image-20211012222554572 -image-20211012222730930 +image-20211013163538978 From b2dc6f989c169d9c966d0d47c65ebbcfd62243be Mon Sep 17 00:00:00 2001 From: maqian Date: Wed, 13 Oct 2021 17:00:27 +0800 Subject: [PATCH 7/9] docker3 --- docs/2-1-docker.md | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/docs/2-1-docker.md b/docs/2-1-docker.md index 02edc0c..9de0242 100644 --- a/docs/2-1-docker.md +++ b/docs/2-1-docker.md @@ -1,4 +1,4 @@ -#### Docker版本简介 +### Docker版本简介 Docker是我们推荐的部署方式，当前在2.6.2版本，我们增加了以下特性 @@ -12,7 +12,7 @@ docker-compose.yml同目录下，会生成一个data文件夹，用于存放当 -#### Docker使用说明 +### Docker安装说明 **请确认自己的环境已经安装docker和docker compose** @@ -26,7 +26,7 @@ docker-compose.yml同目录下，会生成一个data文件夹，用于存放当 `注意，无论是修改端口还是密码，都需要将箭头所指的两个位置同步做修改` -image-20211012222209522 +image-20211012222209522 @@ -40,9 +40,9 @@ docker-compose.yml同目录下，会生成一个data文件夹，用于存放当 > 注意:在docker启动后，会有几分钟的mysql容器初始化，请耐心等待 -image-20211012222554572 +image-20211012222554572 -image-20211013163538978 +image-20211013163538978 @@ -56,8 +56,19 @@ docker-compose.yml同目录下，会生成一个data文件夹，用于存放当 -> 数据持久化查询 +### 查看HFish日志 docker-compose.yml同目录下，会生成一个data文件夹，用于存放当前的所有攻击数据。另外，会生成一个logs文件夹，存放当前的所有日志。 -![image-20211012223326542](http://img.threatbook.cn/hfish/image-20211012223326542.png) \ No newline at end of file +![image-20211012223326542](http://img.threatbook.cn/hfish/image-20211012223326542.png) + + + +### 查看Docker日志 + +进入docker-compose.yml的目录，执行 + +```shell +docker-compose logs +``` + From 7ddf888dbafad9e45560771831162e65dcde5d7b Mon Sep 17 00:00:00 2001 From: maqian Date: Wed, 13 Oct 2021 17:58:06 +0800 Subject: [PATCH 8/9] docker --- docs/2-1-docker.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/2-1-docker.md b/docs/2-1-docker.md index 9de0242..7333b99 100644 --- a/docs/2-1-docker.md +++ b/docs/2-1-docker.md @@ -22,11 +22,11 @@ docker-compose.yml同目录下，会生成一个data文件夹，用于存放当 -> 步骤2:在dockercompose.yml中，按需修改MySql的映射端口和密码 +> 步骤2:在dockercompose.yml中，按需修改MySql容器的对外映射端口和登陆密码 `注意，无论是修改端口还是密码，都需要将箭头所指的两个位置同步做修改` -image-20211012222209522 +image-20211013175549337 From aa051455af54e4a25732fc55e73ef136dd8ece90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E7=AB=A0?= <1377699408@qq.com> Date: Fri, 15 Oct 2021 15:08:32 +0800 Subject: [PATCH 9/9] https --- docs/2-1-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/2-1-docker.md b/docs/2-1-docker.md index 7333b99..7a97c72 100644 --- a/docs/2-1-docker.md +++ b/docs/2-1-docker.md @@ -18,7 +18,7 @@ docker-compose.yml同目录下，会生成一个data文件夹，用于存放当 > 步骤1:将docker-compose.yml放置到需要启动HFish的服务器 -下载:[docker_compose.yml](http://hfish.cn-bj.ufileos.com/docker-compose/2.6.2/docker-compose.yml) +下载:[docker_compose.yml](https://hfish.cn-bj.ufileos.com/docker-compose/2.6.2/docker-compose.yml)