daffainfo
/
nuclei
mirror of https://github.com/daffainfo/nuclei.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1490 from projectdiscovery/issue-1433-additional-http-vars 

Extending http variables list with dns generated variables
dev
Sandeep Singh 2022-01-16 17:14:05 +05:30 committed by GitHub
parent 72e842885d d7f7d9d1fc
commit 562c89c1d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
v2/pkg/protocols/dns/dns.go
View File

@ -183,7 +183,7 @@ func (request *Request) Make(domain string) (*dns.Msg, error) {
var q dns.Question var q dns.Question
final := replacer.Replace(request.Name, generateDNSVariables(domain)) final := replacer.Replace(request.Name, GenerateDNSVariables(domain))
q.Name = dns.Fqdn(final) q.Name = dns.Fqdn(final)
q.Qclass = request.class q.Qclass = request.class
@ -250,7 +250,8 @@ func classToInt(class string) uint16 {
return uint16(result) return uint16(result)
} }
func generateDNSVariables(domain string) map[string]interface{} { // GenerateDNSVariables from a dns name
func GenerateDNSVariables(domain string) map[string]interface{} {
parsed, err := publicsuffix.Parse(strings.TrimSuffix(domain, ".")) parsed, err := publicsuffix.Parse(strings.TrimSuffix(domain, "."))
if err != nil { if err != nil {
return map[string]interface{}{"FQDN": domain} return map[string]interface{}{"FQDN": domain}

2
v2/pkg/protocols/dns/dns_test.go
View File

@ -11,7 +11,7 @@ import (
) )
func TestGenerateDNSVariables(t *testing.T) { func TestGenerateDNSVariables(t *testing.T) {
vars := generateDNSVariables("www.projectdiscovery.io") vars := GenerateDNSVariables("www.projectdiscovery.io")
require.Equal(t, map[string]interface{}{ require.Equal(t, map[string]interface{}{
"FQDN": "www.projectdiscovery.io", "FQDN": "www.projectdiscovery.io",
"RDN": "projectdiscovery.io", "RDN": "projectdiscovery.io",

4
v2/pkg/protocols/http/build_request.go
View File

@ -20,6 +20,7 @@ import (
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions" "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators" "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/replacer" "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/replacer"
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/dns"
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/race" "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/race"
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/raw" "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/raw"
"github.com/projectdiscovery/nuclei/v2/pkg/types" "github.com/projectdiscovery/nuclei/v2/pkg/types"
@ -377,7 +378,7 @@ func generateVariables(parsed *url.URL, trailingSlash bool) map[string]interface
if base == "." { if base == "." {
base = "" base = ""
} }
return map[string]interface{}{ httpVariables := map[string]interface{}{
"BaseURL": parsed.String(), "BaseURL": parsed.String(),
"RootURL": fmt.Sprintf("%s://%s", parsed.Scheme, parsed.Host), "RootURL": fmt.Sprintf("%s://%s", parsed.Scheme, parsed.Host),
"Hostname": parsed.Host, "Hostname": parsed.Host,
@ -387,4 +388,5 @@ func generateVariables(parsed *url.URL, trailingSlash bool) map[string]interface
"File": base, "File": base,
"Scheme": parsed.Scheme, "Scheme": parsed.Scheme,
} }
return generators.MergeMaps(httpVariables, dns.GenerateDNSVariables(domain))
} }