Refactored field processing in generator.
* Allows for specifying more customizations per field in each type. Previously, the switch clause didn't allow sub-types to be modified, but that became a problem with some of the more complex types. * Fixed several problematic fields in the Device resource * Removed the underscore separator from generated type names
This commit is contained in:
committed by
Paul Tyng
parent
fa5012f42a
commit
16c246525b
@@ -25,29 +25,29 @@ type SettingIps struct {
|
||||
|
||||
Key string `json:"key"`
|
||||
|
||||
DNSFiltering bool `json:"dns_filtering"`
|
||||
DNSFilters []SettingIps_DNSFilters `json:"dns_filters,omitempty"`
|
||||
EnabledCategories []string `json:"enabled_categories,omitempty"` // emerging-activex|emerging-attackresponse|botcc|emerging-chat|ciarmy|compromised|emerging-dns|emerging-dos|dshield|emerging-exploit|emerging-ftp|emerging-games|emerging-icmp|emerging-icmpinfo|emerging-imap|emerging-inappropriate|emerging-info|emerging-malware|emerging-misc|emerging-mobile|emerging-netbios|emerging-p2p|emerging-policy|emerging-pop3|emerging-rpc|emerging-scada|emerging-scan|emerging-shellcode|emerging-smtp|emerging-snmp|spamhaus|emerging-sql|emerging-telnet|emerging-tftp|tor|emerging-trojan|emerging-useragent|emerging-voip|emerging-webapps|emerging-webclient|emerging-webserver|emerging-worm
|
||||
EndpointScanning bool `json:"endpoint_scanning"`
|
||||
Honeypot []SettingIps_Honeypot `json:"honeypot,omitempty"`
|
||||
HoneypotEnabled bool `json:"honeypot_enabled"`
|
||||
IPsMode string `json:"ips_mode,omitempty"` // ids|ips|ipsInline|disabled
|
||||
RestrictIPAddresses bool `json:"restrict_ip_addresses"`
|
||||
RestrictTor bool `json:"restrict_tor"`
|
||||
RestrictTorrents bool `json:"restrict_torrents"`
|
||||
Suppression SettingIps_Suppression `json:"suppression,omitempty"`
|
||||
DNSFiltering bool `json:"dns_filtering"`
|
||||
DNSFilters []SettingIpsDNSFilters `json:"dns_filters,omitempty"`
|
||||
EnabledCategories []string `json:"enabled_categories,omitempty"` // emerging-activex|emerging-attackresponse|botcc|emerging-chat|ciarmy|compromised|emerging-dns|emerging-dos|dshield|emerging-exploit|emerging-ftp|emerging-games|emerging-icmp|emerging-icmpinfo|emerging-imap|emerging-inappropriate|emerging-info|emerging-malware|emerging-misc|emerging-mobile|emerging-netbios|emerging-p2p|emerging-policy|emerging-pop3|emerging-rpc|emerging-scada|emerging-scan|emerging-shellcode|emerging-smtp|emerging-snmp|spamhaus|emerging-sql|emerging-telnet|emerging-tftp|tor|emerging-trojan|emerging-useragent|emerging-voip|emerging-webapps|emerging-webclient|emerging-webserver|emerging-worm
|
||||
EndpointScanning bool `json:"endpoint_scanning"`
|
||||
Honeypot []SettingIpsHoneypot `json:"honeypot,omitempty"`
|
||||
HoneypotEnabled bool `json:"honeypot_enabled"`
|
||||
IPsMode string `json:"ips_mode,omitempty"` // ids|ips|ipsInline|disabled
|
||||
RestrictIPAddresses bool `json:"restrict_ip_addresses"`
|
||||
RestrictTor bool `json:"restrict_tor"`
|
||||
RestrictTorrents bool `json:"restrict_torrents"`
|
||||
Suppression SettingIpsSuppression `json:"suppression,omitempty"`
|
||||
}
|
||||
|
||||
type SettingIps_Alerts struct {
|
||||
Category string `json:"category,omitempty"`
|
||||
Gid int `json:"gid,omitempty"`
|
||||
ID int `json:"id,omitempty"`
|
||||
Signature string `json:"signature,omitempty"`
|
||||
Tracking []SettingIps_Tracking `json:"tracking,omitempty"`
|
||||
Type string `json:"type,omitempty"` // all|track
|
||||
type SettingIpsAlerts struct {
|
||||
Category string `json:"category,omitempty"`
|
||||
Gid int `json:"gid,omitempty"`
|
||||
ID int `json:"id,omitempty"`
|
||||
Signature string `json:"signature,omitempty"`
|
||||
Tracking []SettingIpsTracking `json:"tracking,omitempty"`
|
||||
Type string `json:"type,omitempty"` // all|track
|
||||
}
|
||||
|
||||
type SettingIps_DNSFilters struct {
|
||||
type SettingIpsDNSFilters struct {
|
||||
AllowedSites []string `json:"allowed_sites,omitempty"` // ^[a-zA-Z0-9.-]+$|^$
|
||||
BlockedSites []string `json:"blocked_sites,omitempty"` // ^[a-zA-Z0-9.-]+$|^$
|
||||
BlockedTld []string `json:"blocked_tld,omitempty"` // ^[a-zA-Z0-9.-]+$|^$
|
||||
@@ -58,24 +58,24 @@ type SettingIps_DNSFilters struct {
|
||||
Version string `json:"version,omitempty"` // v4|v6
|
||||
}
|
||||
|
||||
type SettingIps_Honeypot struct {
|
||||
type SettingIpsHoneypot struct {
|
||||
IPAddress string `json:"ip_address,omitempty"`
|
||||
NetworkID string `json:"network_id"`
|
||||
Version string `json:"version,omitempty"` // v4|v6
|
||||
}
|
||||
|
||||
type SettingIps_Suppression struct {
|
||||
Alerts []SettingIps_Alerts `json:"alerts,omitempty"`
|
||||
Whitelist []SettingIps_Whitelist `json:"whitelist,omitempty"`
|
||||
type SettingIpsSuppression struct {
|
||||
Alerts []SettingIpsAlerts `json:"alerts,omitempty"`
|
||||
Whitelist []SettingIpsWhitelist `json:"whitelist,omitempty"`
|
||||
}
|
||||
|
||||
type SettingIps_Tracking struct {
|
||||
type SettingIpsTracking struct {
|
||||
Direction string `json:"direction,omitempty"` // both|src|dest
|
||||
Mode string `json:"mode,omitempty"` // ip|subnet|network
|
||||
Value string `json:"value,omitempty"`
|
||||
}
|
||||
|
||||
type SettingIps_Whitelist struct {
|
||||
type SettingIpsWhitelist struct {
|
||||
Direction string `json:"direction,omitempty"` // both|src|dest
|
||||
Mode string `json:"mode,omitempty"` // ip|subnet|network
|
||||
Value string `json:"value,omitempty"`
|
||||
|
||||
Reference in New Issue
Block a user