Merge pull request #39 from hacklcx/dev

更新0.4
hacklcx · Oct 28, 2019 · 1e9f15c · 1e9f15c
2 parents a320e9e + 8a53171
commit 1e9f15c
Show file tree

Hide file tree

Showing 53 changed files with 4,011 additions and 80 deletions.
diff --git a/README.md b/README.md
@@ -101,7 +101,23 @@
 
 ## MemCache 蜜罐
 
-![telnet.png](./images/memcache.png)
+![memcache.png](./images/memcache.png)
+
+## HTTP 蜜罐
+
+![http.png](./images/http.png)
+
+## TFTP 蜜罐
+
+![tftp.png](./images/tftp.png)
+
+## ES 蜜罐
+
+![es.png](./images/es.png)
+
+## VNC 蜜罐
+
+![vnc.png](./images/vnc.png)
 
 
 # 注意事项

diff --git a/admin/colony.html b/admin/colony.html
@@ -63,15 +63,19 @@ <h4 class="page-title">分布式集群</h4>
                 <tr>
                     <th width="10%">集群名称</th>
                     <th width="10%">集群 IP</th>
-                    <th width="8%" style="text-align: center;">插件</th>
-                    <th width="8%" style="text-align: center;">WEB</th>
-                    <th width="8%" style="text-align: center;">暗网</th>
-                    <th width="8%" style="text-align: center;">SSH</th>
-                    <th width="8%" style="text-align: center;">Redis</th>
-                    <th width="8%" style="text-align: center;">Mysql</th>
-                    <th width="8%" style="text-align: center;">Telnet</th>
-                    <th width="8%" style="text-align: center;">FTP</th>
-                    <th width="8%" style="text-align: center;">MemCache</th>
+                    <th width="6%" style="text-align: center;">插件</th>
+                    <th width="6%" style="text-align: center;">WEB</th>
+                    <th width="6%" style="text-align: center;">暗网</th>
+                    <th width="6%" style="text-align: center;">SSH</th>
+                    <th width="6%" style="text-align: center;">Redis</th>
+                    <th width="6%" style="text-align: center;">Mysql</th>
+                    <th width="6%" style="text-align: center;">Telnet</th>
+                    <th width="6%" style="text-align: center;">FTP</th>
+                    <th width="6%" style="text-align: center;">MemCache</th>
+                    <th width="6%" style="text-align: center;">HTTP</th>
+                    <th width="6%" style="text-align: center;">TFTP</th>
+                    <th width="6%" style="text-align: center;">VNC</th>
+                    <th width="6%" style="text-align: center;">ES</th>
                     <th width="1%"></th>
                 </tr>
                 </thead>
@@ -185,6 +189,30 @@ <h4 class="page-title">分布式集群</h4>
                         _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
                     }
 
+                    if (data[i].http_status == 1) {
+                        _h += '    <td class="td" style="text-align: center;"><span class="openx"></span></td>';
+                    } else {
+                        _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
+                    }
+
+                    if (data[i].es_status == 1) {
+                        _h += '    <td class="td" style="text-align: center;"><span class="openx"></span></td>';
+                    } else {
+                        _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
+                    }
+
+                    if (data[i].tftp_status == 1) {
+                        _h += '    <td class="td" style="text-align: center;"><span class="openx"></span></td>';
+                    } else {
+                        _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
+                    }
+
+                    if (data[i].vnc_status == 1) {
+                        _h += '    <td class="td" style="text-align: center;"><span class="openx"></span></td>';
+                    } else {
+                        _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
+                    }
+
 
                     // if (data[i].http_status == "1") {
                     //     _h += '    <td class="td" style="text-align: center;"><span class="openx"></span></td>';
@@ -207,6 +235,10 @@ <h4 class="page-title">分布式集群</h4>
                     _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
                     _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
                     _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
+                    _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
+                    _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
+                    _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
+                    _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
                     // _h += '    <td class="td" style="text-align: center;"><span class="closex"></span></td>';
                     _h += '    <td class="td" style="text-align: center;">';
                     _h += '        <i class="fa fa-trash-o" onclick="del(' + data[i].id + ')"></i>';

diff --git a/admin/dashboard.html b/admin/dashboard.html
@@ -133,7 +133,7 @@ <h2 class="m-b-10"><span data-plugin="counterup">{{.deepSum}}</span></h2>
     </div>
 
     <div class="col-md-2">
