Merge branch 'danielmiessler:master' into master

Discovery/Infrastructure/common-http-ports.txt

@@ -30,5 +30,6 @@
 7001
 7002
 8080
+8443
 8888
 30821

Discovery/Web-Content/common.txt

@@ -147,6 +147,14 @@
 2012
 2013
 2014
+2015
+2016
+2017
+2018
+2019
+2020
+2021
+2022
 21
 22
 2257
@@ -2023,6 +2031,7 @@ gv_redeem
 gv_send
 gwt
 gz
+h2-console
 h
 hack
 hacker

Discovery/Web-Content/spring-boot.txt

@@ -18,6 +18,7 @@ shutdown
 version
 auditevents
 beans
+gateway/routes
 actuator
 actuator/auditLog
 actuator/auditevents
@@ -32,6 +33,7 @@ actuator/events
 actuator/exportRegisteredServices
 actuator/features
 actuator/flyway
+actuator/gateway/routes
 actuator/health
 actuator/healthcheck
 actuator/heapdump

Passwords/Default-Credentials/default-passwords.csv

@@ -1049,6 +1049,8 @@ Huawei,TMAR#HWMT8007079,<BLANK>,
 Huawei Technologies Co,TMAR#HWMT8007079,<BLANK>,
 Huawei Technologies Co,admin,admin,
 Huawei,admin,admin,
+Huawei,root,Changeme_123,https://forum.huawei.com/enterprise/en/default-ips-usernames-and-passwords-of-huawei-transmission-products/thread/551181-875
+Huawei,<BLANK>,Changeme123,https://support.huawei.com/enterprise/en/doc/EDOC1000118783?section=j004
 "Hyperic, Inc.",hqadmin,hqadmin,http://support.hyperic.com/display/DOC/QuickStart+Installation
 IBM,$ALOC$,<BLANK>,
 IBM,$SRV,$SRV,

Passwords/Default-Credentials/tomcat-betterdefaultpasslist.txt

@@ -1,7 +1,6 @@
 admin:
 admin:admanager
 admin:admin
-admin:admin
 ADMIN:ADMIN
 admin:adrole1
 admin:adroot
@@ -61,7 +60,6 @@ root:toor
 tomcat:
 tomcat:admanager
 tomcat:admin
-tomcat:admin
 tomcat:adrole1
 tomcat:adroot
 tomcat:ads3cret
@@ -71,7 +69,6 @@ tomcat:changethis
 tomcat:password
 tomcat:password1
 tomcat:s3cret
-tomcat:s3cret
 tomcat:tomcat
 xampp:xampp
 server_admin:owaspbwa