fixed 去除空的default解决性能问题 2023-03-26

hktalent · hktalent · commit 108ccc35da79 · 2023-03-26T18:24:57.000+08:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,21 +1,28 @@
 [submodule "config/jaeles-signatures"]
 	path = config/jaeles-signatures
 	url = https://github.com/jaeles-project/jaeles-signatures
+	branch=master
 [submodule "config/nuclei-templates"]
 	path = config/nuclei-templates
 	url = https://github.com/projectdiscovery/nuclei-templates.git
+	branch=main
 [submodule "config/fuzzing-templates"]
 	path = config/fuzzing-templates
 	url = https://github.com/projectdiscovery/fuzzing-templates.git
+	branch=main
 [submodule "tools/ProxyShell"]
 	path = tools/ProxyShell
 	url = https://github.com/ktecv2000/ProxyShell.git
+	branch=main
 [submodule "config/smuggler"]
 	path = config/smuggler
 	url = https://github.com/defparam/smuggler.git
+	branch=master
 [submodule "tools/The-Hacker-Recipes"]
 	path = tools/The-Hacker-Recipes
 	url = https://github.com/ShutdownRepo/The-Hacker-Recipes.git
+	branch=master
 [submodule "config/51pwn/juicyinfo-nuclei-templates"]
 	path = config/51pwn/juicyinfo-nuclei-templates
 	url = git@github.com:cipher387/juicyinfo-nuclei-templates.git
+	branch=main
diff --git a/brute/filefuzz.go b/brute/filefuzz.go
@@ -288,7 +288,6 @@ func FileFuzz(u string, indexStatusCode int, indexContentLength int, indexbody s
 				} else {
 					return
 				}
-			default:
 				// <-time.After(time.Duration(100) * time.Millisecond)
 			}
 		}
diff --git a/config/nuclei-templates b/config/nuclei-templates
@@ -1 +1 @@
-Subproject commit c87867c691f74d723a58ba78ed5ccbe4e127b837
+Subproject commit 1d3f792d38b0415bbd97a138b8f20a6dfb2587f2
diff --git a/engine/engineImp.go b/engine/engineImp.go
@@ -414,7 +414,7 @@ func (x1 *Engine) Running() {
 				x1.GetTask("")
 			case <-c2Task.C:
 				util.DoDelayClear(x1.Wg) // panic: sync: WaitGroup misuse: Add called concurrently with Wait
-			default:
+				//default:
 				//util.DoSleep()
 			}
 		}
diff --git a/lib/util/websocketClient.go b/lib/util/websocketClient.go
@@ -74,8 +74,8 @@ func (r *E2eWebsocket) DispatchEvt(data []byte) {
 					//case Sdp:
 					//	r.E2eImp.SessionDescriptionCbk(io.NopCloser(bytes.NewReader(d1)))
 					//	break
-					default:
-						//r.E2eImp.CandidateCbk(io.NopCloser(bytes.NewReader(d1)))
+					//default:
+					//r.E2eImp.CandidateCbk(io.NopCloser(bytes.NewReader(d1)))
 					}
 				} else if 2 < len(d1) {
 					Logs("json.Marshal(o.Message)", err, string(d1))
diff --git a/pkg/portScan/masscan.go b/pkg/portScan/masscan.go
@@ -122,7 +122,7 @@ func (m *Masscan) ParseLine(s string) ([]Const.Host, error) {
 				//host.Ip = host.Address.Addr
 				hosts = append(hosts, host)
 			}
-		default:
+			//default:
 		}
 	}
 	return hosts, nil
diff --git a/pocs_yml/check/check.go b/pocs_yml/check/check.go
@@ -109,7 +109,6 @@ func executeXrayPoc(oReq *http.Request, target string, poc *xray_structs.Poc) (i
 			switch v.(type) {
 			case *xray_structs.Reverse:
 				cel.PutReverse(v)
-			default:
 			}
 		}
 		VariableMapPool.Put(variableMap)
diff --git a/projectdiscovery/nuclei_Yaml/nuclei_yaml.go b/projectdiscovery/nuclei_Yaml/nuclei_yaml.go
@@ -61,7 +61,6 @@ func RunNucleiP(buf *bytes.Buffer, xx chan bool, oOpts *map[string]interface{},
 				if 2 <= nCnt {
 					return
 				}
-			default:
 			}
 		}
 	})
diff --git a/test/test1/testPswd.go b/test/test1/testPswd.go
@@ -25,7 +25,6 @@ func main() {
 		case b, ok := <-nucleiDone1:
 			log.Printf("%v %v", b, ok)
 			break
-		default:
 
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,6 @@ func FileFuzz(u string, indexStatusCode int, indexContentLength int, indexbody s`
`288`	`288`	`} else {`
`289`	`289`	`return`
`290`	`290`	`}`
`291`		`- default:`
`292`	`291`	`// <-time.After(time.Duration(100) * time.Millisecond)`
`293`	`292`	`}`
`294`	`293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ func (x1 *Engine) Running() {`
`414`	`414`	`x1.GetTask("")`
`415`	`415`	`case <-c2Task.C:`
`416`	`416`	`util.DoDelayClear(x1.Wg) // panic: sync: WaitGroup misuse: Add called concurrently with Wait`
`417`		`- default:`
	`417`	`+ //default:`
`418`	`418`	`//util.DoSleep()`
`419`	`419`	`}`
`420`	`420`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func (m *Masscan) ParseLine(s string) ([]Const.Host, error) {`
`122`	`122`	`//host.Ip = host.Address.Addr`
`123`	`123`	`hosts = append(hosts, host)`
`124`	`124`	`}`
`125`		`- default:`
	`125`	`+ //default:`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`return hosts, nil`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@ func executeXrayPoc(oReq http.Request, target string, poc xray_structs.Poc) (i`
`109`	`109`	`switch v.(type) {`
`110`	`110`	`case *xray_structs.Reverse:`
`111`	`111`	`cel.PutReverse(v)`
`112`		`- default:`
`113`	`112`	`}`
`114`	`113`	`}`
`115`	`114`	`VariableMapPool.Put(variableMap)`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ func RunNucleiP(buf bytes.Buffer, xx chan bool, oOpts map[string]interface{},`
`61`	`61`	`if 2 <= nCnt {`
`62`	`62`	`return`
`63`	`63`	`}`
`64`		`- default:`
`65`	`64`	`}`
`66`	`65`	`}`
`67`	`66`	`})`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ func main() {`
`25`	`25`	`case b, ok := <-nucleiDone1:`
`26`	`26`	`log.Printf("%v %v", b, ok)`
`27`	`27`	`break`
`28`		`- default:`
`29`	`28`
`30`	`29`	`}`
`31`	`30`	`}`