-        <div class="card-box" style="height: 550px;">
+        <div class="card-box" style="height: 600px;">
             <p class="title">服务状态</p>
             <p><span class="openx"></span>ADMIN</p>
 
@@ -194,11 +194,36 @@ <h2 class="m-b-10"><span data-plugin="counterup">{{.deepSum}}</span></h2>
         {{end}}
 
         {{if eq .memCacheStatus "1"}}
-            <p><span class="openx"></span>MEMCACHE</p>
+            <p><span class="openx"></span>MemCache</p>
         {{else}}
-            <p><span class="closex"></span>MEMCACHE</p>
+            <p><span class="closex"></span>MemCache</p>
         {{end}}
 
+        {{if eq .httpStatus "1"}}
+            <p><span class="openx"></span>HTTP</p>
+        {{else}}
+            <p><span class="closex"></span>HTTP</p>
+        {{end}}
+
+        {{if eq .tftpStatus "1"}}
+            <p><span class="openx"></span>TFTP</p>
+        {{else}}
+            <p><span class="closex"></span>TFTP</p>
+        {{end}}
+
+        {{if eq .esStatus "1"}}
+            <p><span class="openx"></span>ElasticSearch</p>
+        {{else}}
+            <p><span class="closex"></span>ElasticSearch</p>
+        {{end}}
+
+        {{if eq .vncStatus "1"}}
+            <p><span class="openx"></span>VNC</p>
+        {{else}}
+            <p><span class="closex"></span>VNC</p>
+        {{end}}
+
+
         </div>
     </div>
 
@@ -209,12 +234,12 @@ <h2 class="m-b-10"><span data-plugin="counterup">{{.deepSum}}</span></h2>
     </div>
     <div class="col-md-5">
         <div class="card-box">
-            <div id="myChart1" style="width:100%;height:250px;"></div>
+            <div id="myChart1" style="width:100%;height:300px;"></div>
         </div>
     </div>
     <div class="col-md-5">
         <div class="card-box">
-            <div id="myChart2" style="width:100%;height:250px;"></div>
+            <div id="myChart2" style="width:100%;height:300px;"></div>
         </div>
     </div>
 </div>

diff --git a/admin/fish.html b/admin/fish.html
@@ -70,6 +70,22 @@
         background-color: #61772d;
     }
 
+    .lb_es {
+        background-color: #0177a3;
+    }
+
+    .lb_tftp {
+        background-color: #452b6d;
+    }
+
+    .lb_vnc {
+        background-color: #3c6f40;
+    }
+
+    .lb_http {
+        background-color: #56a996;
+    }
+
     .pre {
         background: #2c2c31;
         color: #4fe21b;
@@ -372,6 +388,14 @@ <h6 class="modal-title" id="myModalLabel">上钩信息</h6>
                         _h += '       <span class="label lb_mem_cache">MEMCACHE</span> ';
                     } else if (data.result[i].type == "PLUG") {
                         _h += '       <span class="label lb_plug">PLUG</span> ';
+                    }else if (data.result[i].type == "ES") {
+                        _h += '       <span class="label lb_es">ES</span> ';
+                    }else if (data.result[i].type == "TFTP") {
+                        _h += '       <span class="label lb_tftp">TFTP</span> ';
+                    }else if (data.result[i].type == "VNC") {
+                        _h += '       <span class="label lb_vnc">VNC</span> ';
+                    } else if (data.result[i].type == "HTTP") {
+                        _h += '       <span class="label lb_http">HTTP</span> ';
                     }
 
                     _h += '       <span class="project">' + data.result[i].project_name + '</span>';
@@ -394,7 +418,7 @@ <h6 class="modal-title" id="myModalLabel">上钩信息</h6>
                     }
 
                     _h += '    <td><span class="info" onclick="show(' + data.result[i].id + ')">点击查看</span></td>';
-                    _h += '    <td class="td"><span class="cinfo">' + data.result[i].info.length + '</span></td>';
+                    _h += '    <td class="td"><span class="cinfo">' + data.result[i].info.replace("&&","").length + '</span></td>';
                     _h += '    <td class="td">' + data.result[i].create_time.replace("T", " ").replace("+08:00", " ").replace("Z", "") + '</td>';
                     _h += '</tr>';
                 }

