p2p/dnsdisc: add implementation of EIP-1459 (#20094)
This adds an implementation of node discovery via DNS TXT records to the go-ethereum library. The implementation doesn't match EIP-1459 exactly, the main difference being that this implementation uses separate merkle trees for tree links and ENRs. The EIP will be updated to match p2p/dnsdisc. To maintain DNS trees, cmd/devp2p provides a frontend for the p2p/dnsdisc library. The new 'dns' subcommands can be used to create, sign and deploy DNS discovery trees.
This commit is contained in:
Felix Lange
GitHub
300
vendor/github.com/cloudflare/cloudflare-go/waf.go
generated
vendored
Normal file
300
vendor/github.com/cloudflare/cloudflare-go/waf.go
generated
vendored
Normal file
@@ -0,0 +1,300 @@
|
||||
package cloudflare
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
// WAFPackage represents a WAF package configuration.
|
||||
type WAFPackage struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
ZoneID string `json:"zone_id"`
|
||||
DetectionMode string `json:"detection_mode"`
|
||||
Sensitivity string `json:"sensitivity"`
|
||||
ActionMode string `json:"action_mode"`
|
||||
}
|
||||
|
||||
// WAFPackagesResponse represents the response from the WAF packages endpoint.
|
||||
type WAFPackagesResponse struct {
|
||||
Response
|
||||
Result []WAFPackage `json:"result"`
|
||||
ResultInfo ResultInfo `json:"result_info"`
|
||||
}
|
||||
|
||||
// WAFPackageResponse represents the response from the WAF package endpoint.
|
||||
type WAFPackageResponse struct {
|
||||
Response
|
||||
Result WAFPackage `json:"result"`
|
||||
ResultInfo ResultInfo `json:"result_info"`
|
||||
}
|
||||
|
||||
// WAFPackageOptions represents options to edit a WAF package.
|
||||
type WAFPackageOptions struct {
|
||||
Sensitivity string `json:"sensitivity,omitempty"`
|
||||
ActionMode string `json:"action_mode,omitempty"`
|
||||
}
|
||||
|
||||
// WAFGroup represents a WAF rule group.
|
||||
type WAFGroup struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
RulesCount int `json:"rules_count"`
|
||||
ModifiedRulesCount int `json:"modified_rules_count"`
|
||||
PackageID string `json:"package_id"`
|
||||
Mode string `json:"mode"`
|
||||
AllowedModes []string `json:"allowed_modes"`
|
||||
}
|
||||
|
||||
// WAFGroupsResponse represents the response from the WAF groups endpoint.
|
||||
type WAFGroupsResponse struct {
|
||||
Response
|
||||
Result []WAFGroup `json:"result"`
|
||||
ResultInfo ResultInfo `json:"result_info"`
|
||||
}
|
||||
|
||||
// WAFGroupResponse represents the response from the WAF group endpoint.
|
||||
type WAFGroupResponse struct {
|
||||
Response
|
||||
Result WAFGroup `json:"result"`
|
||||
ResultInfo ResultInfo `json:"result_info"`
|
||||
}
|
||||
|
||||
// WAFRule represents a WAF rule.
|
||||
type WAFRule struct {
|
||||
ID string `json:"id"`
|
||||
Description string `json:"description"`
|
||||
Priority string `json:"priority"`
|
||||
PackageID string `json:"package_id"`
|
||||
Group struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
} `json:"group"`
|
||||
Mode string `json:"mode"`
|
||||
DefaultMode string `json:"default_mode"`
|
||||
AllowedModes []string `json:"allowed_modes"`
|
||||
}
|
||||
|
||||
// WAFRulesResponse represents the response from the WAF rules endpoint.
|
||||
type WAFRulesResponse struct {
|
||||
Response
|
||||
Result []WAFRule `json:"result"`
|
||||
ResultInfo ResultInfo `json:"result_info"`
|
||||
}
|
||||
|
||||
// WAFRuleResponse represents the response from the WAF rule endpoint.
|
||||
type WAFRuleResponse struct {
|
||||
Response
|
||||
Result WAFRule `json:"result"`
|
||||
ResultInfo ResultInfo `json:"result_info"`
|
||||
}
|
||||
|
||||
// WAFRuleOptions is a subset of WAFRule, for editable options.
|
||||
type WAFRuleOptions struct {
|
||||
Mode string `json:"mode"`
|
||||
}
|
||||
|
||||
// ListWAFPackages returns a slice of the WAF packages for the given zone.
|
||||
//
|
||||
// API Reference: https://api.cloudflare.com/#waf-rule-packages-list-firewall-packages
|
||||
func (api *API) ListWAFPackages(zoneID string) ([]WAFPackage, error) {
|
||||
var p WAFPackagesResponse
|
||||
var packages []WAFPackage
|
||||
var res []byte
|
||||
var err error
|
||||
uri := "/zones/" + zoneID + "/firewall/waf/packages"
|
||||
res, err = api.makeRequest("GET", uri, nil)
|
||||
if err != nil {
|
||||
return []WAFPackage{}, errors.Wrap(err, errMakeRequestError)
|
||||
}
|
||||
err = json.Unmarshal(res, &p)
|
||||
if err != nil {
|
||||
return []WAFPackage{}, errors.Wrap(err, errUnmarshalError)
|
||||
}
|
||||
if !p.Success {
|
||||
// TODO: Provide an actual error message instead of always returning nil
|
||||
return []WAFPackage{}, err
|
||||
}
|
||||
for pi := range p.Result {
|
||||
packages = append(packages, p.Result[pi])
|
||||
}
|
||||
return packages, nil
|
||||
}
|
||||
|
||||
// WAFPackage returns a WAF package for the given zone.
|
||||
//
|
||||
// API Reference: https://api.cloudflare.com/#waf-rule-packages-firewall-package-details
|
||||
func (api *API) WAFPackage(zoneID, packageID string) (WAFPackage, error) {
|
||||
uri := "/zones/" + zoneID + "/firewall/waf/packages/" + packageID
|
||||
res, err := api.makeRequest("GET", uri, nil)
|
||||
if err != nil {
|
||||
return WAFPackage{}, errors.Wrap(err, errMakeRequestError)
|
||||
}
|
||||
|
||||
var r WAFPackageResponse
|
||||
err = json.Unmarshal(res, &r)
|
||||
if err != nil {
|
||||
return WAFPackage{}, errors.Wrap(err, errUnmarshalError)
|
||||
}
|
||||
|
||||
return r.Result, nil
|
||||
}
|
||||
|
||||
// UpdateWAFPackage lets you update the a WAF Package.
|
||||
//
|
||||
// API Reference: https://api.cloudflare.com/#waf-rule-packages-edit-firewall-package
|
||||
func (api *API) UpdateWAFPackage(zoneID, packageID string, opts WAFPackageOptions) (WAFPackage, error) {
|
||||
uri := "/zones/" + zoneID + "/firewall/waf/packages/" + packageID
|
||||
res, err := api.makeRequest("PATCH", uri, opts)
|
||||
if err != nil {
|
||||
return WAFPackage{}, errors.Wrap(err, errMakeRequestError)
|
||||
}
|
||||
|
||||
var r WAFPackageResponse
|
||||
err = json.Unmarshal(res, &r)
|
||||
if err != nil {
|
||||
return WAFPackage{}, errors.Wrap(err, errUnmarshalError)
|
||||
}
|
||||
return r.Result, nil
|
||||
}
|
||||
|
||||
// ListWAFGroups returns a slice of the WAF groups for the given WAF package.
|
||||
//
|
||||
// API Reference: https://api.cloudflare.com/#waf-rule-groups-list-rule-groups
|
||||
func (api *API) ListWAFGroups(zoneID, packageID string) ([]WAFGroup, error) {
|
||||
var groups []WAFGroup
|
||||
var res []byte
|
||||
var err error
|
||||
|
||||
uri := "/zones/" + zoneID + "/firewall/waf/packages/" + packageID + "/groups"
|
||||
res, err = api.makeRequest("GET", uri, nil)
|
||||
if err != nil {
|
||||
return []WAFGroup{}, errors.Wrap(err, errMakeRequestError)
|
||||
}
|
||||
|
||||
var r WAFGroupsResponse
|
||||
err = json.Unmarshal(res, &r)
|
||||
if err != nil {
|
||||
return []WAFGroup{}, errors.Wrap(err, errUnmarshalError)
|
||||
}
|
||||
|
||||
if !r.Success {
|
||||
// TODO: Provide an actual error message instead of always returning nil
|
||||
return []WAFGroup{}, err
|
||||
}
|
||||
|
||||
for gi := range r.Result {
|
||||
groups = append(groups, r.Result[gi])
|
||||
}
|
||||
return groups, nil
|
||||
}
|
||||
|
||||
// WAFGroup returns a WAF rule group from the given WAF package.
|
||||
//
|
||||
// API Reference: https://api.cloudflare.com/#waf-rule-groups-rule-group-details
|
||||
func (api *API) WAFGroup(zoneID, packageID, groupID string) (WAFGroup, error) {
|
||||
uri := "/zones/" + zoneID + "/firewall/waf/packages/" + packageID + "/groups/" + groupID
|
||||
res, err := api.makeRequest("GET", uri, nil)
|
||||
if err != nil {
|
||||
return WAFGroup{}, errors.Wrap(err, errMakeRequestError)
|
||||
}
|
||||
|
||||
var r WAFGroupResponse
|
||||
err = json.Unmarshal(res, &r)
|
||||
if err != nil {
|
||||
return WAFGroup{}, errors.Wrap(err, errUnmarshalError)
|
||||
}
|
||||
|
||||
return r.Result, nil
|
||||
}
|
||||
|
||||
// UpdateWAFGroup lets you update the mode of a WAF Group.
|
||||
//
|
||||
// API Reference: https://api.cloudflare.com/#waf-rule-groups-edit-rule-group
|
||||
func (api *API) UpdateWAFGroup(zoneID, packageID, groupID, mode string) (WAFGroup, error) {
|
||||
opts := WAFRuleOptions{Mode: mode}
|
||||
uri := "/zones/" + zoneID + "/firewall/waf/packages/" + packageID + "/groups/" + groupID
|
||||
res, err := api.makeRequest("PATCH", uri, opts)
|
||||
if err != nil {
|
||||
return WAFGroup{}, errors.Wrap(err, errMakeRequestError)
|
||||
}
|
||||
|
||||
var r WAFGroupResponse
|
||||
err = json.Unmarshal(res, &r)
|
||||
if err != nil {
|
||||
return WAFGroup{}, errors.Wrap(err, errUnmarshalError)
|
||||
}
|
||||
return r.Result, nil
|
||||
}
|
||||
|
||||
// ListWAFRules returns a slice of the WAF rules for the given WAF package.
|
||||
//
|
||||
// API Reference: https://api.cloudflare.com/#waf-rules-list-rules
|
||||
func (api *API) ListWAFRules(zoneID, packageID string) ([]WAFRule, error) {
|
||||
var rules []WAFRule
|
||||
var res []byte
|
||||
var err error
|
||||
|
||||
uri := "/zones/" + zoneID + "/firewall/waf/packages/" + packageID + "/rules"
|
||||
res, err = api.makeRequest("GET", uri, nil)
|
||||
if err != nil {
|
||||
return []WAFRule{}, errors.Wrap(err, errMakeRequestError)
|
||||
}
|
||||
|
||||
var r WAFRulesResponse
|
||||
err = json.Unmarshal(res, &r)
|
||||
if err != nil {
|
||||
return []WAFRule{}, errors.Wrap(err, errUnmarshalError)
|
||||
}
|
||||
|
||||
if !r.Success {
|
||||
// TODO: Provide an actual error message instead of always returning nil
|
||||
return []WAFRule{}, err
|
||||
}
|
||||
|
||||
for ri := range r.Result {
|
||||
rules = append(rules, r.Result[ri])
|
||||
}
|
||||
return rules, nil
|
||||
}
|
||||
|
||||
// WAFRule returns a WAF rule from the given WAF package.
|
||||
//
|
||||
// API Reference: https://api.cloudflare.com/#waf-rules-rule-details
|
||||
func (api *API) WAFRule(zoneID, packageID, ruleID string) (WAFRule, error) {
|
||||
uri := "/zones/" + zoneID + "/firewall/waf/packages/" + packageID + "/rules/" + ruleID
|
||||
res, err := api.makeRequest("GET", uri, nil)
|
||||
if err != nil {
|
||||
return WAFRule{}, errors.Wrap(err, errMakeRequestError)
|
||||
}
|
||||
|
||||
var r WAFRuleResponse
|
||||
err = json.Unmarshal(res, &r)
|
||||
if err != nil {
|
||||
return WAFRule{}, errors.Wrap(err, errUnmarshalError)
|
||||
}
|
||||
|
||||
return r.Result, nil
|
||||
}
|
||||
|
||||
// UpdateWAFRule lets you update the mode of a WAF Rule.
|
||||
//
|
||||
// API Reference: https://api.cloudflare.com/#waf-rules-edit-rule
|
||||
func (api *API) UpdateWAFRule(zoneID, packageID, ruleID, mode string) (WAFRule, error) {
|
||||
opts := WAFRuleOptions{Mode: mode}
|
||||
uri := "/zones/" + zoneID + "/firewall/waf/packages/" + packageID + "/rules/" + ruleID
|
||||
res, err := api.makeRequest("PATCH", uri, opts)
|
||||
if err != nil {
|
||||
return WAFRule{}, errors.Wrap(err, errMakeRequestError)
|
||||
}
|
||||
|
||||
var r WAFRuleResponse
|
||||
err = json.Unmarshal(res, &r)
|
||||
if err != nil {
|
||||
return WAFRule{}, errors.Wrap(err, errUnmarshalError)
|
||||
}
|
||||
return r.Result, nil
|
||||
}
|
||||
Reference in New Issue
Block a user