add dockerhub-push.yml 2022-09-01

Author: hktalent

.github/workflows/dockerhub-push.yml

@@ -0,0 +1,40 @@
+name: 🌥 Docker Push
+
+on:
+  workflow_run:
+    workflows: ["🎉 Release Binary"]
+    types:
+      - completed
+  workflow_dispatch:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v3
+
+      - name: Get Github tag
+        id: meta
+        run: |
+          echo "::set-output name=tag::$(curl --silent "https://api.github.com/repos/hktalent/scan4all/releases/latest" | jq -r .tag_name)"
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2 
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: hktalent/scan4all:latest,hktalent/scan4all:${{ steps.meta.outputs.tag }}

pkg/fingerprint/fingerScan.go

@@ -90,11 +90,12 @@ func SvUrl2Id(szUrl string, finp *Fingerprint, rMz string) {
 
 func CaseMethod(szUrl, method, bodyString, favhash, md5Body, hexBody string, finp *Fingerprint) []string {
 	cms := []string{}
-	if !strings.HasSuffix(szUrl, finp.UrlPath) || 0 == len(finp.Keyword) {
+	u01, _ := url.Parse(strings.TrimSpace(szUrl))
+	if u01.Path != finp.UrlPath || 0 == len(finp.Keyword) {
 		//log.Printf("%+v", finp)
 		return cms
 	}
-	u01, _ := url.Parse(strings.TrimSpace(szUrl))
+
 	if _, ok := Mfavhash.Load(u01.Host + favhash); ok {
 		return cms
 	}

pkg/fingerprint/matchfinger.go

@@ -14,6 +14,7 @@ func iskeyword(str string, keyword []string, KeywordMathOr bool) (x bool, rstr s
 			x = x && true
 			rstr = k
 			if KeywordMathOr {
+				x = true
 				break
 			}
 		} else {
@@ -37,6 +38,7 @@ func isregular(str string, keyword []string, KeywordMathOr bool) (x bool, rstr s
 			x = x && true
 			rstr = k
 			if KeywordMathOr {
+				x = true
 				break
 			}
 		} else {