Skip to content

师傅我来pr了,现在应该是可以运行了,你看看有木有啥问题 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Eviden0 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

师傅我来pr了,现在应该是可以运行了,你看看有木有啥问题 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ func TestEngine(t *testing.T) {
}
fmt.Println(engine.String())

//client := &http.Client{
// client := &http.Client{
// Transport: &http.Transport{
// TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
// },
//}
//resp, err := client.Get("https://boce.aliyun.com/detect/http")
//if err != nil {
// }
// resp, err := client.Get("https://boce.aliyun.com/detect/http")
// if err != nil {
// panic(err)
//}
//start := time.Now()
//content := httputils.ReadRaw(resp)
// }
// start := time.Now()
// content := httputils.ReadRaw(resp)

// 调用 DetectContent

Expand All @@ -54,7 +54,7 @@ func TestEngine(t *testing.T) {
}

// 打印执行时间
//println("耗时: " + time.Since(start).String())
// println("耗时: " + time.Since(start).String())
fmt.Println(frames.String())

// 打印内存分配
Expand Down Expand Up @@ -220,7 +220,7 @@ func TestEngine_Wappalyzer(t *testing.T) {
t.Error(err)
return
}
resp, err := http.Get("http://127.0.0.1:8000")
resp, err := http.Get("https://www.thinkphp.cn/")
if err != nil {
return
}
Expand Down
62 changes: 48 additions & 14 deletions wappalyzer/fingerprints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package wappalyzer

import (
"encoding/json"
"github.com/chainreactors/fingers/common"
"regexp"
"strconv"
Expand All @@ -13,21 +14,46 @@ type Fingerprints struct {
Apps map[string]*Fingerprint `json:"apps"`
}

// UnmarshalJSON supports both normalized (apps) and upstream (technologies) keys.
func (f *Fingerprints) UnmarshalJSON(data []byte) error {
var payload struct {
Apps map[string]*Fingerprint `json:"apps"`
Technologies map[string]*Fingerprint `json:"technologies"`
}

if err := json.Unmarshal(data, &payload); err != nil {
return err
}

switch {
case len(payload.Apps) > 0:
f.Apps = payload.Apps
case len(payload.Technologies) > 0:
f.Apps = payload.Technologies
default:
f.Apps = map[string]*Fingerprint{}
}

return nil
}

// Fingerprint is a single piece of information about a tech validated and normalized
type Fingerprint struct {
Cats []int `json:"cats"`
CSS []string `json:"css"`
Cookies map[string]string `json:"cookies"`
JS []string `json:"js"`
Headers map[string]string `json:"headers"`
HTML []string `json:"html"`
Script []string `json:"scripts"`
ScriptSrc []string `json:"scriptSrc"`
Meta map[string][]string `json:"meta"`
Implies []string `json:"implies"`
Description string `json:"description"`
Website string `json:"website"`
CPE string `json:"cpe"`
Cats []int `json:"cats"`
CSS []string `json:"css"`
Cookies map[string]string `json:"cookies"`
Dom map[string]map[string]interface{} `json:"dom"`
JS map[string]string `json:"js"`
Headers map[string]string `json:"headers"`
HTML []string `json:"html"`
Script []string `json:"scripts"`
ScriptSrc []string `json:"scriptSrc"`
Meta map[string][]string `json:"meta"`
Implies []string `json:"implies"`
Description string `json:"description"`
Website string `json:"website"`
CPE string `json:"cpe"`
Icon string `json:"icon"`
}

// CompiledFingerprints contains a map of fingerprints for tech detection
Expand All @@ -47,6 +73,8 @@ type CompiledFingerprint struct {
description string
// website contains a URL associated with the fingerprint
website string
// icon contains icon identifier from fingerprint source
icon string
// cookies contains fingerprints for target cookies
cookies map[string]*versionRegex
// js contains fingerprints for the js file
Expand Down Expand Up @@ -81,6 +109,7 @@ type AppInfo struct {
Description string
Website string
CPE string
Icon string
}

// CatsInfo contains basic information about an App.
Expand Down Expand Up @@ -128,6 +157,7 @@ func (v *versionRegex) MatchString(value string) (bool, string) {
if v.skipRegex {
return true, ""
}
value = strings.ToLower(value)
matches := v.regex.FindAllStringSubmatch(value, -1)
if len(matches) == 0 {
return false, ""
Expand Down Expand Up @@ -163,6 +193,7 @@ func compileFingerprint(app string, fingerprint *Fingerprint) *CompiledFingerpri
implies: fingerprint.Implies,
description: fingerprint.Description,
website: fingerprint.Website,
icon: fingerprint.Icon,
cookies: make(map[string]*versionRegex),
js: make([]*versionRegex, 0, len(fingerprint.JS)),
headers: make(map[string]*versionRegex),
Expand All @@ -181,7 +212,10 @@ func compileFingerprint(app string, fingerprint *Fingerprint) *CompiledFingerpri
compiled.cookies[header] = fingerprint
}

for _, pattern := range fingerprint.JS {
for property, pattern := range fingerprint.JS {
if pattern == "" {
pattern = regexp.QuoteMeta(property)
}
fingerprint, err := newVersionRegex(pattern)
if err != nil {
continue
Expand Down
1 change: 1 addition & 0 deletions wappalyzer/wappalyzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ func (engine *Wappalyze) FingerprintWithInfo(headers map[string][]string, body [
Description: fingerprint.description,
Website: fingerprint.website,
CPE: fingerprint.cpe,
Icon: fingerprint.icon,
}
}
}
Expand Down