Merge remote-tracking branch 'origin/main'

# Conflicts:
#	Plugins/webtitle.go
#	WebScan/WebScan.go
#	WebScan/pocs/Hotel-Internet-Manage-RCE.yml

Author: shadow1ng

WebScan/pocs/Hotel-Internet-Manage-RCE.yml

@@ -9,3 +9,4 @@ detail:
   Affected Version: "Hotel Internet Billing & Operation Support System"
   links:
     - http://118.190.97.19:88/qingy/Web%E5%AE%89%E5%85%A8
+

WebScan/pocs/tongda-meeting-unauthorized-access.yml

@@ -3,9 +3,6 @@ rules:
   - method: GET
     path: >-
       /general/calendar/arrange/get_cal_list.php?starttime=1548058874&endtime=33165447106&view=agendaDay
-    headers:
-      User-Agent: 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.9 Safari/537.36'
-      Accept-Encoding: 'deflate'
     follow_redirects: false
     expression: |
       response.status == 200 && response.content_type.contains("json") && response.body.bcontains(bytes(string("creator"))) && response.body.bcontains(bytes(string("originalTitle")))

main.go

@@ -14,5 +14,5 @@ func main() {
 	common.Parse(&Info)
 	Plugins.Scan(Info)
 	t := time.Now().Sub(start)
-	fmt.Printf("[*] 扫描结束,耗时: %s", t)
+	fmt.Printf("[*] 扫描结束,耗时: %s\n", t)
 }