archive/revsuit
1
0
Fork 0
mirror of https://github.com/Li4n0/revsuit.git synced 2026-09-21 22:30:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add value field to the dns log (#67)

Browse Source 
record resolve value of dns log to facilitate the observation of dns rebinding.
This commit is contained in:
Li4n0
2023-05-23 23:27:50 +08:00
committed by GitHub
parent c53ec79ccd
commit 223c14ab33
6 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/dns/dns.go
+16 -12
View File
@@ -126,7 +126,7 @@ func (s *Server) newZone(name string) *newdns.Zone {
"ns2.hostmaster.com.",
"ns3.hostmaster.com.",
},
Handler: func(lookedName, remoteAddr string) ([]newdns.Set, error) {
Handler: func(lookedName, remoteAddr string) (set []newdns.Set, err error) {
ip := strings.Split(remoteAddr, ":")[0]
for _, _rule := range s.getRules() {
@@ -135,12 +135,24 @@ func (s *Server) newZone(name string) *newdns.Zone {
continue
}
r, err := newRecord(_rule, flag, domain, ip, ipinfo.Area(ip))
if _rule.Value != "" {
_type := _rule.Type
if _rule.Type == newdns.REBINDING {
_type = newdns.A
}
set = newSet(_rule, name, rule.CompileTpl(_rule.Value, vars), ip, _type)
}
var value string
if len(set) > 0 && len(set[0].Records) > 0 {
value = set[0].Records[0].Address
}
r, err := newRecord(_rule, flag, domain, value, ip, ipinfo.Area(ip))
if err != nil {
log.Warn("DNS record(rule_id:%s) created failed :%s", _rule.Name, err)
return nil, nil
}
log.Info("DNS record[id:%d rule:%s remote_ip:%s] has been created", r.ID, _rule.Name, ip)
log.Info("DNS record[id:%d rule:%s remote_ip:%s, value:%s] has been created", r.ID, _rule.Name, ip, value)
//only send to client or notify user when this connection recorded first time.
var count int64
@@ -168,15 +180,7 @@ func (s *Server) newZone(name string) *newdns.Zone {
}()
}
}
if _rule.Value != "" {
value := rule.CompileTpl(_rule.Value, vars)
_type := _rule.Type
if _rule.Type == newdns.REBINDING {
_type = newdns.A
}
return newSet(_rule, name, value, ip, _type), nil
}
return set, err
}
return nil, nil
pkg/dns/record.go
+6 -1
View File
@@ -17,6 +17,7 @@ var _ record.Record = (*Record)(nil)
type Record struct {
Domain string `gorm:"index" form:"domain" json:"domain"`
Value string `form:"value" json:"value"`
record.BaseRecord
Rule Rule `gorm:"foreignKey:RuleName;references:Name;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;" form:"-" json:"-" notice:"-"`
@@ -30,7 +31,7 @@ func (r Record) Notice() {
notice.Notice(r)
}
func newRecord(rule *Rule, flag, domain, remoteIp, ipArea string) (r *Record, err error) {
func newRecord(rule *Rule, flag, domain, value, remoteIp, ipArea string) (r *Record, err error) {
r = &Record{
BaseRecord: record.BaseRecord{
Flag: flag,
@@ -39,6 +40,7 @@ func newRecord(rule *Rule, flag, domain, remoteIp, ipArea string) (r *Record, er
RequestTime: time.Now(),
},
Domain: domain,
Value: value,
Rule: *rule,
}
@@ -89,6 +91,9 @@ func Records(c *gin.Context) {
if dnsRecord.RuleName != "" {
db.Where("rule_name = ?", dnsRecord.RuleName)
}
if dnsRecord.Value != "" {
db.Where("address= ?", dnsRecord.Value)
}
//Delete records
if c.Request.Method == http.MethodDelete {