diff --git a/admin/footer.html b/admin/footer.html
@@ -25,6 +25,12 @@
         <div class="tab-content">
             <div class="tab-pane fade in active" id="home-2">
                 <div class="timeline-2">
+                    <div class="time-item">
+                        <div class="item-info">
+                            <small class="text-muted">2019-10-29</small>
+                            <p>发布 v0.4 版本</p>
+                        </div>
+                    </div>
                     <div class="time-item">
                         <div class="item-info">
                             <small class="text-muted">2019-09-16</small>

diff --git a/admin/header.html b/admin/header.html
@@ -20,8 +20,7 @@
             <!-- LOGO -->
             <div class="topbar-left">
                 <a href="/dashboard" class="logo">
-                {{/*<img src="/res/images/logo.png" class="logoimg">*/}}
-                    <span>HFish</span>
+                    <img src="/static/images/logo.png" style="width: 100px;margin-top: -5px;">
                 </a>
             </div>
 
@@ -56,7 +55,7 @@
                         <a class="nav-link dropdown-toggle arrow-none waves-effect waves-light nav-user"
                            data-toggle="dropdown" href="#" role="button"
                            aria-haspopup="false" aria-expanded="false">
-                            <img src="/static/images/avatar.png" alt="user" class="img-circle avatarx">
+                            <img src="/static/images/avatar.jpg" alt="user" class="img-circle avatarx">
                         </a>
                         <div class="dropdown-menu dropdown-menu-right dropdown-arrow profile-dropdown "
                              aria-labelledby="Preview">

diff --git a/admin/login.html b/admin/login.html
@@ -29,8 +29,7 @@
         <div class="card-box m-b-0">
             <div class="text-xs-center m-t-20">
                 <a href="/" class="logo">
-                    <img src="/static/images/logo.png" class="logoimg">
-                    <div style="letter-spacing: 7px;font-size: 65px;">HFish</div>
+                    <img src="/static/images/hfish.png" class="logoimg">
                 </a>
             </div>
             <div class="m-t-10 p-20">

diff --git a/config.ini b/config.ini
@@ -1,5 +1,5 @@
 [rpc]
-status = 0                                      # 模式 0关闭 1服务端 2客户端
+status = 1                                      # 模式 0关闭 1服务端 2客户端
 addr = 0.0.0.0:7879                             # RPC 服务端地址 or 客户端地址
 name = Server                                   # 状态1 服务端 名称 状态2 客户端 名称
 
@@ -42,7 +42,7 @@ static = deep/static                            # 暗网 WEB 静态文件路径
 url = /                                         # 暗网 WEB 访问目录，默认 / 可更改成 index.html index.asp index.php
 
 [ssh]
-status = 2                                      # 是否启动 SSH 0 关闭 1 低交互 2 高交互
+status = 1                                      # 是否启动 SSH 0 关闭 1 低交互 2 高交互
 addr = 0.0.0.0:22                               # SSH 服务端地址 注意端口冲突，请先关闭服务器 openssh 服务 或 修改端口
 
 [redis]
@@ -65,4 +65,19 @@ addr = 0.0.0.0:21                               # Ftp 服务端地址 注意端
 [mem_cache]
 status = 1                                      # 是否启动 MemCache 0 关闭 1 启动
 addr = 0.0.0.0:11211                            # Memcache 服务端地址 注意端口冲突
-rate_limit = 4                                  # 每秒响应次数
+
+[http]
+status = 1                                      # 是否启动 HTTP代理 0 关闭 1 启动
+addr = 0.0.0.0:8080                             # HTTP代理地址 注意端口冲突
+
+[tftp]
+status = 1                                      # 是否启动 tftp 0 关闭 1 启动
+addr = 0.0.0.0:69                               # tftp 服务端地址 注意端口冲突
+
+[elasticsearch]
+status = 1                                      # 是否启动 ES蜜罐 0 关闭 1 启动
+addr = 0.0.0.0:9200                             # ES蜜罐 服务端地址 注意端口冲突
+
+[vnc]
+status = 1                                      # 是否启动 VNC蜜罐 0 关闭 1 启动
+addr = 0.0.0.0:5900                             # VNC蜜罐 服务端地址 注意端口冲突